diff --git a/config/os/generic/sanitycheck.c b/config/os/generic/sanitycheck.c
index 2f818c7..8968b2c 100644
--- a/config/os/generic/sanitycheck.c
+++ b/config/os/generic/sanitycheck.c
@@ -1,4 +1,4 @@
-#include <jack/sanitycheck.h>
+#include "sanitycheck.h"
 
 int
 sanitycheck (int a, int b)
diff --git a/config/os/gnu-linux/sanitycheck.c b/config/os/gnu-linux/sanitycheck.c
index 237b056..65f962c 100644
--- a/config/os/gnu-linux/sanitycheck.c
+++ b/config/os/gnu-linux/sanitycheck.c
@@ -19,8 +19,8 @@
  **/
 
 #include <stdio.h>
-#include <jack/systemtest.h>
-#include <jack/sanitycheck.h>
+#include "systemtest.h"
+#include "sanitycheck.h"
 
 int sanitycheck (int care_about_realtime, 
 		 int care_about_freqscaling) 
diff --git a/config/os/gnu-linux/systemtest.c b/config/os/gnu-linux/systemtest.c
index 985d5a8..3f56982 100644
--- a/config/os/gnu-linux/systemtest.c
+++ b/config/os/gnu-linux/systemtest.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <jack/systemtest.h>
+#include "systemtest.h"
 
 /**
  * This function checks for the existence of known frequency scaling mechanisms 
diff --git a/config/os/macosx/ipc.h b/config/os/macosx/ipc.h
index 64bc251..8c0e546 100644
--- a/config/os/macosx/ipc.h
+++ b/config/os/macosx/ipc.h
@@ -24,9 +24,9 @@
 
 #include <mach/mach_error.h>
 #include <servers/bootstrap.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <libjack/local.h>		/* JOQ: fix me */
