diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp
index a6356b5c..673968e2 100644
--- a/common/JackAudioDriver.cpp
+++ b/common/JackAudioDriver.cpp
@@ -33,14 +33,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackPort.h"
 #include "JackGraphManager.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackException.h"
 #include <assert.h>
 
 namespace Jack
 {
 
-JackAudioDriver::JackAudioDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+JackAudioDriver::JackAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
         : JackDriver(name, alias, engine, table),
         fCaptureChannels(0),
         fPlaybackChannels(0),
diff --git a/common/JackAudioDriver.h b/common/JackAudioDriver.h
index c92eaafa..19e93297 100644
--- a/common/JackAudioDriver.h
+++ b/common/JackAudioDriver.h
@@ -57,7 +57,7 @@ class EXPORT JackAudioDriver : public JackDriver
 
     public:
 
-        JackAudioDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table);
+        JackAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table);
         virtual ~JackAudioDriver();
 
         virtual int Process();
diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp
index 25b4a585..7c108392 100644
--- a/common/JackDriver.cpp
+++ b/common/JackDriver.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackGlobals.h"
 #include "JackEngineControl.h"
 #include "JackClientControl.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include <math.h>
 #include <assert.h>
 
@@ -43,7 +43,7 @@ using namespace std;
 namespace Jack
 {
 
-JackDriver::JackDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+JackDriver::JackDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
 {
     assert(strlen(name) < JACK_CLIENT_NAME_SIZE);
     fSynchroTable = table;
diff --git a/common/JackDriver.h b/common/JackDriver.h
index ce48956f..7bf6acba 100644
--- a/common/JackDriver.h
+++ b/common/JackDriver.h
@@ -30,7 +30,7 @@
 namespace Jack
 {
     
-class JackEngineInterface;
+class JackLockedEngine;
 class JackGraphManager;
 struct JackEngineControl;
 struct JackClientControl;
@@ -150,7 +150,7 @@ class EXPORT JackDriver : public JackDriverClient
         jack_nframes_t fPlaybackLatency;
         jack_time_t fLastWaitUst;
         float fDelayedUsecs;
-        JackEngineInterface* fEngine;
+        JackLockedEngine* fEngine;
         JackGraphManager* fGraphManager;
         JackSynchro* fSynchroTable;
         JackEngineControl* fEngineControl;
@@ -163,7 +163,7 @@ class EXPORT JackDriver : public JackDriverClient
 
     public:
         
-        JackDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table);
+        JackDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table);
         JackDriver();
         virtual ~JackDriver();
         
diff --git a/common/JackDriverLoader.h b/common/JackDriverLoader.h
index f0ed9318..05f5fa8a 100644
--- a/common/JackDriverLoader.h
+++ b/common/JackDriverLoader.h
@@ -45,11 +45,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 
 typedef jack_driver_desc_t * (*JackDriverDescFunction) ();
-typedef Jack::JackDriverClientInterface* (*initialize) (Jack::JackEngineInterface*, Jack::JackSynchro*, const JSList *);
+typedef Jack::JackDriverClientInterface* (*initialize) (Jack::JackLockedEngine*, Jack::JackSynchro*, const JSList *);
 
 typedef struct _jack_driver_info
 {
-    Jack::JackDriverClientInterface* (*initialize)(Jack::JackEngineInterface*, Jack::JackSynchro*, const JSList *);
+    Jack::JackDriverClientInterface* (*initialize)(Jack::JackLockedEngine*, Jack::JackSynchro*, const JSList *);
     DRIVER_HANDLE handle;
 }
 jack_driver_info_t;
diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp
index 3bf2665b..ee0fe11d 100644
--- a/common/JackDummyDriver.cpp
+++ b/common/JackDummyDriver.cpp
@@ -138,7 +138,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t sample_rate = 48000;
         jack_nframes_t period_size = 1024;
         unsigned int capture_ports = 2;
diff --git a/common/JackDummyDriver.h b/common/JackDummyDriver.h
index 8ac2c582..2a12f7df 100644
--- a/common/JackDummyDriver.h
+++ b/common/JackDummyDriver.h
@@ -38,7 +38,7 @@ class JackDummyDriver : public JackAudioDriver
 
     public:
 
-        JackDummyDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table, unsigned long wait_time)
+        JackDummyDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table, unsigned long wait_time)
                 : JackAudioDriver(name, alias, engine, table), fWaitTime(wait_time)
         {}
         virtual ~JackDummyDriver()
diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index eb559583..c19b2081 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <signal.h>
 #endif
 
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackExternalClient.h"
 #include "JackInternalClient.h"
 #include "JackEngineControl.h"
diff --git a/common/JackEngine.h b/common/JackEngine.h
index 33827c69..47360861 100644
--- a/common/JackEngine.h
+++ b/common/JackEngine.h
@@ -33,60 +33,6 @@ namespace Jack
 class JackClientInterface;
 struct JackEngineControl;
 class JackExternalClient;
-    
-class JackEngineInterface
-{
-     public:
-        
-        JackEngineInterface()
-        {}
-        JackEngineInterface(JackGraphManager* manager, JackSynchro** table, JackEngineControl* controler)
-        {}
-        virtual ~JackEngineInterface()
-        {}
-        
-        virtual int Open() = 0;
-        virtual int Close() = 0;
-        
-        // Client management
-        virtual int ClientCheck(const char* name, char* name_res, int protocol, int options, int* status) = 0;
-        virtual int ClientExternalOpen(const char* name, int pid, int* ref, int* shared_engine, int* shared_client, int* shared_graph_manager) = 0;
-        virtual int ClientInternalOpen(const char* name, int* ref, JackEngineControl** shared_engine, JackGraphManager** shared_manager, JackClientInterface* client, bool wait) = 0;
-        
-        virtual int ClientExternalClose(int refnum) = 0;
-        virtual int ClientInternalClose(int refnum, bool wait) = 0;
-        
-        virtual int ClientActivate(int refnum, bool state) = 0;
-        virtual int ClientDeactivate(int refnum) = 0;
-        
-        virtual int GetClientPID(const char* name) = 0;
-        
-        // Internal client management
-        virtual int GetInternalClientName(int int_ref, char* name_res) = 0;
-        virtual int InternalClientHandle(const char* client_name, int* status, int* int_ref) = 0;
-        virtual int InternalClientUnload(int refnum, int* status) = 0;
-        
-        // Port management
-        virtual int PortRegister(int refnum, const char* name, const char *type, unsigned int flags, unsigned int buffer_size, unsigned int* port) = 0;
-        virtual int PortUnRegister(int refnum, jack_port_id_t port) = 0;
-        
-        virtual int PortConnect(int refnum, const char* src, const char* dst) = 0;
-        virtual int PortDisconnect(int refnum, const char* src, const char* dst) = 0;
-        
-        virtual int PortConnect(int refnum, jack_port_id_t src, jack_port_id_t dst) = 0;
-        virtual int PortDisconnect(int refnum, jack_port_id_t src, jack_port_id_t dst) = 0;
-        
-        // Graph
-        virtual bool Process(jack_time_t callback_usecs) = 0;
-        
-        // Notifications
-        virtual void NotifyXRun(jack_time_t callback_usecs, float delayed_usecs) = 0;
-        virtual void NotifyXRun(int refnum) = 0;
-        virtual void NotifyGraphReorder() = 0;
-        virtual void NotifyBufferSize(jack_nframes_t nframes) = 0;
-        virtual void NotifyFreewheel(bool onoff) = 0;
- 
- };
 
 /*!
 \brief Engine description.
diff --git a/common/JackFreewheelDriver.cpp b/common/JackFreewheelDriver.cpp
index 1f64f1fe..2e4eec77 100644
--- a/common/JackFreewheelDriver.cpp
+++ b/common/JackFreewheelDriver.cpp
@@ -28,7 +28,7 @@
 
 #include "JackFreewheelDriver.h"
 #include "JackEngineControl.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 
 namespace Jack
 {
diff --git a/common/JackFreewheelDriver.h b/common/JackFreewheelDriver.h
index 0a57f222..b988ffb0 100644
--- a/common/JackFreewheelDriver.h
+++ b/common/JackFreewheelDriver.h
@@ -35,7 +35,7 @@ class JackFreewheelDriver : public JackDriver
 
     public:
 
-        JackFreewheelDriver(JackEngineInterface* engine, JackSynchro* table): JackDriver("freewheel", "", engine, table)
+        JackFreewheelDriver(JackLockedEngine* engine, JackSynchro* table): JackDriver("freewheel", "", engine, table)
         {}
         virtual ~JackFreewheelDriver()
         {}
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index fc0f1d23..eba0dfc8 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackGraphManager.h"
 #include "JackInternalClient.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackServer.h"
 #include "JackEngineControl.h"
 #include "JackClientControl.h"
diff --git a/common/JackInternalClientChannel.h b/common/JackInternalClientChannel.h
index 8bfb5a51..401529c3 100644
--- a/common/JackInternalClientChannel.h
+++ b/common/JackInternalClientChannel.h
@@ -35,7 +35,7 @@ class JackInternalClientChannel : public detail::JackClientChannelInterface
     private:
 
         JackServer* fServer;
-        JackEngineInterface* fEngine;
+        JackLockedEngine* fEngine;
 
     public:
 
diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h
index fb3669b8..af134c7b 100644
--- a/common/JackLockedEngine.h
+++ b/common/JackLockedEngine.h
@@ -30,7 +30,7 @@ namespace Jack
 \brief Locked Engine.
 */
 
