#include changes to reflect separation of public and private headers

5 files changed, 30 insertions, 26 deletions

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 **********************/