+#include "internal.h"
+#include "engine.h"
+#include "libjack/local.h"		/* JOQ: fix me */
 
 /*
     RPC without time out can put the jack server in a blocked state
diff --git a/configure.ac b/configure.ac
index 52b3b9f..eaa905a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,8 @@ AC_DEFINE_UNQUOTED(JACK_SHM_TYPE, [$JACK_SHM_TYPE],
 AM_CONDITIONAL(USE_POSIX_SHM, $USE_POSIX_SHM)
 
 JACK_CORE_CFLAGS="-I\$(top_srcdir)/config -I\$(top_srcdir) \
--I\$(top_srcdir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall"
+-I\$(top_srcdir) -I\$(top_srcdir)/include \ 
+-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall"
 
 JACK_LIBC_HELPER_FLAGS=
 AC_ARG_ENABLE(ancient_libc,
diff --git a/drivers/alsa-midi/alsa_midi.h b/drivers/alsa-midi/alsa_midi.h
index 2d8951b..b49228a 100644
--- a/drivers/alsa-midi/alsa_midi.h
+++ b/drivers/alsa-midi/alsa_midi.h
@@ -20,7 +20,7 @@
 #define __jack_alsa_midi_h__
 
 #include <jack/jack.h>
-#include <jack/driver.h>
+#include "driver.h"
 
 typedef struct alsa_midi_t alsa_midi_t;
 struct alsa_midi_t {
diff --git a/drivers/alsa-midi/alsa_rawmidi.c b/drivers/alsa-midi/alsa_rawmidi.c
index aa41670..9db97fb 100644
--- a/drivers/alsa-midi/alsa_rawmidi.c
+++ b/drivers/alsa-midi/alsa_rawmidi.c
@@ -40,7 +40,7 @@
 #ifdef STANDALONE
 #define MESSAGE(...) fprintf(stderr, __VA_ARGS__)
 #else
-#include <jack/messagebuffer.h>
+#include "messagebuffer.h"
 #endif
 
 #define info_log(...)  MESSAGE(__VA_ARGS__)
diff --git a/drivers/alsa-midi/alsa_seqmidi.c b/drivers/alsa-midi/alsa_seqmidi.c
index 6b4d667..3351b36 100644
--- a/drivers/alsa-midi/alsa_seqmidi.c
+++ b/drivers/alsa-midi/alsa_seqmidi.c
@@ -62,7 +62,7 @@
 #ifdef STANDALONE
 #define MESSAGE(...) fprintf(stderr, __VA_ARGS__)
 #else
-#include <jack/messagebuffer.h>
+#include "messagebuffer.h"
 #endif
 
 #define info_log(...)  MESSAGE(__VA_ARGS__)
diff --git a/drivers/alsa-midi/midi_pack.h b/drivers/alsa-midi/midi_pack.h
index 1688e89..6fb704b 100644
--- a/drivers/alsa-midi/midi_pack.h
+++ b/drivers/alsa-midi/midi_pack.h
@@ -20,7 +20,7 @@
 #define __jack_midi_pack_h__
 
 #include <jack/midiport.h>
-#include <jack/engine.h>
+#include "engine.h"
 
 typedef struct {
 	int running_status;
diff --git a/drivers/alsa-midi/midi_unpack.h b/drivers/alsa-midi/midi_unpack.h
index e464e75..c917f4d 100644
--- a/drivers/alsa-midi/midi_unpack.h
+++ b/drivers/alsa-midi/midi_unpack.h
@@ -20,7 +20,7 @@
 #define __jack_midi_unpack_h__
 
 #include <jack/midiport.h>
-#include <jack/engine.h>
+#include "engine.h"
 
 enum {
 	MIDI_UNPACK_MAX_MSG = 1024
diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c
index 05581ee..da1f843 100644
--- a/drivers/alsa/alsa_driver.c
+++ b/drivers/alsa/alsa_driver.c
@@ -30,9 +30,9 @@
 #include <regex.h>
 #include <string.h>
  
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
 
 #include <sysdeps/time.h>
 
diff --git a/drivers/alsa/alsa_driver.h b/drivers/alsa/alsa_driver.h
index ddfc5ac..e1e4fa8 100644
--- a/drivers/alsa/alsa_driver.h
+++ b/drivers/alsa/alsa_driver.h
@@ -22,7 +22,7 @@
 
 #include <alsa/asoundlib.h>
 #include <alsa/pcm.h>
-#include <jack/bitset.h>
+#include "bitset.h"
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define IS_LE 0
@@ -32,11 +32,11 @@
 #define IS_BE 0
 #endif
 
-#include <jack/types.h>
-#include <jack/hardware.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
-#include <jack/memops.h>
+#include <jack/types.h>
+#include "hardware.h"
+#include "driver.h"
+#include "memops.h"
 
 #include "../alsa-midi/alsa_midi.h"
 
diff --git a/drivers/alsa/generic_hw.c b/drivers/alsa/generic_hw.c
index 7b3291f..69457e2 100644
--- a/drivers/alsa/generic_hw.c
+++ b/drivers/alsa/generic_hw.c
@@ -17,7 +17,7 @@
 
 */
 
-#include <jack/hardware.h>
+#include "hardware.h"
 #include "alsa_driver.h"
 
 static int generic_set_input_monitor_mask (jack_hardware_t *hw, unsigned long mask)
diff --git a/drivers/alsa/hammerfall.c b/drivers/alsa/hammerfall.c
index 814a464..fcb9add 100644
--- a/drivers/alsa/hammerfall.c
+++ b/drivers/alsa/hammerfall.c
@@ -17,10 +17,10 @@
 
 */
 
-#include <jack/hardware.h>
+#include "hardware.h"
 #include "alsa_driver.h"
 #include "hammerfall.h"
-#include <jack/internal.h>
+#include "internal.h"
 
 /* Set this to 1 if you want this compile error:
  *   warning: `hammerfall_monitor_controls' defined but not used */
diff --git a/drivers/alsa/hdsp.c b/drivers/alsa/hdsp.c
index 059c2bd..cf28a91 100644
--- a/drivers/alsa/hdsp.c
+++ b/drivers/alsa/hdsp.c
@@ -18,10 +18,10 @@
 
 */
 
-#include <jack/hardware.h>
+#include "hardware.h"
 #include "alsa_driver.h"
 #include "hdsp.h"
-#include <jack/internal.h>
+#include "internal.h"
 
 /* Constants to make working with the hdsp matrix mixer easier */
 static const int HDSP_MINUS_INFINITY_GAIN = 0;
diff --git a/drivers/alsa/ice1712.c b/drivers/alsa/ice1712.c
index 5cfe365..6c38364 100644
--- a/drivers/alsa/ice1712.c
+++ b/drivers/alsa/ice1712.c
@@ -21,10 +21,10 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <jack/hardware.h>
+#include "hardware.h"
 #include "alsa_driver.h"
 #include "ice1712.h"