-class JackLockedEngine : public JackEngineInterface, public JackLockAble
+class JackLockedEngine : public JackLockAble
 {
     private:
 
@@ -188,7 +188,6 @@ class JackLockedEngine : public JackEngineInterface, public JackLockAble
 
 };
 
-
 } // end of namespace
 
 #endif
diff --git a/common/JackLoopbackDriver.h b/common/JackLoopbackDriver.h
index 5bd25824..5c542e3a 100644
--- a/common/JackLoopbackDriver.h
+++ b/common/JackLoopbackDriver.h
@@ -35,7 +35,7 @@ class JackLoopbackDriver : public JackAudioDriver
 
     public:
 
-        JackLoopbackDriver(JackEngineInterface* engine, JackSynchro* table)
+        JackLoopbackDriver(JackLockedEngine* engine, JackSynchro* table)
                 : JackAudioDriver("loopback", "", engine, table)
         {}
         virtual ~JackLoopbackDriver()
diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index a4a3a94d..9739447d 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 namespace Jack
 {
-	JackNetDriver::JackNetDriver ( const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table,
+	JackNetDriver::JackNetDriver ( const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table,
 	                               char* ip, size_t port, int midi_input_ports, int midi_output_ports, char* net_name )
 			: JackAudioDriver ( name, alias, engine, table )
 	{
@@ -632,7 +632,7 @@ namespace Jack
 			return desc;
 		}
 
-		Jack::JackDriverClientInterface* driver_initialize ( Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params )
+		Jack::JackDriverClientInterface* driver_initialize ( Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params )
 		{
 			char* multicast_ip = DEFAULT_MULTICAST_IP;
 			char name[JACK_CLIENT_NAME_SIZE];
diff --git a/common/JackNetDriver.h b/common/JackNetDriver.h
index 255e3cf2..d6e3fb82 100644
--- a/common/JackNetDriver.h
+++ b/common/JackNetDriver.h
@@ -75,7 +75,7 @@ namespace Jack
 			int Read();
 			int Write();
 		public:
-			JackNetDriver ( const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table,
+			JackNetDriver ( const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table,
 				char* ip, size_t port, int midi_input_ports, int midi_output_ports, char* master_name );
 			~JackNetDriver();
 
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 472ccf58..27c539c7 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -291,7 +291,7 @@ int JackServer::SetTimebaseCallback(int refnum, int conditional)
     return fEngineControl->fTransport.SetTimebase(refnum, conditional);
 }
 
-JackEngineInterface* JackServer::GetEngine()
+JackLockedEngine* JackServer::GetEngine()
 {
     return fEngine;
 }
diff --git a/common/JackServer.h b/common/JackServer.h
index 6eb2cd46..c0f329e0 100644
--- a/common/JackServer.h
+++ b/common/JackServer.h
@@ -39,7 +39,7 @@ namespace Jack
 class JackGraphManager;
 class JackDriverClientInterface;
 struct JackEngineControl;
-class JackEngineInterface;
+class JackLockedEngine;
 
 /*!
 \brief The Jack server.
@@ -54,7 +54,7 @@ class EXPORT JackServer
         JackDriverClientInterface* fAudioDriver;
         JackDriverClientInterface* fFreewheelDriver;
         JackDriverClientInterface* fLoopbackDriver;
-        JackEngineInterface* fEngine;
+        JackLockedEngine* fEngine;
         JackEngineControl* fEngineControl;
         JackGraphManager* fGraphManager;
         JackServerChannel fChannel;
@@ -88,7 +88,7 @@ class EXPORT JackServer
         int SetTimebaseCallback(int refnum, int conditional);
 
         // Object access
-        JackEngineInterface* GetEngine();
+        JackLockedEngine* GetEngine();
         JackEngineControl* GetEngineControl();
         JackSynchro* GetSynchroTable();
         JackGraphManager* GetGraphManager();
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
index 246fe96d..ae8dc3ed 100644
--- a/common/JackServerAPI.cpp
+++ b/common/JackServerAPI.cpp
@@ -34,7 +34,7 @@ This program is free software; you can redistribute it and/or modify
 #include "JackServerLaunch.h"
 #include "JackTools.h"
 #include "JackExports.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/common/JackSocketServerChannel.cpp b/common/JackSocketServerChannel.cpp
index 8d6bc4d2..4ce8387b 100644
--- a/common/JackSocketServerChannel.cpp
+++ b/common/JackSocketServerChannel.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSocketServerChannel.h"
 #include "JackRequest.h"
 #include "JackServer.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackGlobals.h"
 #include "JackClient.h"
 #include "JackNotification.h"
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index d3ba130a..68b2b692 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -43,7 +43,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackPort.h"
 #include "JackGraphManager.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 
 #include "hammerfall.h"
 #include "hdsp.h"
@@ -2608,7 +2608,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t srate = 48000;
         jack_nframes_t frames_per_interrupt = 1024;
         unsigned long user_nperiods = 2;
diff --git a/linux/alsa/JackAlsaDriver.h b/linux/alsa/JackAlsaDriver.h
index f34e88dd..db4bdadb 100644
--- a/linux/alsa/JackAlsaDriver.h
+++ b/linux/alsa/JackAlsaDriver.h
@@ -116,7 +116,7 @@ class JackAlsaDriver : public JackAudioDriver
 
     public:
 
-        JackAlsaDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table): JackAudioDriver(name, alias, engine, table)
+        JackAlsaDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table): JackAudioDriver(name, alias, engine, table)
         {}
         virtual ~JackAlsaDriver()
         {}
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
index f0f420ba..88f9c65f 100644
--- a/linux/firewire/JackFFADODriver.cpp
+++ b/linux/firewire/JackFFADODriver.cpp
@@ -913,7 +913,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         const JSList * node;
         const jack_driver_param_t * param;
 
diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
index 81d1db91..1dd401a6 100644
--- a/linux/firewire/JackFFADODriver.h
+++ b/linux/firewire/JackFFADODriver.h
@@ -62,7 +62,7 @@ class JackFFADODriver : public JackAudioDriver
 
     public:
 
-        JackFFADODriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+        JackFFADODriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
             : JackAudioDriver(name, alias,engine, table)
         {}
         virtual ~JackFFADODriver()
diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp
index 658b4792..af153bd2 100644
--- a/linux/freebob/JackFreebobDriver.cpp
+++ b/linux/freebob/JackFreebobDriver.cpp
@@ -1045,7 +1045,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         unsigned int port = 0;
         unsigned int node_id = -1;
         int nbitems;
diff --git a/linux/freebob/JackFreebobDriver.h b/linux/freebob/JackFreebobDriver.h
index 4a67433e..0f71c2ba 100644
--- a/linux/freebob/JackFreebobDriver.h
+++ b/linux/freebob/JackFreebobDriver.h
@@ -69,7 +69,7 @@ class JackFreebobDriver : public JackAudioDriver
 
     public:
 
-        JackFreebobDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+        JackFreebobDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
             :JackAudioDriver(name, alias, engine, table)
         {}
         virtual ~JackFreebobDriver()
diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp
index 54e599a3..032a4e04 100644
--- a/macosx/JackCoreAudioDriver.cpp
+++ b/macosx/JackCoreAudioDriver.cpp
@@ -425,7 +425,7 @@ OSStatus JackCoreAudioDriver::GetTotalChannels(AudioDeviceID device, int* channe
     return err;
 }
 
-JackCoreAudioDriver::JackCoreAudioDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+JackCoreAudioDriver::JackCoreAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
         : JackAudioDriver(name, alias, engine, table), fJackInputData(NULL), fDriverOutputData(NULL), fState(false), fIOUsage(1.f)
 {}
 
@@ -1249,7 +1249,7 @@ extern "C"
         return desc;
     }
 
-    Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t srate = 44100;
         jack_nframes_t frames_per_interrupt = 128;
         int capture = FALSE;
diff --git a/macosx/JackCoreAudioDriver.h b/macosx/JackCoreAudioDriver.h
index 78a3d38b..69b4f428 100644
--- a/macosx/JackCoreAudioDriver.h
+++ b/macosx/JackCoreAudioDriver.h
@@ -143,7 +143,7 @@ class JackCoreAudioDriver : public JackAudioDriver
 
     public:
 
-        JackCoreAudioDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table);
+        JackCoreAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table);
         virtual ~JackCoreAudioDriver();
 
         int Open(jack_nframes_t frames_per_cycle,
diff --git a/macosx/JackMacEngineRPC.cpp b/macosx/JackMacEngineRPC.cpp
index 52fb5f2c..7d8aeac8 100644
--- a/macosx/JackMacEngineRPC.cpp
+++ b/macosx/JackMacEngineRPC.cpp
@@ -22,7 +22,7 @@ This program is free software; you can redistribute it and/or modify
 #endif
 
 #include "JackServer.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackRPCEngine.h"
 #include "JackMachServerChannel.h"
 #include <assert.h>
diff --git a/macosx/JackMachServerChannel.cpp b/macosx/JackMachServerChannel.cpp
index a516b7bb..0488648e 100644
--- a/macosx/JackMachServerChannel.cpp
+++ b/macosx/JackMachServerChannel.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackRPCEngineServer.c"
 #include "JackError.h"
 #include "JackServer.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackNotification.h"
 
 using namespace std;
@@ -69,7 +69,7 @@ void JackMachServerChannel::Close()
     fServerPort.DestroyPort();
 }
 
-JackEngineInterface* JackMachServerChannel::GetEngine()
+JackLockedEngine* JackMachServerChannel::GetEngine()
 {
     return fServer->GetEngine();
 }
diff --git a/macosx/JackMachServerChannel.h b/macosx/JackMachServerChannel.h
index 40b79d8f..bede52a1 100644
--- a/macosx/JackMachServerChannel.h
+++ b/macosx/JackMachServerChannel.h
@@ -29,7 +29,7 @@ namespace Jack
 {
 
 class JackServer;
-class JackEngineInterface;
+class JackLockedEngine;
 
 /*!
 \brief JackServerChannel using Mach IPC.
@@ -55,7 +55,7 @@ class JackMachServerChannel : public JackRunnableInterface
         int Open(const char* server_name, JackServer* server);	// Open the Server/Client connection
         void Close();                   // Close the Server/Client connection
 
-        JackEngineInterface* GetEngine();
+        JackLockedEngine* GetEngine();
         JackServer* GetServer();
 
         void ClientCheck(char* name, char* name_res, int protocol, int options, int* status, int* result);
diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj
index 30f21580..3b1f5087 100644
--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -505,13 +505,13 @@
 		4BA7BDD20DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		4BA7BDDA0DC2300800AA3457 /* JackFifo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B56880F08B5C8620022B32D /* JackFifo.cpp */; };
 		4BA7BDDB0DC2300A00AA3457 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */; };
-		4BA7BE0F0DC232A400AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
-		4BA7BE1A0DC2347500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
+		4BA7BE0F0DC232A400AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
+		4BA7BE1A0DC2347500AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
 		4BA7BE1C0DC2348600AA3457 /* JackFifo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B56880F08B5C8620022B32D /* JackFifo.cpp */; };
 		4BA7BE1D0DC2348800AA3457 /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */; };
