diff --git a/common/jack/control.h b/common/jack/control.h
index 06ee46d7..b3f5756e 100644
--- a/common/jack/control.h
+++ b/common/jack/control.h
@@ -125,19 +125,6 @@ void
 jackctl_server_destroy(
 	jackctl_server_t * server);
 
-/** 
- * Call this function to get list of available drivers. List node data
- * pointers is a driver object handle (::jackctl_driver_t).
- * 
- * @param server server object handle to get drivers for
- *
- * @return Single linked list of driver object handles. Must not be
- * modified. Always same for same server object.
- */
-const JSList *
-jackctl_server_get_drivers_list(
-	jackctl_server_t * server);
-
 /** 
  * Call this function to start JACK server
  * 
@@ -162,6 +149,19 @@ bool
 jackctl_server_stop(
 	jackctl_server_t * server);
 
+/** 
+ * Call this function to get list of available drivers. List node data
+ * pointers is a driver object handle (::jackctl_driver_t).
+ * 
+ * @param server server object handle to get drivers for
+ *
+ * @return Single linked list of driver object handles. Must not be
+ * modified. Always same for same server object.
+ */
+const JSList *
+jackctl_server_get_drivers_list(
+	jackctl_server_t * server);
+
 /** 
  * Call this function to get list of server parameters. List node data
  * pointers is a parameter object handle (::jackctl_parameter_t).
@@ -175,6 +175,82 @@ const JSList *
 jackctl_server_get_parameters(
 	jackctl_server_t * server);
 
+/** 
+ * Call this function to get list of available internal clients. List node data
+ * pointers is a internal client object handle (::jackctl_internal_t).
+ * 
+ * @param server server object handle to get internal clients for
+ *
+ * @return Single linked list of internal client object handles. Must not be
+ * modified. Always same for same server object.
+ */
+const JSList *
+jackctl_server_get_internals_list(
+	jackctl_server_t * server);
+
+/** 
+ * Call this function to load one internal client.
+ * 
+ * @param server server object handle
+ * @param internal internal to use
+ * 
+ * @return success status: true - success, false - fail
+ */
+bool
+jackctl_server_load_internal(
+    jackctl_server_t * server,
+    jackctl_internal_t * internal);
+
+/** 
+ * Call this function to unload one internal client.
+ * 
+ * @param server server object handle
+ * @param internal internal to unload
+ * 
+ * @return success status: true - success, false - fail
+ */
+bool
+jackctl_server_unload_internal(
+    jackctl_server_t * server,
+    jackctl_internal_t * internal);
+
+/** 
+ * Call this function to add a slave in the driver slave list.
+ * 
+ * @param server server object handle
+ * @param driver driver to add in the driver slave list.
+ * 
+ * @return success status: true - success, false - fail
+ */ 
+bool 
+jackctl_server_add_slave(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+
+/** 
+ * Call this function to remove a slave from the driver slave list.
+ * 
+ * @param server server object handle
+ * @param driver driver to remove from the driver slave list.
+ * 
+ * @return success status: true - success, false - fail
+ */ 
+bool 
+jackctl_server_remove_slave(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+
+/** 
+ * Call this function to switch master driver.
+ * 
+ * @param server server object handle
+ * @param driver driver to switch to
+ * 
+ * @return success status: true - success, false - fail
+ */                          
+bool 
+jackctl_server_switch_master(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+                            
+
 /** 
  * Call this function to get name of driver.
  * 
@@ -200,6 +276,31 @@ const JSList *
 jackctl_driver_get_parameters(
 	jackctl_driver_t * driver);
 
+/** 
+ * Call this function to get name of internal client.
+ * 
+ * @param internal internal object handle to get name of
+ *
+ * @return internal name. Must not be modified. Always same for same
+ * internal object.
+ */
+const char *
+jackctl_internal_get_name(
+	jackctl_internal_t * internal);
+
+/** 
+ * Call this function to get list of internal parameters. List node data
+ * pointers is a parameter object handle (::jackctl_parameter_t).
+ * 
+ * @param internal internal object handle to get parameters for
+ *
+ * @return Single linked list of parameter object handles. Must not be
+ * modified. Always same for same internal object.
+ */
+const JSList *
+jackctl_internal_get_parameters(
+	jackctl_internal_t * internal);
+
 /** 
  * Call this function to get parameter name.
  * 
@@ -414,70 +515,6 @@ bool
 jackctl_parameter_constraint_is_fake_value(
 	jackctl_parameter_t * parameter);
 
-/** 
- * Call this function to get list of available internal clients. List node data
- * pointers is a internal client object handle (::jackctl_internal_t).
- * 
- * @param server server object handle to get internal clients for
- *
- * @return Single linked list of internal client object handles. Must not be
- * modified. Always same for same server object.
- */
-const JSList *
-jackctl_server_get_internals_list(
-	jackctl_server_t * server);
-
-/** 
- * Call this function to get name of internal client.
- * 
- * @param internal internal object handle to get name of
- *
- * @return internal name. Must not be modified. Always same for same
- * internal object.
- */
-const char *
-jackctl_internal_get_name(
-	jackctl_internal_t * internal);
-
-/** 
- * Call this function to get list of internal parameters. List node data
- * pointers is a parameter object handle (::jackctl_parameter_t).
- * 
- * @param internal internal object handle to get parameters for
- *
- * @return Single linked list of parameter object handles. Must not be
- * modified. Always same for same internal object.
- */
-const JSList *
-jackctl_internal_get_parameters(
-	jackctl_internal_t * internal);
-
-/** 
- * Call this function to load one internal client.
- * 
- * @param server server object handle
- * @param internal internal to use
- * 
- * @return success status: true - success, false - fail
- */
-bool
-jackctl_server_load_internal(
-    jackctl_server_t * server,
-    jackctl_internal_t * internal);
-
-/** 
- * Call this function to unload one internal client.
- * 
- * @param server server object handle
- * @param internal internal to unload
- * 
- * @return success status: true - success, false - fail
- */
-bool
-jackctl_server_unload_internal(
-    jackctl_server_t * server,
-    jackctl_internal_t * internal);
-
 /** 
  * Call this function to log an error message.
  * 
@@ -511,43 +548,6 @@ jack_log(
 
 /* @} */
 
-/** 
- * Call this function to add a slave in the driver slave list.
- * 
- * @param server server object handle
- * @param driver driver to add in the driver slave list.
- * 
- * @return success status: true - success, false - fail
- */ 
-bool 
-jackctl_server_add_slave(jackctl_server_t * server,
-                            jackctl_driver_t * driver);
-
-/** 
- * Call this function to remove a slave from the driver slave list.
- * 
- * @param server server object handle
- * @param driver driver to remove from the driver slave list.
- * 
- * @return success status: true - success, false - fail
- */ 
-bool 
-jackctl_server_remove_slave(jackctl_server_t * server,
-                            jackctl_driver_t * driver);
-
-/** 
- * Call this function to switch master driver.
- * 
- * @param server server object handle
- * @param driver driver to switch to
- * 
- * @return success status: true - success, false - fail
- */                          
-bool 
-jackctl_server_switch_master(jackctl_server_t * server,
-                            jackctl_driver_t * driver);
-                            
-
 #if 0
 { /* Adjust editor indent */
 #endif
diff --git a/macosx/JackMachNotifyChannel.h b/macosx/JackMachNotifyChannel.h
index 0cae49dd..14afeb3f 100644
--- a/macosx/JackMachNotifyChannel.h
+++ b/macosx/JackMachNotifyChannel.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackMachNotifyChannel__
 #define __JackMachNotifyChannel__
 
-#include "JackChannel.h"
 #include "JackMachPort.h"
 
 namespace Jack
diff --git a/macosx/JackMachServerChannel.h b/macosx/JackMachServerChannel.h
index a6b351c7..9e5ac35f 100644
--- a/macosx/JackMachServerChannel.h
+++ b/macosx/JackMachServerChannel.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackMachServerChannel__
 #define __JackMachServerChannel__
 
-#include "JackChannel.h"
 #include "JackPlatformPlug.h"
 #include "JackMachPort.h"
 #include <map>
diff --git a/posix/JackSocketServerChannel.h b/posix/JackSocketServerChannel.h
index d0c1ba64..11581890 100644
--- a/posix/JackSocketServerChannel.h
+++ b/posix/JackSocketServerChannel.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackSocketServerChannel__
 #define __JackSocketServerChannel__
 
-#include "JackChannel.h"
 #include "JackSocket.h"
 #include "JackPlatformPlug.h"
 #include <poll.h>
diff --git a/posix/JackSocketServerNotifyChannel.h b/posix/JackSocketServerNotifyChannel.h
index 4d8afa54..d8687dfa 100644
--- a/posix/JackSocketServerNotifyChannel.h
+++ b/posix/JackSocketServerNotifyChannel.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackSocketServerNotifyChannel__
 #define __JackSocketServerNotifyChannel__
 
-#include "JackChannel.h"
 #include "JackSocket.h"
 
 namespace Jack
diff --git a/windows/JackWinNamedPipeNotifyChannel.h b/windows/JackWinNamedPipeNotifyChannel.h
index 5d3b9488..0ade63d1 100644
--- a/windows/JackWinNamedPipeNotifyChannel.h
+++ b/windows/JackWinNamedPipeNotifyChannel.h
@@ -20,7 +20,6 @@ Copyright (C) 2004-2006 Grame
 #ifndef __JackWinNamedPipeNotifyChannel__
 #define __JackWinNamedPipeNotifyChannel__
 
-#include "JackChannel.h"
 #include "JackWinNamedPipe.h"
 
 namespace Jack
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 74ea7cca..adb6941b 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -20,7 +20,6 @@ Copyright (C) 2004-2006 Grame
 #ifndef __JackWinNamedPipeServerChannel__
 #define __JackWinNamedPipeServerChannel__
 
-#include "JackChannel.h"
 #include "JackWinNamedPipe.h"
 #include "JackPlatformPlug.h"
 #include <list>