-#include <jack/internal.h>
+#include "internal.h"
 
 static int
 ice1712_hw_monitor_toggle(jack_hardware_t *hw, int idx, int onoff)
diff --git a/drivers/alsa/memops.c b/drivers/alsa/memops.c
index 9f7453b..3df7b19 100644
--- a/drivers/alsa/memops.c
+++ b/drivers/alsa/memops.c
@@ -32,7 +32,7 @@
 #include <limits.h>
 #include <endian.h>
 
-#include <jack/memops.h>
+#include "memops.h"
 
 /* Notes about these *_SCALING values.
 
diff --git a/drivers/alsa/usx2y.c b/drivers/alsa/usx2y.c
index 7328b90..41960ef 100644
--- a/drivers/alsa/usx2y.c
+++ b/drivers/alsa/usx2y.c
@@ -18,12 +18,12 @@
 
 */
 
-#include <jack/hardware.h>
+#include "hardware.h"
 #include "alsa_driver.h"
 #include "usx2y.h"
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
 #include <sys/mman.h>
 
 #ifndef ARRAY_SIZE
diff --git a/drivers/coreaudio/coreaudio_driver.c b/drivers/coreaudio/coreaudio_driver.c
index 9dfb9a3..f343c97 100755
--- a/drivers/coreaudio/coreaudio_driver.c
+++ b/drivers/coreaudio/coreaudio_driver.c
@@ -51,7 +51,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <jack/engine.h>
+
+#include "engine.h"
 #include "coreaudio_driver.h"
 
 const int CAVersion = 3;
diff --git a/drivers/coreaudio/coreaudio_driver.h b/drivers/coreaudio/coreaudio_driver.h
index 7d53de0..b08a866 100755
--- a/drivers/coreaudio/coreaudio_driver.h
+++ b/drivers/coreaudio/coreaudio_driver.h
@@ -32,11 +32,12 @@
 #include <AudioToolbox/AudioConverter.h>
 #include <AudioUnit/AudioUnit.h>
 