-		4BA7BE200DC234FB00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
-		4BA7BE240DC2350D00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
-		4BA7BE270DC2352A00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
+		4BA7BE200DC234FB00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
+		4BA7BE240DC2350D00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
+		4BA7BE270DC2352A00AA3457 /* Jackdmp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */; };
 		4BA7FECA0D8E76650017FF73 /* control.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA7FEC80D8E76650017FF73 /* control.c */; };
 		4BAB95B80B9E20B800A0C723 /* JackPortType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */; };
 		4BAB95B90B9E20B800A0C723 /* JackPortType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAB95B70B9E20B800A0C723 /* JackPortType.h */; };
@@ -1064,13 +1064,85 @@
 /* Begin PBXFileReference section */
 		4B003AB008E2B2BA0060EFDC /* ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ringbuffer.c; path = ../common/ringbuffer.c; sourceTree = SOURCE_ROOT; };
 		4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackProcessSync.cpp; path = ../common/JackProcessSync.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A04D0DF72BC000840F4C /* alsa_driver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = alsa_driver.h; path = ../linux/alsa/alsa_driver.h; sourceTree = SOURCE_ROOT; };
+		4B05A04E0DF72BC000840F4C /* alsa_midi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = alsa_midi.h; path = ../linux/alsa/alsa_midi.h; sourceTree = SOURCE_ROOT; };
+		4B05A04F0DF72BC000840F4C /* alsa_midi_impl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = alsa_midi_impl.h; path = ../linux/alsa/alsa_midi_impl.h; sourceTree = SOURCE_ROOT; };
+		4B05A0500DF72BC000840F4C /* alsa_midi_jackmp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = alsa_midi_jackmp.cpp; path = ../linux/alsa/alsa_midi_jackmp.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0510DF72BC000840F4C /* alsa_rawmidi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = alsa_rawmidi.c; path = ../linux/alsa/alsa_rawmidi.c; sourceTree = SOURCE_ROOT; };
+		4B05A0520DF72BC000840F4C /* alsa_seqmidi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = alsa_seqmidi.c; path = ../linux/alsa/alsa_seqmidi.c; sourceTree = SOURCE_ROOT; };
+		4B05A0530DF72BC000840F4C /* bitset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = bitset.h; path = ../linux/alsa/bitset.h; sourceTree = SOURCE_ROOT; };
+		4B05A0540DF72BC000840F4C /* generic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = generic.h; path = ../linux/alsa/generic.h; sourceTree = SOURCE_ROOT; };
+		4B05A0550DF72BC000840F4C /* generic_hw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = generic_hw.c; path = ../linux/alsa/generic_hw.c; sourceTree = SOURCE_ROOT; };
+		4B05A0560DF72BC000840F4C /* hammerfall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hammerfall.c; path = ../linux/alsa/hammerfall.c; sourceTree = SOURCE_ROOT; };
+		4B05A0570DF72BC000840F4C /* hammerfall.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hammerfall.h; path = ../linux/alsa/hammerfall.h; sourceTree = SOURCE_ROOT; };
+		4B05A0580DF72BC000840F4C /* hardware.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hardware.h; path = ../linux/alsa/hardware.h; sourceTree = SOURCE_ROOT; };
+		4B05A0590DF72BC000840F4C /* hdsp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hdsp.c; path = ../linux/alsa/hdsp.c; sourceTree = SOURCE_ROOT; };
+		4B05A05A0DF72BC000840F4C /* hdsp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hdsp.h; path = ../linux/alsa/hdsp.h; sourceTree = SOURCE_ROOT; };
+		4B05A05B0DF72BC000840F4C /* ice1712.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ice1712.c; path = ../linux/alsa/ice1712.c; sourceTree = SOURCE_ROOT; };
+		4B05A05C0DF72BC000840F4C /* ice1712.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ice1712.h; path = ../linux/alsa/ice1712.h; sourceTree = SOURCE_ROOT; };
+		4B05A05D0DF72BC000840F4C /* JackAlsaDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAlsaDriver.cpp; path = ../linux/alsa/JackAlsaDriver.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A05E0DF72BC000840F4C /* JackAlsaDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackAlsaDriver.h; path = ../linux/alsa/JackAlsaDriver.h; sourceTree = SOURCE_ROOT; };
+		4B05A05F0DF72BC000840F4C /* jslist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jslist.h; path = ../linux/alsa/jslist.h; sourceTree = SOURCE_ROOT; };
+		4B05A0600DF72BC000840F4C /* memops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = memops.c; path = ../linux/alsa/memops.c; sourceTree = SOURCE_ROOT; };
+		4B05A0610DF72BC000840F4C /* memops.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = memops.h; path = ../linux/alsa/memops.h; sourceTree = SOURCE_ROOT; };
+		4B05A0620DF72BC000840F4C /* midi_pack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = midi_pack.h; path = ../linux/alsa/midi_pack.h; sourceTree = SOURCE_ROOT; };
+		4B05A0630DF72BC000840F4C /* midi_unpack.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = midi_unpack.h; path = ../linux/alsa/midi_unpack.h; sourceTree = SOURCE_ROOT; };
+		4B05A0640DF72BC000840F4C /* usx2y.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = usx2y.c; path = ../linux/alsa/usx2y.c; sourceTree = SOURCE_ROOT; };
+		4B05A0650DF72BC000840F4C /* usx2y.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = usx2y.h; path = ../linux/alsa/usx2y.h; sourceTree = SOURCE_ROOT; };
+		4B05A0670DF72BC000840F4C /* controller.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller.c; path = ../linux/dbus/controller.c; sourceTree = SOURCE_ROOT; };
+		4B05A0680DF72BC000840F4C /* controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = controller.h; path = ../linux/dbus/controller.h; sourceTree = SOURCE_ROOT; };
+		4B05A0690DF72BC000840F4C /* controller_iface_configure.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller_iface_configure.c; path = ../linux/dbus/controller_iface_configure.c; sourceTree = SOURCE_ROOT; };
+		4B05A06A0DF72BC000840F4C /* controller_iface_control.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller_iface_control.c; path = ../linux/dbus/controller_iface_control.c; sourceTree = SOURCE_ROOT; };
+		4B05A06B0DF72BC000840F4C /* controller_iface_introspectable.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller_iface_introspectable.c; path = ../linux/dbus/controller_iface_introspectable.c; sourceTree = SOURCE_ROOT; };
+		4B05A06C0DF72BC000840F4C /* controller_iface_patchbay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller_iface_patchbay.c; path = ../linux/dbus/controller_iface_patchbay.c; sourceTree = SOURCE_ROOT; };
+		4B05A06D0DF72BC000840F4C /* controller_iface_transport.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = controller_iface_transport.c; path = ../linux/dbus/controller_iface_transport.c; sourceTree = SOURCE_ROOT; };
+		4B05A06E0DF72BC000840F4C /* controller_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = controller_internal.h; path = ../linux/dbus/controller_internal.h; sourceTree = SOURCE_ROOT; };
+		4B05A06F0DF72BC000840F4C /* jackdbus.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jackdbus.c; path = ../linux/dbus/jackdbus.c; sourceTree = SOURCE_ROOT; };
+		4B05A0700DF72BC000840F4C /* jackdbus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jackdbus.h; path = ../linux/dbus/jackdbus.h; sourceTree = SOURCE_ROOT; };
+		4B05A0710DF72BC000840F4C /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = ../linux/dbus/list.h; sourceTree = SOURCE_ROOT; };
+		4B05A0720DF72BC000840F4C /* org.jackaudio.service.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = org.jackaudio.service.in; path = ../linux/dbus/org.jackaudio.service.in; sourceTree = SOURCE_ROOT; };
+		4B05A0730DF72BC000840F4C /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = SConscript; path = ../linux/dbus/SConscript; sourceTree = SOURCE_ROOT; };
+		4B05A0740DF72BC000840F4C /* sigsegv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sigsegv.c; path = ../linux/dbus/sigsegv.c; sourceTree = SOURCE_ROOT; };
+		4B05A0750DF72BC000840F4C /* sigsegv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sigsegv.h; path = ../linux/dbus/sigsegv.h; sourceTree = SOURCE_ROOT; };
+		4B05A0760DF72BC000840F4C /* wscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = wscript; path = ../linux/dbus/wscript; sourceTree = SOURCE_ROOT; };
+		4B05A0770DF72BC000840F4C /* xml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml.c; path = ../linux/dbus/xml.c; sourceTree = SOURCE_ROOT; };
+		4B05A0780DF72BC000840F4C /* xml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = xml.h; path = ../linux/dbus/xml.h; sourceTree = SOURCE_ROOT; };
+		4B05A0790DF72BC000840F4C /* xml_expat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml_expat.c; path = ../linux/dbus/xml_expat.c; sourceTree = SOURCE_ROOT; };
+		4B05A07A0DF72BC000840F4C /* xml_libxml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml_libxml.c; path = ../linux/dbus/xml_libxml.c; sourceTree = SOURCE_ROOT; };
+		4B05A07B0DF72BC000840F4C /* xml_nop.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml_nop.c; path = ../linux/dbus/xml_nop.c; sourceTree = SOURCE_ROOT; };
+		4B05A07C0DF72BC000840F4C /* xml_write_raw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xml_write_raw.c; path = ../linux/dbus/xml_write_raw.c; sourceTree = SOURCE_ROOT; };
+		4B05A07D0DF72BC000840F4C /* driver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = driver.h; path = ../linux/driver.h; sourceTree = SOURCE_ROOT; };
+		4B05A07F0DF72BC000840F4C /* ffado_driver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ffado_driver.h; path = ../linux/firewire/ffado_driver.h; sourceTree = SOURCE_ROOT; };
+		4B05A0800DF72BC000840F4C /* JackFFADODriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFFADODriver.cpp; path = ../linux/firewire/JackFFADODriver.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0810DF72BC000840F4C /* JackFFADODriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFFADODriver.h; path = ../linux/firewire/JackFFADODriver.h; sourceTree = SOURCE_ROOT; };
+		4B05A0830DF72BC000840F4C /* freebob_driver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = freebob_driver.h; path = ../linux/freebob/freebob_driver.h; sourceTree = SOURCE_ROOT; };
+		4B05A0840DF72BC000840F4C /* JackFreebobDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFreebobDriver.cpp; path = ../linux/freebob/JackFreebobDriver.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0850DF72BC000840F4C /* JackFreebobDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFreebobDriver.h; path = ../linux/freebob/JackFreebobDriver.h; sourceTree = SOURCE_ROOT; };
+		4B05A08B0DF72C3200840F4C /* JackWinEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinEvent.cpp; path = ../windows/JackWinEvent.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A08C0DF72C3200840F4C /* JackWinEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinEvent.h; path = ../windows/JackWinEvent.h; sourceTree = SOURCE_ROOT; };
+		4B05A08D0DF72C3200840F4C /* JackWinNamedPipe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinNamedPipe.cpp; path = ../windows/JackWinNamedPipe.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A08E0DF72C3200840F4C /* JackWinNamedPipe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinNamedPipe.h; path = ../windows/JackWinNamedPipe.h; sourceTree = SOURCE_ROOT; };
+		4B05A08F0DF72C3200840F4C /* JackWinNamedPipeClientChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinNamedPipeClientChannel.cpp; path = ../windows/JackWinNamedPipeClientChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0900DF72C3200840F4C /* JackWinNamedPipeClientChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinNamedPipeClientChannel.h; path = ../windows/JackWinNamedPipeClientChannel.h; sourceTree = SOURCE_ROOT; };
+		4B05A0910DF72C3200840F4C /* JackWinNamedPipeNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinNamedPipeNotifyChannel.cpp; path = ../windows/JackWinNamedPipeNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0920DF72C3200840F4C /* JackWinNamedPipeNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinNamedPipeNotifyChannel.h; path = ../windows/JackWinNamedPipeNotifyChannel.h; sourceTree = SOURCE_ROOT; };
+		4B05A0930DF72C3200840F4C /* JackWinNamedPipeServerChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinNamedPipeServerChannel.cpp; path = ../windows/JackWinNamedPipeServerChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0940DF72C3200840F4C /* JackWinNamedPipeServerChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinNamedPipeServerChannel.h; path = ../windows/JackWinNamedPipeServerChannel.h; sourceTree = SOURCE_ROOT; };
+		4B05A0950DF72C3200840F4C /* JackWinNamedPipeServerNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinNamedPipeServerNotifyChannel.cpp; path = ../windows/JackWinNamedPipeServerNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0960DF72C3200840F4C /* JackWinNamedPipeServerNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinNamedPipeServerNotifyChannel.h; path = ../windows/JackWinNamedPipeServerNotifyChannel.h; sourceTree = SOURCE_ROOT; };
+		4B05A0970DF72C3200840F4C /* JackWinProcessSync.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinProcessSync.cpp; path = ../windows/JackWinProcessSync.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A0980DF72C3200840F4C /* JackWinProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinProcessSync.h; path = ../windows/JackWinProcessSync.h; sourceTree = SOURCE_ROOT; };
+		4B05A0990DF72C3200840F4C /* JackWinSemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinSemaphore.cpp; path = ../windows/JackWinSemaphore.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A09A0DF72C3200840F4C /* JackWinSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinSemaphore.h; path = ../windows/JackWinSemaphore.h; sourceTree = SOURCE_ROOT; };
+		4B05A09B0DF72C3200840F4C /* JackWinThread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackWinThread.cpp; path = ../windows/JackWinThread.cpp; sourceTree = SOURCE_ROOT; };
+		4B05A09C0DF72C3200840F4C /* JackWinThread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackWinThread.h; path = ../windows/JackWinThread.h; sourceTree = SOURCE_ROOT; };
 		4B0A28E60D52073D002EFF74 /* jack_thread_wait */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_thread_wait; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B0A28EC0D520852002EFF74 /* tw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tw.c; path = "../example-clients/tw.c"; sourceTree = SOURCE_ROOT; };
 		4B0A292D0D52108E002EFF74 /* jack_thread_wait */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_thread_wait; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B2C28F908DAD01E00249230 /* JackGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackGlobals.cpp; path = ../common/JackGlobals.cpp; sourceTree = SOURCE_ROOT; };
 		4B35C4250D4731D1000DE7AE /* jackdmp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jackdmp; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C4830D4731D1000DE7AE /* Jackmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackmp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackservermp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackdmp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C5140D4731D1000DE7AE /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C5200D4731D1000DE7AE /* jack_midisine */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midisine; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C52C0D4731D1000DE7AE /* jack_metro */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_metro; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1094,19 +1166,19 @@
 		4B35C6290D4731D2000DE7AE /* jack_portaudio.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_portaudio.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C6340D4731D2000DE7AE /* jack_dummy.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_dummy.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B35C63E0D4731D3000DE7AE /* inprocess.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = inprocess.so; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B363DD80DEB02F6001F72D9 /* jack_alias */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_alias; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363DD80DEB02F6001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363DDE0DEB034E001F72D9 /* alias.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alias.c; path = "../example-clients/alias.c"; sourceTree = SOURCE_ROOT; };
-		4B363E1A0DEB03C5001F72D9 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363E1A0DEB03C5001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363E200DEB0401001F72D9 /* evmon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evmon.c; path = "../example-clients/evmon.c"; sourceTree = SOURCE_ROOT; };
-		4B363E4E0DEB0775001F72D9 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363E4E0DEB0775001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363E710DEB0808001F72D9 /* bufsize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bufsize.c; path = "../example-clients/bufsize.c"; sourceTree = SOURCE_ROOT; };
-		4B363EE90DEB091C001F72D9 /* jack_rec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_rec; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363EE90DEB091C001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363EED0DEB094B001F72D9 /* capture_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = capture_client.c; path = "../example-clients/capture_client.c"; sourceTree = SOURCE_ROOT; };
-		4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_monitor_client; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F220DEB0AB0001F72D9 /* monitor_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = monitor_client.c; path = "../example-clients/monitor_client.c"; sourceTree = SOURCE_ROOT; };
-		4B363F350DEB0BD1001F72D9 /* jack_showtime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_showtime; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F350DEB0BD1001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F3D0DEB0C31001F72D9 /* showtime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = showtime.c; path = "../example-clients/showtime.c"; sourceTree = SOURCE_ROOT; };
-		4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_impulse_grabber; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B363F720DEB0D4E001F72D9 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B363F750DEB0D7D001F72D9 /* impulse_grabber.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = impulse_grabber.c; path = "../example-clients/impulse_grabber.c"; sourceTree = SOURCE_ROOT; };
 		4B37C20306DF1FBE0016E567 /* CALatencyLog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CALatencyLog.cpp; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.cpp; sourceTree = "<absolute>"; };
 		4B37C20406DF1FBE0016E567 /* CALatencyLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CALatencyLog.h; path = /Developer/Examples/CoreAudio/PublicUtility/CALatencyLog.h; sourceTree = "<absolute>"; };
@@ -1129,7 +1201,7 @@
 		4B5F253D0DEE9B8F0041E486 /* JackLockedEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackLockedEngine.h; path = ../common/JackLockedEngine.h; sourceTree = SOURCE_ROOT; };
 		4B60CE480AAABA31004956AA /* connect.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = connect.c; path = "../example-clients/connect.c"; sourceTree = SOURCE_ROOT; };
 		4B66A8580934964500A89560 /* JackConstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackConstants.h; path = ../common/JackConstants.h; sourceTree = SOURCE_ROOT; };
-		4B699BB1097D421600A18468 /* jackdmp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jackdmp; sourceTree = BUILT_PRODUCTS_DIR; };
+		4B699BB1097D421600A18468 /* jackdmp */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = jackdmp; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B699C47097D421600A18468 /* Jackmp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackmp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B699CAC097D421600A18468 /* Jackservermp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Jackservermp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B699CBB097D421600A18468 /* jack_metro */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_metro; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1193,7 +1265,7 @@
 		4BA692D40CBE4C9000EAD520 /* jack_unload */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_unload; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA692D60CBE4CC600EAD520 /* ipunload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipunload.c; path = "../example-clients/ipunload.c"; sourceTree = SOURCE_ROOT; };
 		4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Jackservermp.framework; path = build/Development/Jackservermp.framework; sourceTree = SOURCE_ROOT; };
-		4BA7FEC30D8E76270017FF73 /* jack_server_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_server_control; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BA7FEC30D8E76270017FF73 /* jack_lsp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_lsp; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA7FEC80D8E76650017FF73 /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = "../example-clients/control.c"; sourceTree = SOURCE_ROOT; };
 		4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortType.cpp; path = ../common/JackPortType.cpp; sourceTree = SOURCE_ROOT; };
 		4BAB95B70B9E20B800A0C723 /* JackPortType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortType.h; path = ../common/JackPortType.h; sourceTree = SOURCE_ROOT; };
@@ -1292,14 +1364,14 @@
 		4BF8D2470834F20600C94B91 /* testSem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = testSem.cpp; path = ../tests/testSem.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8FB0D08AC88EF00D1A344 /* JackFrameTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFrameTimer.cpp; path = ../common/JackFrameTimer.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8FB0E08AC88EF00D1A344 /* JackFrameTimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFrameTimer.h; path = ../common/JackFrameTimer.h; sourceTree = SOURCE_ROOT; };
-		4BFA5E980DEC4D9C00FA4CDB /* testMutex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testMutex; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA5E980DEC4D9C00FA4CDB /* testSem */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testSem; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA5E9E0DEC4DD900FA4CDB /* testMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testMutex.cpp; path = ../tests/testMutex.cpp; sourceTree = SOURCE_ROOT; };
-		4BFA828C0DF6A9E40087B4E1 /* jack_evmon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_evmon; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_bufsize; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82AB0DF6A9E40087B4E1 /* jack_rec */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_rec; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_monitor_client; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82C30DF6A9E40087B4E1 /* jack_showtime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_showtime; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_impulse_grabber; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
+		4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA99A20AAAF3B0009E916C /* jdelay */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jdelay; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BFA99A90AAAF40C009E916C /* jdelay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jdelay.cpp; path = ../tests/jdelay.cpp; sourceTree = SOURCE_ROOT; };
 		4BFB297708AF44ED00D450D4 /* JackMachServerNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMachServerNotifyChannel.cpp; sourceTree = "<group>"; };
@@ -1431,7 +1503,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE0F0DC232A400AA3457 /* Jackservermp.framework in Frameworks */,
+				4BA7BE0F0DC232A400AA3457 /* Jackdmp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1439,7 +1511,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE1A0DC2347500AA3457 /* Jackservermp.framework in Frameworks */,
+				4BA7BE1A0DC2347500AA3457 /* Jackdmp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1482,7 +1554,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE200DC234FB00AA3457 /* Jackservermp.framework in Frameworks */,
+				4BA7BE200DC234FB00AA3457 /* Jackdmp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1490,7 +1562,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE240DC2350D00AA3457 /* Jackservermp.framework in Frameworks */,
+				4BA7BE240DC2350D00AA3457 /* Jackdmp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1498,7 +1570,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BA7BE270DC2352A00AA3457 /* Jackservermp.framework in Frameworks */,
+				4BA7BE270DC2352A00AA3457 /* Jackdmp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1867,6 +1939,7 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				4B05A09D0DF72C6000840F4C /* Additional */,
 				BA222AEA0DC88379001A17F4 /* Net */,
 				4B6BEB4A07A6CCDC00A5DBDA /* Tests */,
 				4B37C20006DF1F900016E567 /* Latency */,
