diff --git a/include/aserver.h b/include/aserver.h
index ffddf2b43cda03b1538de0a4ead597651952aa40..2e548f9a2a7d8ebd0a31040160c1d666fb9d5c37 100644
--- a/include/aserver.h
+++ b/include/aserver.h
@@ -18,8 +18,8 @@
  *
  */
   
-#include "../src/pcm/pcm_local.h"
-#include "../src/control/control_local.h"
+#include "pcm_local.h"
+#include "control_local.h"
 #include <netdb.h>
 
 int snd_receive_fd(int sock, void *data, size_t len, int *fd);
diff --git a/src/alisp/alisp_snd.c b/src/alisp/alisp_snd.c
index 744dce90e25e7dc3ae4181faeb3bd61ffb56ee46..c69861c846982eecf10bdaafc5a5690c05f600e2 100644
--- a/src/alisp/alisp_snd.c
+++ b/src/alisp/alisp_snd.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../control/control_local.h"
+#include "control_local.h"
 
 struct acall_table {
 	const char *name;
diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
index e7d89e5f462a61a7c2eefe69d2dea8b9b81c6e32..06bbd68d405cd32c2ee0fb3e904045f596ef8943 100644
--- a/src/pcm/pcm_direct.h
+++ b/src/pcm/pcm_direct.h
@@ -20,7 +20,7 @@
  */
 
 #include "pcm_local.h"  
-#include "../timer/timer_local.h"
+#include "timer_local.h"
 
 #define DIRECT_IPC_SEMS         1
 #define DIRECT_IPC_SEM_CLIENT   0
diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index f3fbcb6e842276c14143776068d822e04ea4b423..eabdd1286545ed83c0ceb112c5b4c15791a0ec10 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -28,8 +28,8 @@
  */
   
 #include "pcm_local.h"
-#include "../control/control_local.h"
-#include "../timer/timer_local.h"
+#include "control_local.h"
+#include "timer_local.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/src/rawmidi/rawmidi_hw.c b/src/rawmidi/rawmidi_hw.c
index 3b1d941e973dff8d231bdd6140bf97c53197c35d..13a6d6cbdce3aebc9b29a1f3d99cc176fcefab4d 100644
--- a/src/rawmidi/rawmidi_hw.c
+++ b/src/rawmidi/rawmidi_hw.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "../control/control_local.h"
+#include "control_local.h"
 #include "rawmidi_local.h"
 
 #ifndef PIC
diff --git a/src/ucm/main.c b/src/ucm/main.c
index 3a3c9c154f6e9de109ae33ecfdbddfc9424e404c..301a39e88a3e59febbc21a014c4b571b6fa61cfc 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -31,7 +31,7 @@
  */
 
 #include "ucm_local.h"
-#include "../control/control_local.h"
+#include "control_local.h"
 #include <stdbool.h>
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/test/audio_time.c b/test/audio_time.c
index 00619966bf048f7be5b6e4ea8c25d2b5f051dc4b..5bba3d142ba576a0a64adcb4dc4670312b57ca59 100644
--- a/test/audio_time.c
+++ b/test/audio_time.c
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <locale.h>
 #include <math.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 static char *pcm_name = "hw:0";
 snd_output_t *output = NULL;
diff --git a/test/chmap.c b/test/chmap.c
index 52f29a76a1291c1e10be0601e6249763cdb56fae..48be35136d22d5a55b5926d64c874ff01416cd4f 100644
--- a/test/chmap.c
+++ b/test/chmap.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <getopt.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 static void usage(void)
 {
diff --git a/test/control.c b/test/control.c
index b0a3877efd2dbd8b659833b52211644943bfd916..d4e164a78b09053c8dca6c9c3b08730fe5be896b 100644
--- a/test/control.c
+++ b/test/control.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 int main(void)
 {
diff --git a/test/latency.c b/test/latency.c
index c40b2ae7cb5cb8f97d8b7716e54b0568bde812d2..4f58468412621e946b90c05e974aaab853873cef 100644
--- a/test/latency.c
+++ b/test/latency.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <getopt.h>
 #include <time.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <sys/time.h>
 #include <math.h>
 
diff --git a/test/midiloop.c b/test/midiloop.c
index d6548b5987edf898b3e69bc103d962a96be2888f..037412aa3641617c219f15c94c88f37165c9f3f9 100644
--- a/test/midiloop.c
+++ b/test/midiloop.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/time.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <string.h>
 #include <signal.h>
 
diff --git a/test/mixtest.c b/test/mixtest.c
index 57ca5d53ad6460a213c6c180fceec798e9842ec2..57c7bcc9aaec51cccbdc3fc79726b46d7b60bb8d 100644
--- a/test/mixtest.c
+++ b/test/mixtest.c
@@ -149,7 +149,7 @@ void mix_areas0(unsigned int size,
 #define MIX_AREAS_24_CMOV mix_areas1_24_cmov
 #define XADD "addl"
 #define XSUB "subl"
-#include "../src/pcm/pcm_dmix_i386.h"
+#include "pcm_dmix_i386.h"
 static void *ptr_mix_areas1_32 __attribute__((unused)) = &mix_areas1_32;
 static void *ptr_mix_areas1_24 __attribute__((unused)) = &mix_areas1_24;
 static void *ptr_mix_areas1_24_cmov __attribute__((unused)) = &mix_areas1_24_cmov;
diff --git a/test/namehint.c b/test/namehint.c
index 18bad1d885005e29e6d834398a96493248076e07..2cc829b3b285ce9cb06ab3878ec2f2fdd7f30f0d 100644
--- a/test/namehint.c
+++ b/test/namehint.c
@@ -1,4 +1,4 @@
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <err.h>
 
 int main(int argc, char *argv[])
diff --git a/test/oldapi.c b/test/oldapi.c
index 82450478cded0eca99565deb7b01e077da7a2abf..1f9d794e8f9d6169e57ea8899ee506c4fcf437dd 100644
--- a/test/oldapi.c
+++ b/test/oldapi.c
@@ -28,7 +28,7 @@
 #include <getopt.h>
 #define ALSA_PCM_OLD_HW_PARAMS_API
 #define ALSA_PCM_OLD_SW_PARAMS_API
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <sys/time.h>
 
 typedef int (myfcn)(const snd_pcm_hw_params_t *);
diff --git a/test/omixer.c b/test/omixer.c
index 119fa3313032ca4d0c17c9565689e571202ee347..25ee621923e5f6f49d124f1f20ded75e6a1faf8c 100644
--- a/test/omixer.c
+++ b/test/omixer.c
@@ -4,7 +4,7 @@
 #include <sched.h>
 #include <errno.h>
 #include <getopt.h>
-#include "../include/mixer_ordinary.h"
+#include "mixer_ordinary.h"
 #include <sys/time.h>
 #include <math.h>
 
diff --git a/test/pcm-multi-thread.c b/test/pcm-multi-thread.c
index de178899d044f79838d7586db485be3147f548a2..4053890d464c6bf1900e20c9f99a8dfb7b94028f 100644
--- a/test/pcm-multi-thread.c
+++ b/test/pcm-multi-thread.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <pthread.h>
 #include <getopt.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 #define MAX_THREADS	10
 
diff --git a/test/pcm.c b/test/pcm.c
index 223edafc2f4187b2120d9dcd6dac5746381738cc..3a7007cc7050e74436c6d7e96b91ba8eebea0cc2 100644
--- a/test/pcm.c
+++ b/test/pcm.c
@@ -10,7 +10,7 @@
 #include <sched.h>
 #include <errno.h>
 #include <getopt.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <sys/time.h>
 #include <math.h>
 
diff --git a/test/pcm_min.c b/test/pcm_min.c
index 4c120b4c2b27943574f784bce8d8c92d084133a0..6a5e00cc410b28bdc62b1bdfa19b2da3a27cf698 100644
--- a/test/pcm_min.c
+++ b/test/pcm_min.c
@@ -2,7 +2,7 @@
  *  This extra small demo sends a random samples to your speakers.
  */
 
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 static char *device = "default";			/* playback device */
 unsigned char buffer[16*1024];				/* some random data */
diff --git a/test/playmidi1.c b/test/playmidi1.c
index 831e95783f352edaaf846bfb8c54803b66f6e366..7b6cbfa40d06354c0d405b1186132b58e730bd2c 100644
--- a/test/playmidi1.c
+++ b/test/playmidi1.c
@@ -48,7 +48,7 @@
 #include "midifile.h"		/* SMF library header */
 #include "midifile.c"		/* SMF library code */
 
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 /* send the real-time time stamps (instead of midi ticks) to the ALSA sequencer */
 static int use_realtime = 0;
diff --git a/test/rawmidi.c b/test/rawmidi.c
index 666acf63f41677b376e908a63b6ffc280b1b917d..1bbf60f5657d0c49f3f6e34db063fa954c42672b 100644
--- a/test/rawmidi.c
+++ b/test/rawmidi.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <signal.h>
 
 static void usage(void)
diff --git a/test/seq.c b/test/seq.c
index 04f7e5d4e71da6b2988538e5d957050ef77fad8f..d45e949c8cf30d28517b0fd6759a2ef7de36f9f0 100644
--- a/test/seq.c
+++ b/test/seq.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <getopt.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 #include "seq-decoder.c"
 #include "seq-sender.c"
diff --git a/test/timer.c b/test/timer.c
index 63ea4a54d6254ec69a2d9ed3e6e87b9f90622055..44273c374914805d62eb84854040212da53d433e 100644
--- a/test/timer.c
+++ b/test/timer.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 
 void show_status(void *handle)
 {
diff --git a/test/user-ctl-element-set.c b/test/user-ctl-element-set.c
index ceccdba75cb6390bed12bbc47a107466c68848cc..f8829d6e7e8f60f3520d4594ebe7efe4f9341c12 100644
--- a/test/user-ctl-element-set.c
+++ b/test/user-ctl-element-set.c
@@ -8,7 +8,7 @@
  */
 
 #include "config.h"
-#include "../include/asoundlib.h"
+#include "asoundlib.h"
 #include <sound/tlv.h>
 #include <stdbool.h>