-#include <jack/types.h>
-#include <jack/hardware.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
-#include <jack/internal.h>
+#include <jack/types.h>
+
+#include "hardware.h"
+#include "driver.h"
+#include "internal.h"
 
 typedef struct {
 
diff --git a/drivers/dummy/dummy_driver.c b/drivers/dummy/dummy_driver.c
index 3d101bb..5eab915 100644
--- a/drivers/dummy/dummy_driver.c
+++ b/drivers/dummy/dummy_driver.c
@@ -29,8 +29,8 @@
 #include <sys/mman.h>
 
 #include <jack/types.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
+#include "internal.h"
+#include "engine.h"
 #include <sysdeps/time.h>
 
 #include "dummy_driver.h"
diff --git a/drivers/dummy/dummy_driver.h b/drivers/dummy/dummy_driver.h
index 2c376f8..9d74cfe 100644
--- a/drivers/dummy/dummy_driver.h
+++ b/drivers/dummy/dummy_driver.h
@@ -24,8 +24,8 @@
 
 #include <jack/types.h>
 #include <jack/jslist.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
+#include "driver.h"
 #include <config.h>
 
 // needed for clock_nanosleep
diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c
index 6ee9a7a..a8ad1ea 100644
--- a/drivers/firewire/ffado_driver.c
+++ b/drivers/firewire/ffado_driver.c
@@ -38,8 +38,8 @@
 #include <sys/mman.h>
 
 #include <jack/types.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
+#include "internal.h"
+#include "engine.h"
 #include <sysdeps/time.h>
 #include <assert.h>
 
diff --git a/drivers/firewire/ffado_driver.h b/drivers/firewire/ffado_driver.h
index a407f76..1ca2013 100644
--- a/drivers/firewire/ffado_driver.h
+++ b/drivers/firewire/ffado_driver.h
@@ -47,14 +47,14 @@
 #include <pthread.h>
 #include <semaphore.h>
 
-#include <jack/driver.h>
-#include <jack/engine.h>
-#include <jack/types.h>
-#include <jack/internal.h>
 #include <jack/types.h>
 #include <jack/ringbuffer.h>
 #include <jack/thread.h>
 
+#include "driver.h"
+#include "engine.h"
+#include "internal.h"
+
 #include <../alsa-midi/midi_pack.h>
 #include <../alsa-midi/midi_unpack.h>
 
diff --git a/drivers/freebob/freebob_driver.h b/drivers/freebob/freebob_driver.h
index fcaf374..d2e1da9 100644
--- a/drivers/freebob/freebob_driver.h
+++ b/drivers/freebob/freebob_driver.h
@@ -60,10 +60,11 @@
 #include <pthread.h>
 #include <semaphore.h>
 
-#include <jack/driver.h>
-#include <jack/engine.h>
 #include <jack/types.h>
 
+#include "driver.h"
+#include "engine.h"
+
 // debug print control flags
 #define DEBUG_LEVEL_BUFFERS           	(1<<0)
 #define DEBUG_LEVEL_HANDLERS			(1<<1)
diff --git a/drivers/netjack/net_driver.c b/drivers/netjack/net_driver.c
index 04848e0..9c8cd32 100644
--- a/drivers/netjack/net_driver.c
+++ b/drivers/netjack/net_driver.c
@@ -34,7 +34,7 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 #include <sys/mman.h>
 
 #include <jack/types.h>
-#include <jack/engine.h>
+#include "engine.h"
 #include <sysdeps/time.h>
 
 #include <sys/types.h>
diff --git a/drivers/netjack/net_driver.h b/drivers/netjack/net_driver.h
index 9f12882..da4258d 100644
--- a/drivers/netjack/net_driver.h
+++ b/drivers/netjack/net_driver.h
@@ -24,10 +24,11 @@
 #include <unistd.h>
 
 #include <jack/types.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
 #include <jack/transport.h>
 
+#include "driver.h"
+
 #include <netinet/in.h>
 
 #include "netjack.h"
diff --git a/drivers/netjack/netjack.c b/drivers/netjack/netjack.c
index cdb2264..f3afe4e 100644
--- a/drivers/netjack/netjack.c
+++ b/drivers/netjack/netjack.c
@@ -36,7 +36,7 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 
 #include <jack/types.h>
 // for jack_error in jack1
-#include <jack/internal.h>
+#include "internal.h"
 
 #include "jack/jslist.h"
 
diff --git a/drivers/netjack/netjack.h b/drivers/netjack/netjack.h
index 67238f2..3ca6c62 100644
--- a/drivers/netjack/netjack.h
+++ b/drivers/netjack/netjack.h
@@ -24,7 +24,6 @@
 #include <unistd.h>
 
 #include <jack/types.h>
-//#include <jack/driver.h>
 #include <jack/jack.h>
 #include <jack/transport.h>
 
diff --git a/drivers/netjack/netjack_packet.c b/drivers/netjack/netjack_packet.c
index fe2dc9d..950cf4c 100644
--- a/drivers/netjack/netjack_packet.c
+++ b/drivers/netjack/netjack_packet.c
@@ -47,7 +47,7 @@
 #include <jack/types.h>
 
 // for jack_error in jack1
-#include <jack/internal.h>
+#include "internal.h"
 
 #include <sys/types.h>
 
diff --git a/drivers/netjack/netjack_packet.h b/drivers/netjack/netjack_packet.h
index f0ceabc..97ac97d 100644
--- a/drivers/netjack/netjack_packet.h
+++ b/drivers/netjack/netjack_packet.h
@@ -34,7 +34,6 @@
 
 #include <jack/jack.h>
 #include <jack/types.h>
-//#include <jack/engine.h>
 #include <jack/jslist.h>
 
 #include <jack/midiport.h>
diff --git a/drivers/oss/oss_driver.c b/drivers/oss/oss_driver.c
index 06394a9..2289e49 100644
--- a/drivers/oss/oss_driver.c
+++ b/drivers/oss/oss_driver.c
@@ -58,9 +58,11 @@
 #include <sys/soundcard.h>
 
 #include <jack/types.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
 #include <jack/thread.h>
+
+#include "internal.h"
+#include "engine.h"
+
 #include <sysdeps/time.h>
 
 #include "oss_driver.h"
diff --git a/drivers/oss/oss_driver.h b/drivers/oss/oss_driver.h
index bcb2bd3..5bdf12d 100644
--- a/drivers/oss/oss_driver.h
+++ b/drivers/oss/oss_driver.h
@@ -30,9 +30,10 @@
 
 #include <jack/types.h>
 #include <jack/jslist.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
 
+#include "driver.h"
+
 
 #define OSS_DRIVER_DEF_DEV	"/dev/dsp"
 #define OSS_DRIVER_DEF_FS	48000
diff --git a/drivers/portaudio/portaudio_driver.c b/drivers/portaudio/portaudio_driver.c
index 50a43ac..f7b78bf 100644
--- a/drivers/portaudio/portaudio_driver.c
+++ b/drivers/portaudio/portaudio_driver.c
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <jack/engine.h>
+#include "engine.h"
 #include "portaudio_driver.h"
 
 #ifdef JACK_USE_MACH_THREADS
diff --git a/drivers/portaudio/portaudio_driver.h b/drivers/portaudio/portaudio_driver.h
index 8dd0640..55df853 100644
--- a/drivers/portaudio/portaudio_driver.h
+++ b/drivers/portaudio/portaudio_driver.h
@@ -25,12 +25,13 @@
 
 #include <portaudio.h>
 
-#include <jack/types.h>
-#include <jack/hardware.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
-#include <jack/internal.h>
-#include <jack/memops.h>
+#include <jack/types.h>
+
+#include "hardware.h"
+#include "driver.h"
+#include "internal.h"
+#include "memops.h"
 
 typedef struct {
 
diff --git a/drivers/sun/sun_driver.c b/drivers/sun/sun_driver.c
index 5ecc8a3..1d1af3e 100644
--- a/drivers/sun/sun_driver.c
+++ b/drivers/sun/sun_driver.c
@@ -52,9 +52,9 @@
 #include <getopt.h>
 
 #include <jack/types.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
 #include <jack/thread.h>
+#include "internal.h"
+#include "engine.h"
 #include <sysdeps/time.h>
 
 #include "sun_driver.h"
diff --git a/drivers/sun/sun_driver.h b/drivers/sun/sun_driver.h
index f40158e..bd96674 100644
--- a/drivers/sun/sun_driver.h
+++ b/drivers/sun/sun_driver.h
@@ -34,9 +34,9 @@
 
 #include <jack/types.h>
 #include <jack/jslist.h>
-#include <jack/driver.h>
 #include <jack/jack.h>
 
+#include "driver.h"
 
 #define SUN_DRIVER_DEF_DEV	"/dev/audio"
 #define SUN_DRIVER_DEF_FS	48000
diff --git a/jackd/clientengine.c b/jackd/clientengine.c
index 873808f..03147b6 100644
--- a/jackd/clientengine.c
+++ b/jackd/clientengine.c
@@ -29,11 +29,11 @@
 #include <string.h>
 #include <signal.h>
 
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
-#include <jack/version.h>
-#include <jack/driver.h>
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
+#include "version.h"
+#include "driver.h"
 #include <sysdeps/poll.h>
 #include <sysdeps/ipc.h>
 
diff --git a/jackd/controlapi.c b/jackd/controlapi.c
index a439a91..9ff32e7 100644
--- a/jackd/controlapi.c
+++ b/jackd/controlapi.c
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#include "jack/internal.h"
+#include "internal.h"
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
@@ -36,11 +36,13 @@
 #include <signal.h>
 
 #include "jack/jslist.h"
-#include "jack/driver_interface.h"
-#include "jack/driver.h"
+#include "jack/control.h"
 
-#include "jack/engine.h"
+#include "driver_interface.h"
+#include "driver.h"
+#include "engine.h"
 #include "clientengine.h"
+
 //#include "JackError.h"
 //#include "JackServer.h"
 //#include "shm.h"
@@ -51,8 +53,6 @@
 //#include "JackDriverLoader.h"
 //#include "JackServerGlobals.h"
 
-#include "jack/control.h"
-
 /*
  * XXX: dont like statics here.
  */
diff --git a/jackd/engine.c b/jackd/engine.c
index 1e05e9e..5d5d1cb 100644
--- a/jackd/engine.c
+++ b/jackd/engine.c
@@ -39,12 +39,14 @@
 #include <string.h>
 #include <limits.h>
 
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
-#include <jack/driver.h>
-#include <jack/shm.h>
 #include <jack/thread.h>
+
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
+#include "driver.h"
+#include "shm.h"
+
 #include <sysdeps/poll.h>
 #include <sysdeps/ipc.h>
 
diff --git a/jackd/jackd.c b/jackd/jackd.c
index 5c0da4a..319124b 100644
--- a/jackd/jackd.c
+++ b/jackd/jackd.c
@@ -33,21 +33,22 @@
 #include <dirent.h>
 #include <dlfcn.h>
 
-#include <jack/engine.h>
-#include <jack/internal.h>
-#include <jack/driver.h>
-#include <jack/shm.h>
-#include <jack/driver_parse.h>
-#include <jack/messagebuffer.h>
 #include <jack/midiport.h>
 
+#include "engine.h"
+#include "internal.h"
+#include "driver.h"
+#include "shm.h"
+#include "driver_parse.h"
+#include "messagebuffer.h"
+
 #ifdef USE_CAPABILITIES
 
 #include <sys/stat.h>
 /* capgetp and capsetp are linux only extensions, not posix */
 #undef _POSIX_SOURCE
 #include <sys/capability.h>
-#include <jack/start.h>
+#include "start.h"
 
 static struct stat pipe_stat;
 
diff --git a/jackd/transengine.c b/jackd/transengine.c
index aea1d0a..331f1fc 100644
--- a/jackd/transengine.c
+++ b/jackd/transengine.c
@@ -24,9 +24,10 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
 #include "transengine.h"
 
 /********************** internal functions **********************/
diff --git a/libjack/client.c b/libjack/client.c
index 61db200..5f4968a 100644
--- a/libjack/client.c
+++ b/libjack/client.c
@@ -37,18 +37,19 @@
 #include <sys/un.h>
 #include <sys/mman.h>
 
-#include <jack/internal.h>
 #include <jack/jack.h>
-#include <jack/engine.h>
-#include <jack/pool.h>
 #include <jack/jslist.h>
-#include <jack/version.h>
-#include <jack/shm.h>
-#include <jack/unlock.h>
 #include <jack/thread.h>
-#include <jack/varargs.h>
-#include <jack/intsimd.h>
-#include <jack/messagebuffer.h>
+
+#include "internal.h"
+#include "engine.h"
+#include "pool.h"
+#include "version.h"
+#include "shm.h"
+#include "unlock.h"
+#include "varargs.h"
+#include "intsimd.h"
+#include "messagebuffer.h"
 
 #include <sysdeps/time.h>
 
diff --git a/libjack/driver.c b/libjack/driver.c
index 34db14a..f5093af 100644
--- a/libjack/driver.c
+++ b/libjack/driver.c
@@ -26,11 +26,12 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <jack/internal.h>
-#include <jack/driver.h>
-#include <jack/engine.h>
 #include <jack/thread.h>
 
+#include "internal.h"
+#include "driver.h"
+#include "engine.h"
+
 #ifdef USE_MLOCK
 #include <sys/mman.h>
 #endif /* USE_MLOCK */
diff --git a/libjack/intclient.c b/libjack/intclient.c
index 8901b5d..453eb00 100644
--- a/libjack/intclient.c
+++ b/libjack/intclient.c
@@ -25,9 +25,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <jack/internal.h>
 #include <jack/intclient.h>
-#include <jack/varargs.h>
+
+#include "internal.h"
+#include "varargs.h"
 
 #include "local.h"
 
diff --git a/libjack/messagebuffer.c b/libjack/messagebuffer.c
index 53e59c3..f0fc4fb 100644
--- a/libjack/messagebuffer.c
+++ b/libjack/messagebuffer.c
@@ -31,9 +31,9 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <jack/messagebuffer.h>
-#include <jack/atomicity.h>
-#include <jack/internal.h>
+#include "messagebuffer.h"
+#include "atomicity.h"
+#include "internal.h"
 
 /* MB_NEXT() relies on the fact that MB_BUFFERS is a power of two */
 #define MB_BUFFERS	128
diff --git a/libjack/midiport.c b/libjack/midiport.c
index cca5fd4..b673972 100644
--- a/libjack/midiport.c
+++ b/libjack/midiport.c
@@ -24,7 +24,8 @@
 
 #include <jack/jack.h>
 #include <jack/midiport.h>
-#include <jack/port.h>
+
+#include "port.h"
 
 enum { MIDI_INLINE_MAX = 4 }; /* 4 bytes for default event size */
 
diff --git a/libjack/pool.c b/libjack/pool.c
index b8d2538..f329cd5 100644
--- a/libjack/pool.c
+++ b/libjack/pool.c
@@ -24,7 +24,8 @@
 #endif
 #include <stdlib.h>
 #include <config.h>
-#include <jack/pool.h>
+
+#include "pool.h"
 
 /* XXX need RT-pool based allocator here */
 void *
diff --git a/libjack/port.c b/libjack/port.c
index 407f6f7..04c0e85 100644
--- a/libjack/port.c
+++ b/libjack/port.c
@@ -27,13 +27,15 @@
 
 #include <jack/jack.h>
 #include <jack/types.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/pool.h>
-#include <jack/port.h>
 #include <jack/midiport.h>
+
 #include <jack/jslist.h>
-#include <jack/intsimd.h>
+
+#include "internal.h"
+#include "engine.h"
+#include "pool.h"
+#include "port.h"
+#include "intsimd.h"
 
 #include "local.h"
 
diff --git a/libjack/shm.c b/libjack/shm.c
index 375ac58..bdd4a2b 100644
--- a/libjack/shm.c
+++ b/libjack/shm.c
@@ -47,9 +47,9 @@
 #include <sys/sem.h>
 #include <sysdeps/ipc.h>
 
-#include <jack/shm.h>
-#include <jack/internal.h>
-#include <jack/version.h>
+#include "shm.h"
+#include "internal.h"
+#include "version.h"
 
 #ifdef USE_POSIX_SHM
 static jack_shmtype_t jack_shmtype = shm_POSIX;
diff --git a/libjack/simd.c b/libjack/simd.c
index d1d1412..0c2c558 100644
--- a/libjack/simd.c
+++ b/libjack/simd.c
@@ -20,7 +20,7 @@
 
 
 #include <config.h>
-#include <jack/intsimd.h>
+#include "intsimd.h"
 
 #ifdef USE_DYNSIMD
 
diff --git a/libjack/thread.c b/libjack/thread.c
index 61dbc08..70cd03e 100644
--- a/libjack/thread.c
+++ b/libjack/thread.c
@@ -25,7 +25,8 @@
 
 #include <jack/jack.h>
 #include <jack/thread.h>
-#include <jack/internal.h>
+
+#include "internal.h"
 
 #include <pthread.h>
 #include <sched.h>
diff --git a/libjack/time.c b/libjack/time.c
index 6412ea0..449329b 100644
--- a/libjack/time.c
+++ b/libjack/time.c
@@ -31,9 +31,10 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#include <jack/internal.h>
+#include "internal.h"
+#include "engine.h"
+
 #include <jack/jack.h>
-#include <jack/engine.h>
 
 #include <sysdeps/time.h>
 #include <sysdeps/cycles.h>
diff --git a/libjack/timestamps.c b/libjack/timestamps.c
index 62ee2cb..934e214 100644
--- a/libjack/timestamps.c
+++ b/libjack/timestamps.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <jack/timestamps.h>
-#include <jack/internal.h>
+#include "internal.h"
 #include <sysdeps/time.h>
 
 typedef struct {
diff --git a/libjack/transclient.c b/libjack/transclient.c
index c6b0866..135e3f9 100644
--- a/libjack/transclient.c
+++ b/libjack/transclient.c
@@ -24,8 +24,9 @@
 #include <errno.h>
 #include <math.h>
 #include <stdio.h>
-#include <jack/atomicity.h>
-#include <jack/internal.h>
+
+#include "atomicity.h"
+#include "internal.h"
 #include "local.h"
 
 
diff --git a/libjack/unlock.c b/libjack/unlock.c
index f621449..fc04278 100644
--- a/libjack/unlock.c
+++ b/libjack/unlock.c
@@ -24,8 +24,8 @@
 #include <limits.h>
 #include <sys/mman.h>
 
-#include "jack/unlock.h"
-#include "jack/internal.h"
+#include "unlock.h"
+#include "internal.h"
 
 static char* blacklist[] = {
 	"/libgtk",
diff --git a/tools b/tools
index c8270e3..de33cb4 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit c8270e367f8d45663f8bfd5478c6ae763645ae24
+Subproject commit de33cb42676acfc6f94f4b3a9d5b40bfdcbb935c