@@ -1917,7 +1990,7 @@
 				4B5A1BDA0CD1CCE10005BF74 /* jack_midisine */,
 				4B35C4250D4731D1000DE7AE /* jackdmp */,
 				4B35C4830D4731D1000DE7AE /* Jackmp.framework */,
-				4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */,
+				4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */,
 				4B35C5140D4731D1000DE7AE /* jack_midiseq */,
 				4B35C5200D4731D1000DE7AE /* jack_midisine */,
 				4B35C52C0D4731D1000DE7AE /* jack_metro */,
@@ -1944,24 +2017,24 @@
 				4B0A28E60D52073D002EFF74 /* jack_thread_wait */,
 				4B0A292D0D52108E002EFF74 /* jack_thread_wait */,
 				4B57F5950D72C27900B4E719 /* jack_thread_wait */,
-				4BA7FEC30D8E76270017FF73 /* jack_server_control */,
+				4BA7FEC30D8E76270017FF73 /* jack_lsp */,
 				BA222ACF0DC88132001A17F4 /* jack_net.so */,
 				BA222AE90DC882DB001A17F4 /* netmanager.so */,
-				4BA7FEC30D8E76270017FF73 /* jack_server_control */,
-				4B363DD80DEB02F6001F72D9 /* jack_alias */,
-				4B363E1A0DEB03C5001F72D9 /* jack_evmon */,
-				4B363E4E0DEB0775001F72D9 /* jack_bufsize */,
-				4B363EE90DEB091C001F72D9 /* jack_rec */,
-				4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */,
-				4B363F350DEB0BD1001F72D9 /* jack_showtime */,
-				4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */,
-				4BFA5E980DEC4D9C00FA4CDB /* testMutex */,
-				4BFA828C0DF6A9E40087B4E1 /* jack_evmon */,
-				4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */,
-				4BFA82AB0DF6A9E40087B4E1 /* jack_rec */,
-				4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */,
-				4BFA82C30DF6A9E40087B4E1 /* jack_showtime */,
-				4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */,
+				4BA7FEC30D8E76270017FF73 /* jack_lsp */,
+				4B363DD80DEB02F6001F72D9 /* jack_midiseq */,
+				4B363E1A0DEB03C5001F72D9 /* jack_midiseq */,
+				4B363E4E0DEB0775001F72D9 /* jack_midiseq */,
+				4B363EE90DEB091C001F72D9 /* jack_midiseq */,
+				4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */,
+				4B363F350DEB0BD1001F72D9 /* jack_midiseq */,
+				4B363F720DEB0D4E001F72D9 /* jack_midiseq */,
+				4BFA5E980DEC4D9C00FA4CDB /* testSem */,
+				4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */,
+				4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */,
+				4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */,
+				4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */,
+				4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */,
+				4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1993,6 +2066,137 @@
 			name = "Simple clients";
 			sourceTree = "<group>";
 		};
+		4B05A0420DF72B8500840F4C /* Linux */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A04C0DF72BC000840F4C /* alsa */,
+				4B05A0660DF72BC000840F4C /* dbus */,
+				4B05A07D0DF72BC000840F4C /* driver.h */,
+				4B05A07E0DF72BC000840F4C /* firewire */,
+				4B05A0820DF72BC000840F4C /* freebob */,
+			);
+			name = Linux;
+			sourceTree = "<group>";
+		};
+		4B05A04C0DF72BC000840F4C /* alsa */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A04D0DF72BC000840F4C /* alsa_driver.h */,
+				4B05A04E0DF72BC000840F4C /* alsa_midi.h */,
+				4B05A04F0DF72BC000840F4C /* alsa_midi_impl.h */,
+				4B05A0500DF72BC000840F4C /* alsa_midi_jackmp.cpp */,
+				4B05A0510DF72BC000840F4C /* alsa_rawmidi.c */,
+				4B05A0520DF72BC000840F4C /* alsa_seqmidi.c */,
+				4B05A0530DF72BC000840F4C /* bitset.h */,
+				4B05A0540DF72BC000840F4C /* generic.h */,
+				4B05A0550DF72BC000840F4C /* generic_hw.c */,
+				4B05A0560DF72BC000840F4C /* hammerfall.c */,
+				4B05A0570DF72BC000840F4C /* hammerfall.h */,
+				4B05A0580DF72BC000840F4C /* hardware.h */,
+				4B05A0590DF72BC000840F4C /* hdsp.c */,
+				4B05A05A0DF72BC000840F4C /* hdsp.h */,
+				4B05A05B0DF72BC000840F4C /* ice1712.c */,
+				4B05A05C0DF72BC000840F4C /* ice1712.h */,
+				4B05A05D0DF72BC000840F4C /* JackAlsaDriver.cpp */,
+				4B05A05E0DF72BC000840F4C /* JackAlsaDriver.h */,
+				4B05A05F0DF72BC000840F4C /* jslist.h */,
+				4B05A0600DF72BC000840F4C /* memops.c */,
+				4B05A0610DF72BC000840F4C /* memops.h */,
+				4B05A0620DF72BC000840F4C /* midi_pack.h */,
+				4B05A0630DF72BC000840F4C /* midi_unpack.h */,
+				4B05A0640DF72BC000840F4C /* usx2y.c */,
+				4B05A0650DF72BC000840F4C /* usx2y.h */,
+			);
+			name = alsa;
+			path = ../linux/alsa;
+			sourceTree = SOURCE_ROOT;
+		};
+		4B05A0660DF72BC000840F4C /* dbus */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A0670DF72BC000840F4C /* controller.c */,
+				4B05A0680DF72BC000840F4C /* controller.h */,
+				4B05A0690DF72BC000840F4C /* controller_iface_configure.c */,
+				4B05A06A0DF72BC000840F4C /* controller_iface_control.c */,
+				4B05A06B0DF72BC000840F4C /* controller_iface_introspectable.c */,
+				4B05A06C0DF72BC000840F4C /* controller_iface_patchbay.c */,
+				4B05A06D0DF72BC000840F4C /* controller_iface_transport.c */,
+				4B05A06E0DF72BC000840F4C /* controller_internal.h */,
+				4B05A06F0DF72BC000840F4C /* jackdbus.c */,
+				4B05A0700DF72BC000840F4C /* jackdbus.h */,
+				4B05A0710DF72BC000840F4C /* list.h */,
+				4B05A0720DF72BC000840F4C /* org.jackaudio.service.in */,
+				4B05A0730DF72BC000840F4C /* SConscript */,
+				4B05A0740DF72BC000840F4C /* sigsegv.c */,
+				4B05A0750DF72BC000840F4C /* sigsegv.h */,
+				4B05A0760DF72BC000840F4C /* wscript */,
+				4B05A0770DF72BC000840F4C /* xml.c */,
+				4B05A0780DF72BC000840F4C /* xml.h */,
+				4B05A0790DF72BC000840F4C /* xml_expat.c */,
+				4B05A07A0DF72BC000840F4C /* xml_libxml.c */,
+				4B05A07B0DF72BC000840F4C /* xml_nop.c */,
+				4B05A07C0DF72BC000840F4C /* xml_write_raw.c */,
+			);
+			name = dbus;
+			path = ../linux/dbus;
+			sourceTree = SOURCE_ROOT;
+		};
+		4B05A07E0DF72BC000840F4C /* firewire */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A07F0DF72BC000840F4C /* ffado_driver.h */,
+				4B05A0800DF72BC000840F4C /* JackFFADODriver.cpp */,
+				4B05A0810DF72BC000840F4C /* JackFFADODriver.h */,
+			);
+			name = firewire;
+			path = ../linux/firewire;
+			sourceTree = SOURCE_ROOT;
+		};
+		4B05A0820DF72BC000840F4C /* freebob */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A0830DF72BC000840F4C /* freebob_driver.h */,
+				4B05A0840DF72BC000840F4C /* JackFreebobDriver.cpp */,
+				4B05A0850DF72BC000840F4C /* JackFreebobDriver.h */,
+			);
+			name = freebob;
+			path = ../linux/freebob;
+			sourceTree = SOURCE_ROOT;
+		};
+		4B05A08A0DF72BF600840F4C /* Windows */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A08B0DF72C3200840F4C /* JackWinEvent.cpp */,
+				4B05A08C0DF72C3200840F4C /* JackWinEvent.h */,
+				4B05A08D0DF72C3200840F4C /* JackWinNamedPipe.cpp */,
+				4B05A08E0DF72C3200840F4C /* JackWinNamedPipe.h */,
+				4B05A08F0DF72C3200840F4C /* JackWinNamedPipeClientChannel.cpp */,
+				4B05A0900DF72C3200840F4C /* JackWinNamedPipeClientChannel.h */,
+				4B05A0910DF72C3200840F4C /* JackWinNamedPipeNotifyChannel.cpp */,
+				4B05A0920DF72C3200840F4C /* JackWinNamedPipeNotifyChannel.h */,
+				4B05A0930DF72C3200840F4C /* JackWinNamedPipeServerChannel.cpp */,
+				4B05A0940DF72C3200840F4C /* JackWinNamedPipeServerChannel.h */,
+				4B05A0950DF72C3200840F4C /* JackWinNamedPipeServerNotifyChannel.cpp */,
+				4B05A0960DF72C3200840F4C /* JackWinNamedPipeServerNotifyChannel.h */,
+				4B05A0970DF72C3200840F4C /* JackWinProcessSync.cpp */,
+				4B05A0980DF72C3200840F4C /* JackWinProcessSync.h */,
+				4B05A0990DF72C3200840F4C /* JackWinSemaphore.cpp */,
+				4B05A09A0DF72C3200840F4C /* JackWinSemaphore.h */,
+				4B05A09B0DF72C3200840F4C /* JackWinThread.cpp */,
+				4B05A09C0DF72C3200840F4C /* JackWinThread.h */,
+			);
+			name = Windows;
+			sourceTree = "<group>";
+		};
+		4B05A09D0DF72C6000840F4C /* Additional */ = {
+			isa = PBXGroup;
+			children = (
+				4B05A08A0DF72BF600840F4C /* Windows */,
+				4B05A0420DF72B8500840F4C /* Linux */,
+			);
+			name = Additional;
+			sourceTree = "<group>";
+		};
 		4B168CA3076A5319005B2802 /* MIG_RPC */ = {
 			isa = PBXGroup;
 			children = (
@@ -2141,9 +2345,9 @@
 		4BA550F605E241B800569492 /* Driver */ = {
 			isa = PBXGroup;
 			children = (
-				BA222ADC0DC882A5001A17F4 /* JackNetDriver.cpp */,
-				BA222ADD0DC882A5001A17F4 /* JackNetDriver.h */,
 				4B869B3D08C8D21C001CF041 /* driver_interface.h */,
+				BA222ADD0DC882A5001A17F4 /* JackNetDriver.h */,
+				BA222ADC0DC882A5001A17F4 /* JackNetDriver.cpp */,
 				4B869B4208C8D22F001CF041 /* JackDriverLoader.h */,
 				4B869D7F08C9CB00001CF041 /* JackDriverLoader.cpp */,
 				4BF8D1B50834EEE400C94B91 /* JackDriver.h */,
@@ -3140,7 +3344,7 @@
 			);
 			name = "Jackservermp.framework 64 bits";
 			productName = Jack;
-			productReference = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */;
+			productReference = 4B35C4FC0D4731D1000DE7AE /* Jackdmp.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		4B35C50A0D4731D1000DE7AE /* jack_midiseq 64 bits */ = {
@@ -3589,7 +3793,7 @@
 			name = "jack_alias Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363DD80DEB02F6001F72D9 /* jack_alias */;
+			productReference = 4B363DD80DEB02F6001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363E100DEB03C5001F72D9 /* jack_evmon Universal */ = {
@@ -3608,7 +3812,7 @@
 			name = "jack_evmon Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363E1A0DEB03C5001F72D9 /* jack_evmon */;
+			productReference = 4B363E1A0DEB03C5001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363E440DEB0775001F72D9 /* jack_bufsize Universal */ = {
@@ -3627,7 +3831,7 @@
 			name = "jack_bufsize Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363E4E0DEB0775001F72D9 /* jack_bufsize */;
+			productReference = 4B363E4E0DEB0775001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363EDF0DEB091C001F72D9 /* jack_rec Universal */ = {
@@ -3646,7 +3850,7 @@
 			name = "jack_rec Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363EE90DEB091C001F72D9 /* jack_rec */;
+			productReference = 4B363EE90DEB091C001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F140DEB0A6A001F72D9 /* jack_monitor_client Universal */ = {
@@ -3665,7 +3869,7 @@
 			name = "jack_monitor_client Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F1E0DEB0A6A001F72D9 /* jack_monitor_client */;
+			productReference = 4B363F1E0DEB0A6A001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F2B0DEB0BD1001F72D9 /* jack_showtime Universal */ = {
@@ -3684,7 +3888,7 @@
 			name = "jack_showtime Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F350DEB0BD1001F72D9 /* jack_showtime */;
+			productReference = 4B363F350DEB0BD1001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B363F680DEB0D4E001F72D9 /* jack_impulse_grabber Universal */ = {
@@ -3703,7 +3907,7 @@
 			name = "jack_impulse_grabber Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4B363F720DEB0D4E001F72D9 /* jack_impulse_grabber */;
+			productReference = 4B363F720DEB0D4E001F72D9 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4B5A1BB10CD1CB9E0005BF74 /* jack_midiseq Universal */ = {
@@ -4135,7 +4339,7 @@
 			name = "jack_server_control Universal";
 			productInstallPath = /usr/local/bin;
 			productName = jack_lsp;
-			productReference = 4BA7FEC30D8E76270017FF73 /* jack_server_control */;
+			productReference = 4BA7FEC30D8E76270017FF73 /* jack_lsp */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BD623ED0CBCF0F000DE782F /* inprocess */ = {
@@ -4209,7 +4413,7 @@
 			name = "testMutex Universal";
 			productInstallPath = /usr/local/bin;
 			productName = testSem;
-			productReference = 4BFA5E980DEC4D9C00FA4CDB /* testMutex */;
+			productReference = 4BFA5E980DEC4D9C00FA4CDB /* testSem */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82820DF6A9E40087B4E1 /* jack_evmon 64 bits */ = {
@@ -4228,7 +4432,7 @@
 			name = "jack_evmon 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA828C0DF6A9E40087B4E1 /* jack_evmon */;
+			productReference = 4BFA828C0DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82950DF6A9E40087B4E1 /* jack_bufsize 64 bits */ = {
@@ -4247,7 +4451,7 @@
 			name = "jack_bufsize 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA829F0DF6A9E40087B4E1 /* jack_bufsize */;
+			productReference = 4BFA829F0DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82A10DF6A9E40087B4E1 /* jack_rec 64 bits */ = {
@@ -4266,7 +4470,7 @@
 			name = "jack_rec 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82AB0DF6A9E40087B4E1 /* jack_rec */;
+			productReference = 4BFA82AB0DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82AD0DF6A9E40087B4E1 /* jack_monitor_client 64 bits */ = {
@@ -4285,7 +4489,7 @@
 			name = "jack_monitor_client 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82B70DF6A9E40087B4E1 /* jack_monitor_client */;
+			productReference = 4BFA82B70DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82B90DF6A9E40087B4E1 /* jack_showtime 64 bits */ = {
@@ -4304,7 +4508,7 @@
 			name = "jack_showtime 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82C30DF6A9E40087B4E1 /* jack_showtime */;
+			productReference = 4BFA82C30DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA82C50DF6A9E40087B4E1 /* jack_impulse_grabber 64 bits */ = {
@@ -4323,7 +4527,7 @@
 			name = "jack_impulse_grabber 64 bits";
 			productInstallPath = /usr/local/bin;
 			productName = jack_metro;
-			productReference = 4BFA82CF0DF6A9E40087B4E1 /* jack_impulse_grabber */;
+			productReference = 4BFA82CF0DF6A9E40087B4E1 /* jack_midiseq */;
 			productType = "com.apple.product-type.tool";
 		};
 		4BFA99980AAAF3B0009E916C /* jdelay Universal */ = {
diff --git a/windows/JackPortAudioDriver.cpp b/windows/JackPortAudioDriver.cpp
index 2212764c..0467e15d 100644
--- a/windows/JackPortAudioDriver.cpp
+++ b/windows/JackPortAudioDriver.cpp
@@ -574,7 +574,7 @@ extern "C"
         return desc;
     }
 
-    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackEngineInterface* engine, Jack::JackSynchro* table, const JSList* params) {
+    EXPORT Jack::JackDriverClientInterface* driver_initialize(Jack::JackLockedEngine* engine, Jack::JackSynchro* table, const JSList* params) {
         jack_nframes_t srate = 44100;
         jack_nframes_t frames_per_interrupt = 512;
         int capture = FALSE;
diff --git a/windows/JackPortAudioDriver.h b/windows/JackPortAudioDriver.h
index 0013be93..f3ecfb40 100644
--- a/windows/JackPortAudioDriver.h
+++ b/windows/JackPortAudioDriver.h
@@ -53,7 +53,7 @@ class JackPortAudioDriver : public JackAudioDriver
 
     public:
 
-        JackPortAudioDriver(const char* name, const char* alias, JackEngineInterface* engine, JackSynchro* table)
+        JackPortAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
                 : JackAudioDriver(name, alias, engine, table), fStream(NULL), fInputBuffer(NULL), fOutputBuffer(NULL),
                 fInputDevice(paNoDevice), fOutputDevice(paNoDevice)
         {}
diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index 2be3b653..d8c6aa5b 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -29,7 +29,7 @@ Copyright (C) 2004-2006 Grame
 #include "JackNotification.h"
 #include "JackRequest.h"
 #include "JackServer.h"
-#include "JackEngine.h"
+#include "JackLockedEngine.h"
 #include "JackGlobals.h"
 #include "JackClient.h"
 #include <assert.h>