Merge Michael Voigt drops branch after reorganization step.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2880 0c269be4-1314-0410-8aa9-9f06e86f4224

176 files changed, 1568 insertions, 1621 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a8468d2..64abde55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,8 +22,13 @@ Florian Faber
   Jackdmp changes log
 ---------------------------
 
-2008-09-04 Stephane Letz  <letz@grame.fr>
+2008-08-05 Stephane Letz  <letz@grame.fr>
 	
+	* Merge Michael Voigt "drops" branch after reorganization step.
+
+2008-08-04 Stephane Letz  <letz@grame.fr>
+	
+	* Michael Voigt 4th source reorganization patch.
 	* Correct JackNetDriver initialization.
 
 2008-09-03 Stephane Letz  <letz@grame.fr>
@@ -33,8 +38,17 @@ Florian Faber
 
 2008-09-01 Stephane Letz  <letz@grame.fr>
 	
+	* Michael Voigt third source reorganization patch.
 	* Add new jack_set_port_rename_callback API, jack_port_set_name is now a server request that call port rename callbacks.
 
+2008-08-31 Stephane Letz  <letz@grame.fr>
+	
+	* Michael Voigt second source reorganization patch.
+
+2008-08-28 Stephane Letz  <letz@grame.fr>
+	
+	* Michael Voigt first source reorganization patch.
+
 2008-08-26 Stephane Letz  <letz@grame.fr>
 	
 	* Better parameter handling in JackCoreAudioAdapter.
diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp
index d90558bb..b651d897 100644
--- a/common/JackAPI.cpp
+++ b/common/JackAPI.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackClientControl.h"
 #include "JackGlobals.h"
 #include "JackTime.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackPortType.h"
 
 #ifdef __APPLE__
diff --git a/common/JackActivationCount.h b/common/JackActivationCount.h
index 9b48c10a..c9824937 100644
--- a/common/JackActivationCount.h
+++ b/common/JackActivationCount.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackActivationCount__
 #define __JackActivationCount__
 
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
 #include "JackTime.h"
 #include "JackTypes.h"
 
diff --git a/common/JackAtomic.h b/common/JackAtomic.h
index 0f037b8a..1da0cb63 100644
--- a/common/JackAtomic.h
+++ b/common/JackAtomic.h
@@ -22,171 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackTypes.h"
 
-#if defined(__APPLE__)
-
-#if defined(__ppc__) || defined(__ppc64__)
-
-static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
-{
-    register int result;
-    asm volatile (
-        "# CAS					\n"
-        "	lwarx	r0, 0, %1	\n"         // creates a reservation on addr
-        "	cmpw	r0, %2		\n"			//  test value at addr
-        "	bne-	1f          \n"
-        "	sync            	\n"         //  synchronize instructions
-        "	stwcx.	%3, 0, %1	\n"         //  if the reservation is not altered
-        //  stores the new value at addr
-        "	bne-	1f          \n"
-        "   li      %0, 1       \n"
-        "	b		2f          \n"
-        "1:                     \n"
-        "   li      %0, 0       \n"
-        "2:                     \n"
-    : "=r" (result)
-                : "r" (addr), "r" (value), "r" (newvalue)
-                : "r0"
-            );
-    return result;
-}
-
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-
-#ifdef __SMP__
-#	define LOCK "lock ; "
-#else
-#	define LOCK ""
-#endif
-
-static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
-{
-    register char ret;
-    __asm__ __volatile__ (
-        "# CAS \n\t"
-        LOCK "cmpxchg %2, (%1) \n\t"
-        "sete %0               \n\t"
-    : "=a" (ret)
-                : "c" (addr), "d" (newvalue), "a" (value)
-            );
-    return ret;
-}
-
-#endif
-
-#endif
-
-#ifdef __linux__
-
-#ifdef __PPC__
-
-static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
-{
-    register int result;
-    register UInt32 tmp;
-    asm volatile (
-        "# CAS					\n"
-        "	lwarx	%4, 0, %1	\n"         // creates a reservation on addr
-        "	cmpw	%4, %2		\n"        //  test value at addr
-        "	bne-	1f          \n"
-        "	sync            	\n"         //  synchronize instructions
-        "	stwcx.	%3, 0, %1	\n"         //  if the reservation is not altered
-        //  stores the new value at addr
-        "	bne-	1f          \n"
-        "   li      %0, 1       \n"
-        "	b		2f          \n"
-        "1:                     \n"
-        "   li      %0, 0       \n"
-        "2:                     \n"
-    : "=r" (result)
-                : "r" (addr), "r" (value), "r" (newvalue), "r" (tmp)
-            );
-    return result;
-}
-
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-
-#ifdef __SMP__
-#	define LOCK "lock ; "
-#else
-#	define LOCK ""
-#endif
-
-static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
-{
-    register char ret;
-    __asm__ __volatile__ (
-        "# CAS \n\t"
-        LOCK "cmpxchg %2, (%1) \n\t"
-        "sete %0               \n\t"
-    : "=a" (ret)
-                : "c" (addr), "d" (newvalue), "a" (value)
-            );
-    return ret;
-}
-
-#endif
-
-#endif
-
-#ifdef WIN32
-
-#ifndef __MINGW32__
-#ifdef __SMP__
-#	define LOCK lock
-#else
-#	define LOCK
-#endif
-
-#define inline __inline
-
-//----------------------------------------------------------------
-// CAS functions
-//----------------------------------------------------------------
-inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void * addr)
-{
-    register char c;
-    __asm {
-        push	ebx
-        push	esi
-        mov	esi, addr
-        mov	eax, value
-        mov	ebx, newvalue
-        LOCK cmpxchg dword ptr [esi], ebx
-        sete	c
-        pop	esi
-        pop	ebx
-    }
-    return c;
-}
-
-#else
-
-#ifdef __SMP__
-#	define LOCK "lock ; "
-#else
-#	define LOCK ""
-#endif
-
-static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
-{
-    register char ret;
-    __asm__ __volatile__ (
-        "# CAS \n\t"
-        LOCK "cmpxchg %2, (%1) \n\t"
-        "sete %0               \n\t"
-    : "=a" (ret)
-                : "c" (addr), "d" (newvalue), "a" (value)
-            );
-    return ret;
-}
-
-#endif
-
-#endif
+#include "JackAtomic_os.h"
 
 static inline long INC_ATOMIC(volatile SInt32* val)
 {
diff --git a/common/JackAudioAdapter.cpp b/common/JackAudioAdapter.cpp
index 988dc519..64a57c5a 100644
--- a/common/JackAudioAdapter.cpp
+++ b/common/JackAudioAdapter.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackAudioAdapter.h"
 #include "JackLibSampleRateResampler.h"
 #include "JackError.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackTools.h"
 #include "jslist.h"
 #include <stdio.h>
diff --git a/common/JackAudioAdapterFactory.cpp b/common/JackAudioAdapterFactory.cpp
index 85d14d97..5e4db60c 100644
--- a/common/JackAudioAdapterFactory.cpp
+++ b/common/JackAudioAdapterFactory.cpp
@@ -23,11 +23,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <stdlib.h>
 #include <assert.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include "driver_interface.h"
 
 #ifdef __linux__
@@ -42,6 +37,11 @@ extern "C"
 #include "JackPortAudioAdapter.h"
 #endif
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
     using namespace Jack;
 
     EXPORT int jack_internal_initialize(jack_client_t* jack_client, const JSList* params)
diff --git a/common/JackAudioAdapterInterface.cpp b/common/JackAudioAdapterInterface.cpp
index 6e940b79..fe9b00ef 100644
--- a/common/JackAudioAdapterInterface.cpp
+++ b/common/JackAudioAdapterInterface.cpp
@@ -41,8 +41,8 @@ namespace Jack
         char buffer[1024];
         FILE* file = fopen("JackAudioAdapter.log", "w");
 
-        int MAX = (fCount) % TABLE_MAX - 1;
-        for (int i = 1; i < MAX; i++)
+        int max = (fCount) % TABLE_MAX - 1;
+        for (int i = 1; i < max; i++)
         {
             fprintf(file, "%d \t %d \t %d  \t %f \t %f \t %d \t %d \n",
                     fTable[i].delta, fTable[i+1].time1 - fTable[i].time1,
diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp
index 43d0d266..14df7bc0 100644
--- a/common/JackAudioDriver.cpp
+++ b/common/JackAudioDriver.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackAudioDriver.h"
 #include "JackTime.h"
diff --git a/common/JackClient.h b/common/JackClient.h
index 3a7abe03..6ab6decc 100644
--- a/common/JackClient.h
+++ b/common/JackClient.h
@@ -29,8 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "varargs.h"
 #include <list>
 
-#include "JackPlatformSynchro.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackChannel.h"
 
 namespace Jack
diff --git a/common/JackClientInterface.h b/common/JackClientInterface.h
index dcea6fe8..2e7ec0f7 100644
--- a/common/JackClientInterface.h
+++ b/common/JackClientInterface.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackClientInterface__
 #define __JackClientInterface__
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 namespace Jack
 {
diff --git a/common/JackExports.h b/common/JackCompilerDeps.h
index 39849c23..04f87c19 100644
--- a/common/JackExports.h
+++ b/common/JackCompilerDeps.h
@@ -17,14 +17,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackExports__
-#define __JackExports__
+#ifndef __JackCompilerDeps__
+#define __JackCompilerDeps__
 
-#ifdef WIN32
-#define	EXPORT __declspec(dllexport)
-#else
-#define	EXPORT __attribute__ ((visibility("default")))
-#endif
+#include "JackCompilerDeps_os.h"
 
 #endif
-
diff --git a/common/JackConnectionManager.h b/common/JackConnectionManager.h
index 2db347bf..13b3aa03 100644
--- a/common/JackConnectionManager.h
+++ b/common/JackConnectionManager.h
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackConstants.h"
 #include "JackActivationCount.h"
 #include "JackError.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 #include <assert.h>
 
diff --git a/common/JackControlAPI.h b/common/JackControlAPI.h
index 0255e5c9..032e0e9a 100644
--- a/common/JackControlAPI.h
+++ b/common/JackControlAPI.h
@@ -23,7 +23,7 @@
 #define __JackControlAPI__
 
 #include "jslist.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 #ifdef WIN32
 #ifdef __MINGW32__
diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp
index f231d5dd..d9b47c7c 100644
--- a/common/JackDriver.cpp
+++ b/common/JackDriver.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackDriver.h"
 #include "JackTime.h"
diff --git a/common/JackDriver.h b/common/JackDriver.h
index 7e6b27a0..3b188b4f 100644
--- a/common/JackDriver.h
+++ b/common/JackDriver.h
@@ -24,7 +24,7 @@
 #include "types.h"
 #include "JackClientInterface.h"
 #include "JackConstants.h"
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
 #include "JackClientControl.h"
 #include <list>
 
diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp
index 52d41d0e..d743070b 100644
--- a/common/JackDriverLoader.cpp
+++ b/common/JackDriverLoader.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 /*
 #ifndef WIN32
diff --git a/common/JackDriverLoader.h b/common/JackDriverLoader.h
index e1c86685..b6025115 100644
--- a/common/JackDriverLoader.h
+++ b/common/JackDriverLoader.h
@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "driver_interface.h"
 #include "JackControlAPI.h"
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
 
 
 #ifdef WIN32
diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp
index 746ce835..b1f294f8 100644
--- a/common/JackDummyDriver.cpp
+++ b/common/JackDummyDriver.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackGraphManager.h"
 #include "JackDriverLoader.h"
 #include "JackThreadedDriver.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <iostream>
 #include <unistd.h>
 
diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index 9d8aed55..bd878a20 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -25,10 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <fstream>
 #include <assert.h>
 
-#ifndef WIN32
-#include <sys/types.h>
-#include <signal.h>
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackLockedEngine.h"
 #include "JackExternalClient.h"
diff --git a/common/JackEngine.h b/common/JackEngine.h
index da3d6d19..dd61b74e 100644
--- a/common/JackEngine.h
+++ b/common/JackEngine.h
@@ -24,8 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackGraphManager.h"
 #include "JackSynchro.h"
 #include "JackTransportEngine.h"
-#include "JackPlatformProcessSync.h"
-#include "JackPlatformServerNotifyChannel.h"
+#include "JackPlatformPlug.h"
 
 namespace Jack
 {
diff --git a/common/JackEngineControl.cpp b/common/JackEngineControl.cpp
index 0743eec0..67b7deff 100644
--- a/common/JackEngineControl.cpp
+++ b/common/JackEngineControl.cpp
@@ -32,6 +32,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 namespace Jack
 {
 
+static inline _jack_time_t JACK_MAX(_jack_time_t a, _jack_time_t b)
+{
+    return (a < b) ? b : a;
+}
+
 void JackEngineControl::CycleIncTime(jack_time_t callback_usecs)
 {
     // Timer
@@ -67,16 +72,6 @@ void JackEngineControl::ReadFrameTime(JackTimer* timer)
     fFrameTimer.ReadFrameTime(timer);
 }
 
-// Private
-#ifdef WIN32
-inline jack_time_t MAX(jack_time_t a, jack_time_t b)
-{
-    return (a < b) ? b : a;
-}
-#else
-#define MAX(a,b) std::max((a),(b))
-#endif
-
 void JackEngineControl::CalcCPULoad(JackClientInterface** table, 
                                     JackGraphManager* manager, 
                                     jack_time_t cur_cycle_begin, 
@@ -92,7 +87,7 @@ void JackEngineControl::CalcCPULoad(JackClientInterface** table,
             JackClientInterface* client = table[i];
             JackClientTiming* timing = manager->GetClientTiming(i);
             if (client && client->GetClientControl()->fActive && timing->fStatus == Finished) 
-                last_cycle_end = MAX(last_cycle_end, timing->fFinishedAt);
+                last_cycle_end = JACK_MAX(last_cycle_end, timing->fFinishedAt);
         }
     }
 
@@ -108,9 +103,9 @@ void JackEngineControl::CalcCPULoad(JackClientInterface** table,
 
         jack_time_t max_usecs = 0;
         for (int i = 0; i < JACK_ENGINE_ROLLING_COUNT; i++) 
-            max_usecs = MAX(fRollingClientUsecs[i], max_usecs);
+            max_usecs = JACK_MAX(fRollingClientUsecs[i], max_usecs);
     
-        fMaxUsecs = MAX(fMaxUsecs, max_usecs);
+        fMaxUsecs = JACK_MAX(fMaxUsecs, max_usecs);
         fSpareUsecs = jack_time_t((max_usecs < fPeriodUsecs) ? fPeriodUsecs - max_usecs : 0);
         fCPULoad = ((1.f - (float(fSpareUsecs) / float(fPeriodUsecs))) * 50.f + (fCPULoad * 0.5f));
     }
diff --git a/common/JackError.h b/common/JackError.h
index 492e023e..309d588d 100644
--- a/common/JackError.h
+++ b/common/JackError.h
@@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <string.h>
 #include <errno.h>
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "types.h"
 
 #ifdef __cplusplus
diff --git a/common/JackException.h b/common/JackException.h
index f084d7a1..86ecc055 100644
--- a/common/JackException.h
+++ b/common/JackException.h
@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <stdexcept>
 #include <iostream>
 #include <string>
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackError.h"
 
 namespace Jack
diff --git a/common/JackExternalClient.h b/common/JackExternalClient.h
index 6e54aedf..daafb199 100644
--- a/common/JackExternalClient.h
+++ b/common/JackExternalClient.h
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackExternalClient__
 
 #include "JackClientInterface.h"
-#include "JackPlatformNotifyChannel.h"
+#include "JackPlatformPlug.h"
 
 namespace Jack
 {
diff --git a/common/JackFrameTimer.h b/common/JackFrameTimer.h
index 68ae3fa9..80b8cf34 100644
--- a/common/JackFrameTimer.h
+++ b/common/JackFrameTimer.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFrameTimer__
 
 #include "JackAtomicState.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "types.h"
 
 namespace Jack
diff --git a/common/JackFreewheelDriver.cpp b/common/JackFreewheelDriver.cpp
index 96311365..5c4c713e 100644
--- a/common/JackFreewheelDriver.cpp
+++ b/common/JackFreewheelDriver.cpp
@@ -22,9 +22,7 @@
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackFreewheelDriver.h"
 #include "JackEngineControl.h"
diff --git a/common/JackGlobals.h b/common/JackGlobals.h
index a19e8616..9ef2df28 100644
--- a/common/JackGlobals.h
+++ b/common/JackGlobals.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackGlobals__
 #define __JackGlobals__
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 extern jack_tls_key gRealTime;
 extern jack_tls_key g_key_log_function;
diff --git a/common/JackGraphManager.cpp b/common/JackGraphManager.cpp
index 1c71e82e..5b935060 100644
--- a/common/JackGraphManager.cpp
+++ b/common/JackGraphManager.cpp
@@ -33,11 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 namespace Jack
 {
 
-static inline jack_nframes_t MAX(jack_nframes_t a, jack_nframes_t b)
-{
-    return (a < b) ? b : a;
-}
-
 static void AssertPort(jack_port_id_t port_index)
 {
     if (port_index >= PORT_NUM) {
@@ -240,7 +235,7 @@ jack_nframes_t JackGraphManager::ComputeTotalLatencyAux(jack_port_id_t port_inde
             jack_nframes_t this_latency = (dst_port->fFlags & JackPortIsTerminal)
                                           ? dst_port->GetLatency()
                                           : ComputeTotalLatencyAux(dst_index, port_index, manager, hop_count + 1);
-            max_latency = MAX(max_latency, this_latency);
+            max_latency = ((max_latency > this_latency) ? max_latency : this_latency);
         }
     }
 
diff --git a/common/JackGraphManager.h b/common/JackGraphManager.h
index 5c111d14..0eee54ba 100644
--- a/common/JackGraphManager.h
+++ b/common/JackGraphManager.h
@@ -26,7 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackConstants.h"
 #include "JackConnectionManager.h"
 #include "JackAtomicState.h"
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
+#include "JackSystemDeps.h"
+
 
 namespace Jack
 {
diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index 50b3c42a..93f60f6e 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #ifndef WIN32
 #ifndef ADDON_DIR
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index ac415a7f..d22a0834 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackLibGlobals.h"
 #include "JackGlobals.h"
 #include "JackServerLaunch.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackTools.h"
 
 using namespace Jack;
diff --git a/common/JackLibClient.cpp b/common/JackLibClient.cpp
index 6134a175..ed3d6fdb 100644
--- a/common/JackLibClient.cpp
+++ b/common/JackLibClient.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackTime.h"
 #include "JackLibGlobals.h"
 #include "JackGlobals.h"
-#include "JackPlatformClientChannel.h"
+#include "JackPlatformPlug.h"
 #include "JackTools.h"
 
 namespace Jack
diff --git a/common/JackLibGlobals.h b/common/JackLibGlobals.h
index 484648f7..8c458505 100644
--- a/common/JackLibGlobals.h
+++ b/common/JackLibGlobals.h
@@ -22,12 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackShmMem.h"
 #include "JackEngineControl.h"
-#ifdef __APPLE__
-#include "JackMachPort.h"
-#include <map>
-#endif
 #include "JackGlobals.h"
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
 #include "JackGraphManager.h"
 #include "JackMessageBuffer.h"
 #include "JackTime.h"
@@ -48,9 +44,6 @@ struct JackLibGlobals
     JackShmReadWritePtr<JackGraphManager> fGraphManager;	/*! Shared memory Port manager */
     JackShmReadWritePtr<JackEngineControl> fEngineControl;	/*! Shared engine control */  // transport engine has to be writable
     JackSynchro fSynchroTable[CLIENT_NUM];                  /*! Shared synchro table */
-#ifdef __APPLE__
-    std::map<mach_port_t, JackClient*> fClientTable;        /*! Client table */
-#endif
  
     static int fClientCount;
     static JackLibGlobals* fGlobals;
diff --git a/common/JackLoopbackDriver.cpp b/common/JackLoopbackDriver.cpp
index f676225a..868d67d3 100644
--- a/common/JackLoopbackDriver.cpp
+++ b/common/JackLoopbackDriver.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackLoopbackDriver.h"
 #include "JackEngineControl.h"
diff --git a/common/JackMessageBuffer.h b/common/JackMessageBuffer.h
index d9d76973..9225dec3 100644
--- a/common/JackMessageBuffer.h
+++ b/common/JackMessageBuffer.h
@@ -30,10 +30,9 @@
 #ifndef __JackMessageBuffer__
 #define __JackMessageBuffer__
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackMutex.h"
 #include "JackAtomic.h"
-#include "JackPlatformProcessSync.h"
 
 namespace Jack
 {
diff --git a/common/JackMidiAPI.cpp b/common/JackMidiAPI.cpp
index 445827ac..1367302d 100644
--- a/common/JackMidiAPI.cpp
+++ b/common/JackMidiAPI.cpp
@@ -24,13 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackError.h"
 #include "JackMidiPort.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <errno.h>
 #include <string.h>
-
-#ifdef WIN32
-#define ENOBUFS 55
-#endif
+#include "JackSystemDeps.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/common/JackMutex.h b/common/JackMutex.h
index 33b71255..bfa32bf4 100644
--- a/common/JackMutex.h
+++ b/common/JackMutex.h
@@ -22,105 +22,13 @@
 #ifndef __JackMutex__
 #define __JackMutex__
 
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <pthread.h>
-#endif
+#include "JackMutex_os.h"
 
 #include <assert.h>
 #include "JackError.h"
 
 namespace Jack
 {
-
-/*!
-\brief Mutex abstraction.
-*/
-
-class JackMutex
-{
-
-    private:
-
-#ifdef WIN32
-        HANDLE fMutex;
-#else
-        pthread_mutex_t fMutex;
-#endif
-
-    public:
-
-#ifdef WIN32
-
-        JackMutex()
-        {
-            // In recursive mode by default
-            fMutex = (HANDLE)CreateMutex(0, FALSE, 0);
-        }
-        ~JackMutex()
-        {
-            CloseHandle(fMutex);
-        }
-
-        void Lock()
-        {
-            DWORD dwWaitResult = WaitForSingleObject(fMutex, INFINITE);
-        }
-
-        bool Trylock()
-        {
-           return (WAIT_OBJECT_0 == WaitForSingleObject(fMutex, 0));
-        }
-
-        void Unlock()
-        {
-            ReleaseMutex(fMutex);
-        }
-
-#else
-
-        JackMutex()
-        {
-            // Use recursive mutex
-            pthread_mutexattr_t mutex_attr;
-            int res;
-            res = pthread_mutexattr_init(&mutex_attr);
-            assert(res == 0);
-            res = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
-            assert(res == 0);
-            res = pthread_mutex_init(&fMutex, &mutex_attr);
-            assert(res == 0);
-            res = pthread_mutexattr_destroy(&mutex_attr);
-            assert(res == 0);
-        }
-        ~JackMutex()
-        {
-            pthread_mutex_destroy(&fMutex);
-        }
-
-        void Lock()
-        {
-            int res = pthread_mutex_lock(&fMutex);
-            if (res != 0)
-                jack_error("JackMutex::Lock res = %d", res);
-        }
-
-        bool Trylock()
-        {
-            return (pthread_mutex_trylock(&fMutex) == 0);
-        }
-
-        void Unlock()
-        {
-            int res = pthread_mutex_unlock(&fMutex);
-            if (res != 0)
-                jack_error("JackMutex::Unlock res = %d", res);
-        }
-
-#endif
-};
-
 /*!
 \brief Base class for "lockable" objects.
 */
diff --git a/common/JackNetAdapter.h b/common/JackNetAdapter.h
index b6028b96..69da0ac7 100644
--- a/common/JackNetAdapter.h
+++ b/common/JackNetAdapter.h
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <assert.h>
 #include "JackAudioAdapterInterface.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackNetInterface.h"
 
 namespace Jack
diff --git a/common/JackNetSocket.h b/common/JackNetSocket.h
index b7f7f3d5..fdd6c91e 100644
--- a/common/JackNetSocket.h
+++ b/common/JackNetSocket.h
@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackNetSocket__
 #define __JackNetSocket__
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackError.h"
 #include <cstdlib>
 #include <cstdio>
diff --git a/common/JackNetTool.h b/common/JackNetTool.h
index a1944a7f..65122b16 100644
--- a/common/JackNetTool.h
+++ b/common/JackNetTool.h
@@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackConstants.h"
 #include "JackMidiPort.h"
 #include "JackTools.h"
-#include "JackPlatformNetSocket.h"
+#include "JackPlatformPlug.h"
 #include "types.h"
 #include "transport.h"
 #include <cmath>
diff --git a/common/JackPlatformClientChannel.h b/common/JackPlatformClientChannel.h
deleted file mode 100644
index a47a44ff..00000000
--- a/common/JackPlatformClientChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (C) 2004-2008 Grame
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __JackPlatformClientChannel__
-#define __JackPlatformClientChannel___
-
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
-    
-// OSX
-#if defined(__APPLE__)
-#include "JackMachClientChannel.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinNamedPipeClientChannel.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackSocketClientChannel.h"
-#endif
-
-namespace Jack
-{
-
-#ifdef WIN32
-typedef JackWinNamedPipeClientChannel JackClientChannel;
-
-#elif defined(SOCKET_RPC_POSIX_SEMA) || defined(SOCKET_RPC_FIFO_SEMA) || defined(SOCKET_RPC_FIFO_SEMA_DUMMY) \
-    || defined(SOCKET_RPC_MACH_SEMA)
-typedef JackSocketClientChannel JackClientChannel;
-
-#elif defined(MACH_RPC_MACH_SEMA) || defined(MACH_RPC_FIFO_SEMA) || defined(MACH_RPC_POSIX_SEMA)
-typedef JackMachClientChannel JackClientChannel;
-
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformClientChannel__ */
diff --git a/common/JackPlatformNotifyChannel.h b/common/JackPlatformNotifyChannel.h
deleted file mode 100644
index c45c68de..00000000
--- a/common/JackPlatformNotifyChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (C) 2004-2008 Grame
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __JackPlatformNotifyChannel__
-#define __JackPlatformNotifyChannel__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
-
-// OSX
-#if defined(__APPLE__)
-#include "JackMachNotifyChannel.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinNamedPipeNotifyChannel.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackSocketNotifyChannel.h"
-#endif
-
-namespace Jack
-{
-
-#ifdef WIN32
-typedef JackWinNamedPipeNotifyChannel JackNotifyChannel;
-
-#elif defined(SOCKET_RPC_POSIX_SEMA) || defined(SOCKET_RPC_FIFO_SEMA) || defined(SOCKET_RPC_FIFO_SEMA_DUMMY) \
-    || defined(SOCKET_RPC_MACH_SEMA)
-typedef JackSocketNotifyChannel JackNotifyChannel;
-
-#elif defined(MACH_RPC_MACH_SEMA) || defined(MACH_RPC_FIFO_SEMA) || defined(MACH_RPC_POSIX_SEMA)
-typedef JackMachNotifyChannel JackNotifyChannel;
-
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformNotifyChannel__ */
diff --git a/common/JackPlatformPlug.h b/common/JackPlatformPlug.h
new file mode 100644
index 00000000..560755b6
--- /dev/null
+++ b/common/JackPlatformPlug.h
@@ -0,0 +1,25 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackPlatformPlug__
+#define __JackPlatformPlug__
+
+#include "JackPlatformPlug_os.h"
+
+#endif
diff --git a/common/JackPlatformServerChannel.h b/common/JackPlatformServerChannel.h
deleted file mode 100644
index 98a47f56..00000000
--- a/common/JackPlatformServerChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (C) 2004-2008 Grame
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __JackPlatformServerChannel__
-#define __JackPlatformServerChannel___
-
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
-
-// OSX
-#if defined(__APPLE__)
-#include "JackMachServerChannel.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinNamedPipeServerChannel.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackSocketServerChannel.h"
-#endif
-
-namespace Jack
-{
-
-#ifdef WIN32
-typedef JackWinNamedPipeServerChannel JackServerChannel;
-
-#elif defined(SOCKET_RPC_POSIX_SEMA) || defined(SOCKET_RPC_FIFO_SEMA) || defined(SOCKET_RPC_FIFO_SEMA_DUMMY) \
-    || defined(SOCKET_RPC_MACH_SEMA)
-typedef JackSocketServerChannel JackServerChannel;
-
-#elif defined(MACH_RPC_MACH_SEMA) || defined(MACH_RPC_FIFO_SEMA) || defined(MACH_RPC_POSIX_SEMA)
-typedef JackMachServerChannel JackServerChannel;
-
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformServerChannel__ */
diff --git a/common/JackPlatformServerNotifyChannel.h b/common/JackPlatformServerNotifyChannel.h
deleted file mode 100644
index dcc5c15e..00000000
--- a/common/JackPlatformServerNotifyChannel.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (C) 2004-2008 Grame
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __JackPlatformServerNotifyChannel__
-#define __JackPlatformServerNotifyChannel___
-
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
-
-// OSX
-#if defined(__APPLE__)
-#include "JackMachServerNotifyChannel.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinNamedPipeServerNotifyChannel.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackSocketServerNotifyChannel.h"
-#endif
-
-namespace Jack
-{
-
-#ifdef WIN32
-typedef JackWinNamedPipeServerNotifyChannel JackServerNotifyChannel;
-
-#elif defined(SOCKET_RPC_POSIX_SEMA) || defined(SOCKET_RPC_FIFO_SEMA) || defined(SOCKET_RPC_FIFO_SEMA_DUMMY) \
-    || defined(SOCKET_RPC_MACH_SEMA)
-typedef JackSocketServerNotifyChannel JackServerNotifyChannel;
-
-#elif defined(MACH_RPC_MACH_SEMA) || defined(MACH_RPC_FIFO_SEMA) || defined(MACH_RPC_POSIX_SEMA)
-typedef JackMachServerNotifyChannel JackServerNotifyChannel;
-
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformServerNotifyChannel__ */
diff --git a/common/JackPlatformSynchro.h b/common/JackPlatformSynchro.h
deleted file mode 100644
index 3ee1ab91..00000000
--- a/common/JackPlatformSynchro.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (C) 2004-2008 Grame
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __JackPlatformSynchro__
-#define __JackPlatformSynchro__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
-
-// OSX
-#if defined(__APPLE__)
-#include "JackMachSemaphore.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinSemaphore.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackPosixSemaphore.h"
-#include "JackFifo.h"
-#endif
-
-namespace Jack
-{
-
-#ifdef WIN32
-typedef JackWinSemaphore JackSynchro;
-#endif
-
-#if defined(MACH_RPC_MACH_SEMA) || defined(SOCKET_RPC_MACH_SEMA)
-typedef JackMachSemaphore JackSynchro;
-#endif
-
-#if defined(SOCKET_RPC_POSIX_SEMA) || defined(MACH_RPC_POSIX_SEMA)
-typedef JackPosixSemaphore JackSynchro;
-#endif
-
-#if defined(SOCKET_RPC_FIFO_SEMA) || defined(SOCKET_RPC_FIFO_SEMA_DUMMY) || defined(MACH_RPC_FIFO_SEMA)
-typedef JackFifo JackSynchro;
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformSynchro__ */
diff --git a/common/JackPort.h b/common/JackPort.h
index 86ed86e5..999f18ea 100644
--- a/common/JackPort.h
+++ b/common/JackPort.h
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "types.h"
 #include "JackConstants.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 namespace Jack
 {
@@ -56,15 +56,7 @@ class EXPORT JackPort
         bool fInUse;
         jack_port_id_t fTied;   // Locally tied source port
 
-#ifdef WIN32
-        //__declspec(align(16)) float fBuffer[BUFFER_SIZE_MAX];
-        float fBuffer[BUFFER_SIZE_MAX];
-#elif __GNUC__
-        float fBuffer[BUFFER_SIZE_MAX] __attribute__((aligned(64)));  // 16 bytes alignment for vector code, 64 bytes better for cache loads/stores
-#else
-#warning Buffer will not be aligned on 16 bytes boundaries : vector based code (Altivec of SSE) will fail
-        float fBuffer[BUFFER_SIZE_MAX];
-#endif
+        MEM_ALIGN(float fBuffer[BUFFER_SIZE_MAX], 64);  // 16 bytes alignment for vector code, 64 bytes better for cache loads/stores
 
         bool IsUsed() const;
 
diff --git a/common/JackRequest.h b/common/JackRequest.h
index eacb28e9..a94ed7b3 100644
--- a/common/JackRequest.h
+++ b/common/JackRequest.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackRequest__
 
 #include "JackConstants.h"
-#include "JackPlatformChannelTransaction.h"
+#include "JackPlatformPlug.h"
 #include "types.h"
 #include <string.h>
 #include <stdio.h>
diff --git a/common/JackRestartThreadedDriver.cpp b/common/JackRestartThreadedDriver.cpp
index 8719beea..5bc7feac 100644
--- a/common/JackRestartThreadedDriver.cpp
+++ b/common/JackRestartThreadedDriver.cpp
@@ -22,9 +22,7 @@
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackRestartThreadedDriver.h"
 #include "JackException.h"
diff --git a/common/JackServer.cpp b/common/JackServer.cpp
index 9aeaad24..667e236e 100644
--- a/common/JackServer.cpp
+++ b/common/JackServer.cpp
@@ -22,9 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackServer.h"
 #include "JackTime.h"
diff --git a/common/JackServer.h b/common/JackServer.h
index 8d96fc8f..5fbcb455 100644
--- a/common/JackServer.h
+++ b/common/JackServer.h
@@ -21,15 +21,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackServer__
 #define __JackServer__
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "driver_interface.h"
 #include "JackDriverLoader.h"
 #include "JackConnectionManager.h"
 #include "jslist.h"
 
 #include "JackGlobals.h"
-#include "JackPlatformSynchro.h"
-#include "JackPlatformServerChannel.h"
+#include "JackPlatformPlug.h"
 
 
 namespace Jack
diff --git a/common/JackServerAPI.cpp b/common/JackServerAPI.cpp
index f047c4e8..8aaee585 100644
--- a/common/JackServerAPI.cpp
+++ b/common/JackServerAPI.cpp
@@ -22,9 +22,7 @@ This program is free software; you can redistribute it and/or modify
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackGraphManager.h"
 #include "JackInternalClient.h"
@@ -33,7 +31,7 @@ This program is free software; you can redistribute it and/or modify
 #include "JackServerGlobals.h"
 #include "JackServerLaunch.h"
 #include "JackTools.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackLockedEngine.h"
 
 #ifdef __cplusplus
diff --git a/common/JackServerLaunch.cpp b/common/JackServerLaunch.cpp
index acbf87d0..11a95a61 100644
--- a/common/JackServerLaunch.cpp
+++ b/common/JackServerLaunch.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackChannel.h"
 #include "JackLibGlobals.h"
 #include "JackServerLaunch.h"
-#include "JackPlatformClientChannel.h"
+#include "JackPlatformPlug.h"
 
 using namespace Jack;
 
diff --git a/common/JackShmMem.h b/common/JackShmMem.h
index d713bf70..17fe0cc7 100644
--- a/common/JackShmMem.h
+++ b/common/JackShmMem.h
@@ -23,26 +23,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "shm.h"
 #include "JackError.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 #include <new>  // GCC 4.0
 #include <errno.h>
 #include <stdlib.h>
 
-#ifdef WIN32
-#include <windows.h>
-#define CHECK_MLOCK(ptr, size) (VirtualLock((ptr), (size)) != 0)
-#define CHECK_MUNLOCK(ptr, size) (VirtualUnlock((ptr), (size)) != 0)
-#define CHECK_MLOCKALL()(false)
-#define CHECK_MUNLOCKALL()(false)
-#else
-#include <sys/types.h>
-#include <sys/mman.h>
-#define CHECK_MLOCK(ptr, size) (mlock((ptr), (size)) == 0)
-#define CHECK_MUNLOCK(ptr, size) (munlock((ptr), (size)) == 0)
-#define CHECK_MLOCKALL() (mlockall(MCL_CURRENT | MCL_FUTURE) == 0)
-#define CHECK_MUNLOCKALL() (munlockall() == 0)
-#endif
+#include "JackShmMem_os.h"
 
 namespace Jack
 {
diff --git a/common/JackSynchro.h b/common/JackSynchro.h
index 114f240e..34bcb5fd 100644
--- a/common/JackSynchro.h
+++ b/common/JackSynchro.h
@@ -94,6 +94,7 @@ class JackSynchro
         }
 
 };
+
 }
 
 } // end of namespace
diff --git a/common/JackSystemDeps.h b/common/JackSystemDeps.h
new file mode 100644
index 00000000..adcc51fa
--- /dev/null
+++ b/common/JackSystemDeps.h
@@ -0,0 +1,26 @@
+/*
+Copyright (C) 2004-2006 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __JackSystemDeps__
+#define __JackSystemDeps__
+
+#include "systemdeps.h"
+#include "JackSystemDeps_os.h"
+
+#endif
diff --git a/common/JackThread.h b/common/JackThread.h
index 2ded4825..b0eeb25d 100644
--- a/common/JackThread.h
+++ b/common/JackThread.h
@@ -21,16 +21,8 @@
 #ifndef __JackThread__
 #define __JackThread__
 
-#include "JackExports.h"
-
-#ifdef WIN32
-#include <windows.h>
-typedef HANDLE pthread_t;
-typedef ULONGLONG UInt64;
-#else
-#include <pthread.h>
-typedef unsigned long long UInt64;
-#endif
+#include "JackCompilerDeps.h"
+#include "JackTypes.h"
 
 namespace Jack
 {
@@ -65,7 +57,7 @@ class JackRunnableInterface
 namespace detail
 {
 
-class EXPORT JackThread
+class EXPORT JackThreadInterface
 {
 
     public:
@@ -82,7 +74,7 @@ class EXPORT JackThread
         
     public:
         
-        JackThread(JackRunnableInterface* runnable, int priority, bool real_time, int cancellation):
+        JackThreadInterface(JackRunnableInterface* runnable, int priority, bool real_time, int cancellation):
         fRunnable(runnable), fPriority(priority), fRealTime(real_time), fStatus(kIdle), fCancellation(cancellation)
         {}
          
@@ -98,18 +90,29 @@ class EXPORT JackThread
         void SetParams(UInt64 period, UInt64 computation, UInt64 constraint) // Empty implementation, will only make sense on OSX...
         {}
         
+        int Start();
+        int StartSync();
+        int Kill();
+        int Stop();
+        void Terminate();
+
+        int AcquireRealTime();
+        int AcquireRealTime(int priority);
+        int DropRealTime();
+
+        pthread_t GetThreadID();
+
+        static int AcquireRealTimeImp(pthread_t thread, int priority);
+        static int DropRealTimeImp(pthread_t thread);
+        static int StartImp(pthread_t* thread, int priority, int realtime, void*(*start_routine)(void*), void* arg);
+        static int StopImp(pthread_t thread);
+        static int KillImp(pthread_t thread);
 };
     
 }
 
 } // end of namespace
 
-#if defined(WIN32)
-typedef DWORD jack_tls_key;
-#else
-typedef pthread_key_t jack_tls_key;
-#endif
-
 EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr);
 EXPORT bool jack_tls_free_key(jack_tls_key key);
 
diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp
index 3eaa37c2..cde17da4 100644
--- a/common/JackThreadedDriver.cpp
+++ b/common/JackThreadedDriver.cpp
@@ -22,9 +22,7 @@
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackThreadedDriver.h"
 #include "JackError.h"
diff --git a/common/JackThreadedDriver.h b/common/JackThreadedDriver.h
index f0a430b3..cb066175 100644
--- a/common/JackThreadedDriver.h
+++ b/common/JackThreadedDriver.h
@@ -22,7 +22,7 @@
 #define __JackThreadedDriver__
 
 #include "JackDriver.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 namespace Jack
 {
diff --git a/common/JackTime.h b/common/JackTime.h
index 8cee88cb..3afbadfe 100644
--- a/common/JackTime.h
+++ b/common/JackTime.h
@@ -22,86 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackTime__
 
 #include "types.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#if defined(__APPLE__)
-
-#include <mach/mach_time.h>
-#include <unistd.h>
-
-    extern EXPORT double __jack_time_ratio;
-
-    static inline jack_time_t GetMicroSeconds(void) 
-    {
-        return (jack_time_t) (mach_absolute_time () * __jack_time_ratio);
-    }
-
-    /* This should only be called ONCE per process. */
-    void InitTime();
-
-    static inline void JackSleep(int usec) 
-    {
-        usleep(usec);
-    }
-
-#endif
-
-#ifdef WIN32
-
-    extern EXPORT LARGE_INTEGER _jack_freq;
-
-    EXPORT jack_time_t GetMicroSeconds(void) ;
-
-    void InitTime();
-
-    static void JackSleep(int usec) 
-    {
-        Sleep(usec / 1000);
-    }
-
-#endif
-
-#ifdef linux
-
-#include <unistd.h>
-
-    static inline void JackSleep(long usec) 
-    {
-        usleep(usec);
-    }
-
-#ifdef GETCYCLE_TIME
-#include "cycles.h"
-    extern jack_time_t __jack_cpu_mhz;
-    jack_time_t GetMhz();
-    void InitTime();
-    static inline jack_time_t GetMicroSeconds(void) 
-    {
-        return get_cycles() / __jack_cpu_mhz;
-    }
-#else
-#include <time.h>
-    void InitTime();
-    static inline jack_time_t GetMicroSeconds(void) 
-    {
-        struct timespec ts;
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        return (jack_time_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
-    }
-#endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
+#include "JackTime_os.h"
 
 #endif
 
diff --git a/common/JackTools.h b/common/JackTools.h
index 5cbf381e..2c89202b 100644
--- a/common/JackTools.h
+++ b/common/JackTools.h
@@ -40,7 +40,7 @@
 #include "jslist.h"
 #include "driver_interface.h"
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackError.h"
 
 namespace Jack
diff --git a/common/JackTransportEngine.h b/common/JackTransportEngine.h
index a7a8d7b0..018e5754 100644
--- a/common/JackTransportEngine.h
+++ b/common/JackTransportEngine.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackTransportEngine__
 
 #include "JackAtomicArrayState.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "types.h"
 
 namespace Jack
diff --git a/common/JackTypes.h b/common/JackTypes.h
index 561bd4bc..00c09aad 100644
--- a/common/JackTypes.h
+++ b/common/JackTypes.h
@@ -30,14 +30,7 @@ typedef unsigned long UInt32;
 typedef signed long   SInt32;
 #endif
 
-#ifdef WIN32
-#include <windows.h>
-typedef ULONGLONG UInt64;
-typedef unsigned short uint16_t;
-#else
-#include <stdint.h>
-typedef unsigned long long UInt64;
-#endif
+#include "JackTypes_os.h"
 
 typedef uint16_t jack_int_t;  // Internal type for ports and refnum
 
diff --git a/common/JackWaitThreadedDriver.cpp b/common/JackWaitThreadedDriver.cpp
index 49b08121..6cd6fc96 100644
--- a/common/JackWaitThreadedDriver.cpp
+++ b/common/JackWaitThreadedDriver.cpp
@@ -22,9 +22,7 @@
 #include "config.h"
 #endif
 
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
+#include "JackSystemDeps.h"
 
 #include "JackWaitThreadedDriver.h"
 #include "JackGlobals.h"
diff --git a/common/driver_interface.h b/common/driver_interface.h
index bbf5d9a9..5a6138e6 100644
--- a/common/driver_interface.h
+++ b/common/driver_interface.h
@@ -27,14 +27,9 @@ extern "C"
 
 #include <limits.h>
 #include "jslist.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
-#ifdef WIN32
-#include "types.h"
-#define PATH_MAX 1024
-#else
-#include <inttypes.h>
-#endif
+#include "JackSystemDeps.h"
 
 #define JACK_DRIVER_NAME_MAX          15
 #define JACK_DRIVER_PARAM_NAME_MAX    15
diff --git a/common/jack/control.h b/common/jack/control.h
index dfb87b16..96cf3e14 100644
--- a/common/jack/control.h
+++ b/common/jack/control.h
@@ -30,10 +30,7 @@
 #define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
 
 #include <jack/jslist.h>
-
-#ifdef WIN32
-typedef unsigned long sigset_t;
-#endif
+#include <jack/systemdeps.h>
 
 /** Parameter types, intentionally similar to jack_driver_param_type_t */
 typedef enum
diff --git a/common/jack/jack.h b/common/jack/jack.h
index d5336259..b77661b2 100644
--- a/common/jack/jack.h
+++ b/common/jack/jack.h
@@ -26,13 +26,7 @@ extern "C"
 {
 #endif
 
-#ifdef WIN32
-	#include <windows.h>
-    typedef HANDLE pthread_t;
-#else
-	#include <pthread.h>
-#endif
-
+#include <jack/systemdeps.h>
 #include <jack/types.h>
 #include <jack/transport.h>
 
diff --git a/common/jack/jslist.h b/common/jack/jslist.h
index 1f9814e9..c3a501ee 100644
--- a/common/jack/jslist.h
+++ b/common/jack/jslist.h
@@ -27,9 +27,7 @@
 
 #include <stdlib.h>
 
-#ifdef WIN32
-#define __inline__ inline
-#endif
+#include <jack/systemdeps.h>
 
 typedef struct _JSList JSList;
 
@@ -285,290 +283,4 @@ jack_slist_sort (JSList *list,
 }
 
 #endif /* __jack_jslist_h__ */
-/*
-  Based on gslist.c from glib-1.2.9 (LGPL).
-
-  Adaption to JACK, Copyright (C) 2002 Kai Vehmanen.
-    - replaced use of gtypes with normal ANSI C types
-    - glib's memory allocation routines replaced with
-      malloc/free calls
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-
-#ifndef __jack_jslist_h__
-#define __jack_jslist_h__
-
-#include <stdlib.h>
-
-#ifdef WIN32
-#define __inline__ inline
-#endif
-
-typedef struct _JSList JSList;
-
-typedef int	(*JCompareFunc)	(void* a, void* b);
-struct _JSList
-{
-    void *data;
-    JSList *next;
-};
-
-static __inline__
-JSList*
-jack_slist_alloc (void)
-{
-    JSList *new_list;
-
-    new_list = (JSList*)malloc(sizeof(JSList));
-    new_list->data = NULL;
-    new_list->next = NULL;
-
-    return new_list;
-}
-
-static __inline__
-JSList*
-jack_slist_prepend (JSList* list, void* data)
-{
-    JSList *new_list;
-
-    new_list = (JSList*)malloc(sizeof(JSList));
-    new_list->data = data;
-    new_list->next = list;
-
-    return new_list;
-}
-
-#define jack_slist_next(slist)	((slist) ? (((JSList *)(slist))->next) : NULL)
-static __inline__
-JSList*
-jack_slist_last (JSList *list)
-{
-    if (list) {
-        while (list->next)
-            list = list->next;
-    }
-
-    return list;
-}
-
-static __inline__
-JSList*
-jack_slist_remove_link (JSList *list,
-                        JSList *link)
-{
-    JSList *tmp;
-    JSList *prev;
-
-    prev = NULL;
-    tmp = list;
-
-    while (tmp) {
-        if (tmp == link) {
-            if (prev)
-                prev->next = tmp->next;
-            if (list == tmp)
-                list = list->next;
-
-            tmp->next = NULL;
-            break;
-        }
-
-        prev = tmp;
-        tmp = tmp->next;
-    }
 
-    return list;
-}
-
-static __inline__
-void
-jack_slist_free (JSList *list)
-{
-    while (list) {
-        JSList *next = list->next;
-        free(list);
-        list = next;
-    }
-}
-
-static __inline__
-void
-jack_slist_free_1 (JSList *list)
-{
-    if (list) {
-        free(list);
-    }
-}
-
-static __inline__
-JSList*
-jack_slist_remove (JSList *list,
-                   void *data)
-{
-    JSList *tmp;
-    JSList *prev;
-
-    prev = NULL;
-    tmp = list;
-
-    while (tmp) {
-        if (tmp->data == data) {
-            if (prev)
-                prev->next = tmp->next;
-            if (list == tmp)
-                list = list->next;
-
-            tmp->next = NULL;
-            jack_slist_free (tmp);
-
-            break;
-        }
-
-        prev = tmp;
-        tmp = tmp->next;
-    }
-
-    return list;
-}
-
-static __inline__
-unsigned int
-jack_slist_length (JSList *list)
-{
-    unsigned int length;
-
-    length = 0;
-    while (list) {
-        length++;
-        list = list->next;
-    }
-
-    return length;
-}
-
-static __inline__
-JSList*
-jack_slist_find (JSList *list,
-                 void *data)
-{
-    while (list) {
-        if (list->data == data)
-            break;
-        list = list->next;
-    }
-
-    return list;
-}
-
-static __inline__
-JSList*
-jack_slist_copy (JSList *list)
-{
-    JSList *new_list = NULL;
-
-    if (list) {
-        JSList *last;
-
-        new_list = jack_slist_alloc ();
-        new_list->data = list->data;
-        last = new_list;
-        list = list->next;
-        while (list) {
-            last->next = jack_slist_alloc ();
-            last = last->next;
-            last->data = list->data;
-            list = list->next;
-        }
-    }
-
-    return new_list;
-}
-
-static __inline__
-JSList*
-jack_slist_append (JSList *list,
-                   void *data)
-{
-    JSList *new_list;
-    JSList *last;
-
-    new_list = jack_slist_alloc ();
-    new_list->data = data;
-
-    if (list) {
-        last = jack_slist_last (list);
-        last->next = new_list;
-
-        return list;
-    } else
-        return new_list;
-}
-
-static __inline__
-JSList*
-jack_slist_sort_merge (JSList *l1,
-                       JSList *l2,
-                       JCompareFunc compare_func)
-{
-    JSList list, *l;
-
-    l = &list;
-
-    while (l1 && l2) {
-        if (compare_func(l1->data, l2->data) < 0) {
-            l = l->next = l1;
-            l1 = l1->next;
-        } else {
-            l = l->next = l2;
-            l2 = l2->next;
-        }
-    }
-    l->next = l1 ? l1 : l2;
-
-    return list.next;
-}
-
-static __inline__
-JSList*
-jack_slist_sort (JSList *list,
-                 JCompareFunc compare_func)
-{
-    JSList *l1, *l2;
-
-    if (!list)
-        return NULL;
-    if (!list->next)
-        return list;
-
-    l1 = list;
-    l2 = list->next;
-
-    while ((l2 = l2->next) != NULL) {
-        if ((l2 = l2->next) == NULL)
-            break;
-        l1 = l1->next;
-    }
-    l2 = l1->next;
-    l1->next = NULL;
-
-    return jack_slist_sort_merge (jack_slist_sort (list, compare_func),
-                                  jack_slist_sort (l2, compare_func),
-                                  compare_func);
-}
-
-#endif /* __jack_jslist_h__ */
diff --git a/common/jack/systemdeps.h b/common/jack/systemdeps.h
new file mode 100644
index 00000000..3d453828
--- /dev/null
+++ b/common/jack/systemdeps.h
@@ -0,0 +1,62 @@
+/*
+Copyright (C) 2004-2006 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __jack_systemdeps_h__
+#define __jack_systemdeps_h__
+
+#ifdef WIN32
+
+#include <windows.h>
+
+#ifdef __MINGW32__
+	#include <stdint.h>
+        #include <sys/types.h>
+#else
+	#define __inline__ inline
+	#define vsnprintf _vsnprintf
+    	#define snprintf _snprintf
+
+   	typedef char int8_t;
+	typedef unsigned char uint8_t;
+	typedef short int16_t;
+	typedef unsigned short uint16_t;
+	typedef long int32_t;
+	typedef unsigned long uint32_t;
+	typedef LONGLONG int64_t;
+	typedef ULONGLONG uint64_t;
+
+#endif
+
+	typedef HANDLE pthread_t;
+        typedef int64_t _jack_time_t;
+
+#endif // WIN32 */
+
+#if defined(__APPLE__) || defined(__linux__)
+
+#include <inttypes.h>
+#include <pthread.h>
+#include <sys/types.h>
+
+typedef uint64_t _jack_time_t;
+
+#endif // __APPLE__ || __linux__ */
+
+
+#endif
diff --git a/common/jack/thread.h b/common/jack/thread.h
index f04fb24b..14066006 100644
--- a/common/jack/thread.h
+++ b/common/jack/thread.h
@@ -25,13 +25,7 @@ extern "C"
 {
 #endif
 
-#ifdef WIN32
-	#include <windows.h>
-    typedef HANDLE pthread_t;
-#else
-	#include <pthread.h>
-#endif
-
+#include <jack/systemdeps.h>
 
     /** @file thread.h
      *
diff --git a/common/jack/types.h b/common/jack/types.h
index 8bfcc798..30e0d9db 100644
--- a/common/jack/types.h
+++ b/common/jack/types.h
@@ -21,26 +21,8 @@
 #ifndef __jack_types_h__
 #define __jack_types_h__
 
-#ifdef WIN32
-#include <windows.h>
-#ifndef __MINGW32__
-    #define vsnprintf _vsnprintf
-    #define snprintf _snprintf
-    typedef char int8_t;
-	typedef unsigned char uint8_t;
-	typedef short int16_t;
-	typedef unsigned short uint16_t;
-	typedef long int32_t;
-	typedef unsigned long uint32_t;
-	typedef LONGLONG int64_t;
-	typedef ULONGLONG uint64_t;
-#else
-	#include <stdint.h>
-#endif
+#include <jack/systemdeps.h>
 
-#else
-	#include <inttypes.h>
-#endif
 
 typedef int32_t jack_shmsize_t;
 
@@ -59,11 +41,7 @@ typedef uint32_t	jack_nframes_t;
  * monotonic clock with units of microseconds.
  */
 
-#ifdef WIN32
-typedef int64_t jack_time_t;
-#else
-typedef uint64_t jack_time_t;
-#endif
+typedef _jack_time_t jack_time_t;
 
 /**
  *  Maximum size of @a load_init string passed to an internal client
@@ -475,7 +453,7 @@ typedef enum {
 #define EXTENDED_TIME_INFO
 
 typedef struct {
-    
+
     /* these four cannot be set from clients: the server sets them */
     jack_unique_t	unique_1;	/**< unique ID */
     jack_time_t		usecs;		/**< monotonic, free-rolling */
@@ -488,7 +466,7 @@ typedef struct {
     int32_t		bar;		/**< current bar */
     int32_t		beat;		/**< current beat-within-bar */
     int32_t		tick;		/**< current tick-within-beat */
-    double		bar_start_tick;            
+    double		bar_start_tick;
 
     float		beats_per_bar;	/**< time signature "numerator" */
     float		beat_type;	/**< time signature "denominator" */
@@ -499,15 +477,15 @@ typedef struct {
     double		frame_time;	/**< current time in seconds */
     double		next_time;	/**< next sequential frame_time
                          (unless repositioned) */
-  
+
     /* JackBBTFrameOffset fields: */
     jack_nframes_t	bbt_offset;	/**< frame offset for the BBT fields
                          (the given bar, beat, and tick
                          values actually refer to a time
                          frame_offset frames before the
-                         start of the cycle), should 
-                         be assumed to be 0 if 
-                         JackBBTFrameOffset is not 
+                         start of the cycle), should
+                         be assumed to be 0 if
+                         JackBBTFrameOffset is not
                          set. If JackBBTFrameOffset is
                          set and this value is zero, the BBT
                          time refers to the first frame of this
diff --git a/common/ringbuffer.c b/common/ringbuffer.c
index 92639079..a495eb75 100644
--- a/common/ringbuffer.c
+++ b/common/ringbuffer.c
@@ -30,7 +30,7 @@
 #include <sys/mman.h>
 #endif /* USE_MLOCK */
 #include "jack/ringbuffer.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 /* Create a new ringbuffer to hold at least `sz' bytes of data. The
    actual buffer size is rounded up to the next power of two.  */
diff --git a/common/shm.h b/common/shm.h
index e2bac1cf..b6195948 100644
--- a/common/shm.h
+++ b/common/shm.h
@@ -4,7 +4,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include "types.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 
 #define TRUE 1
diff --git a/common/wscript b/common/wscript
index 698668e0..27a9e544 100644
--- a/common/wscript
+++ b/common/wscript
@@ -42,7 +42,11 @@ def create_jack_process_obj(bld, target, sources, uselib = None):
     process = bld.create_obj('cpp', 'shlib')
     process.env['shlib_PATTERN'] = '%s.so'
     process.defines  = 'HAVE_CONFIG_H'
-    process.includes = ['./jack', '.', '..', '../macosx','../windows', '../linux/alsa']
+    if bld.env()['IS_MACOSX']:
+        env_includes = ['../macosx', '../posix']
+    if bld.env()['IS_LINUX']:
+	env_includes = ['../linux', '../posix', '../linux/alsa']
+    process.includes = ['.'] + env_includes + ['jack', '..']
     process.name     = target
     process.target   = target
     process.source   = sources
@@ -72,10 +76,8 @@ def build(bld):
         'JackMidiPort.cpp',
         'JackMidiAPI.cpp',
         'JackEngineControl.cpp',
-        'JackPosixThread.cpp',
         'JackShmMem.cpp',
         'shm.c',
-        'JackSocket.cpp',
         'JackTime.c',
         'JackGlobals.cpp',
         'JackDebugClient.cpp',
@@ -83,7 +85,6 @@ def build(bld):
         'timestamps.c',
         'JackTools.cpp',
         'JackMessageBuffer.cpp',
-        'JackProcessSync.cpp',
         ]
 
     includes = ['.', './jack', '..']
@@ -91,20 +92,25 @@ def build(bld):
 
     if bld.env()['IS_LINUX']:
         common_libsources += [
-            'JackPosixSemaphore.cpp',
-            'JackFifo.cpp',
+            '../posix/JackPosixThread.cpp',
+            '../posix/JackPosixSemaphore.cpp',
+            '../posix/JackFifo.cpp',
+            '../posix/JackProcessSync.cpp',
+            '../posix/JackSocket.cpp',
             ]
-        includes.append('../linux')
+        includes = ['../linux', '../posix'] + includes
         uselib.append('RT')
         uselib.append('DL')
 
     if bld.env()['IS_MACOSX']:
         common_libsources += [
-            '../macosx/JackMachSemaphore.cpp',
+            '../posix/JackProcessSync.cpp',
+            '../posix/JackPosixThread.cpp',
             '../macosx/JackMachThread.cpp',
+            '../macosx/JackMachSemaphore.cpp',
             '../macosx/JackMachPort.cpp',
             ]
-        includes += ['../macosx', '../macosx/RPC']
+        includes = ['../macosx', '../macosx/RPC', '../posix'] + includes
 
     serverlib = bld.create_obj('cpp', 'shlib')
     serverlib.features.append('cc')
@@ -124,8 +130,8 @@ def build(bld):
         'JackLoopbackDriver.cpp',
         'JackServer.cpp',
         'JackThreadedDriver.cpp',
-		'JackRestartThreadedDriver.cpp',
-		'JackWaitThreadedDriver.cpp',
+	'JackRestartThreadedDriver.cpp',
+	'JackWaitThreadedDriver.cpp',
         'JackServerAPI.cpp',
         'JackDriverLoader.cpp',
         'JackServerGlobals.cpp',
@@ -136,10 +142,10 @@ def build(bld):
 
     if bld.env()['IS_LINUX']:
         serverlib.source += [
-            'JackSocketServerChannel.cpp',
-            'JackSocketNotifyChannel.cpp',
-            'JackSocketServerNotifyChannel.cpp',
-	    	'JackNetUnixSocket.cpp',
+            '../posix/JackSocketServerChannel.cpp',
+            '../posix/JackSocketNotifyChannel.cpp',
+            '../posix/JackSocketServerNotifyChannel.cpp',
+            '../posix/JackNetUnixSocket.cpp',
             ]
 
     if bld.env()['IS_MACOSX']:
@@ -149,7 +155,7 @@ def build(bld):
             '../macosx/JackMachServerNotifyChannel.cpp',
             '../macosx/JackMacEngineRPC.cpp',
             '../macosx/RPC/JackRPCClientUser.c',
-	    	'JackNetUnixSocket.cpp',
+            '../posix/JackNetUnixSocket.cpp',
             ]
 
     serverlib.vnum = bld.env()['JACK_API_VERSION']
@@ -178,7 +184,7 @@ def build(bld):
 
     if bld.env()['IS_LINUX']:
         clientlib.source += [
-            'JackSocketClientChannel.cpp',
+            '../posix/JackSocketClientChannel.cpp',
             ]
 
     if bld.env()['IS_MACOSX']:
diff --git a/linux/dbus/controller.c b/dbus/controller.c
index 01bc3b3b..01bc3b3b 100644
--- a/linux/dbus/controller.c
+++ b/dbus/controller.c
diff --git a/linux/dbus/controller.h b/dbus/controller.h
index 19887b4f..19887b4f 100644
--- a/linux/dbus/controller.h
+++ b/dbus/controller.h
diff --git a/linux/dbus/controller_iface_configure.c b/dbus/controller_iface_configure.c
index 804b19b2..804b19b2 100644
--- a/linux/dbus/controller_iface_configure.c
+++ b/dbus/controller_iface_configure.c
diff --git a/linux/dbus/controller_iface_control.c b/dbus/controller_iface_control.c
index 317aa00e..317aa00e 100644
--- a/linux/dbus/controller_iface_control.c
+++ b/dbus/controller_iface_control.c
diff --git a/linux/dbus/controller_iface_introspectable.c b/dbus/controller_iface_introspectable.c
index 8b1a644c..8b1a644c 100644
--- a/linux/dbus/controller_iface_introspectable.c
+++ b/dbus/controller_iface_introspectable.c
diff --git a/linux/dbus/controller_iface_patchbay.c b/dbus/controller_iface_patchbay.c
index 84391404..84391404 100644
--- a/linux/dbus/controller_iface_patchbay.c
+++ b/dbus/controller_iface_patchbay.c
diff --git a/linux/dbus/controller_iface_transport.c b/dbus/controller_iface_transport.c
index 546a9602..546a9602 100644
--- a/linux/dbus/controller_iface_transport.c
+++ b/dbus/controller_iface_transport.c
diff --git a/linux/dbus/controller_internal.h b/dbus/controller_internal.h
index df875bca..df875bca 100644
--- a/linux/dbus/controller_internal.h
+++ b/dbus/controller_internal.h
diff --git a/linux/dbus/jackdbus.c b/dbus/jackdbus.c
index 186741e5..186741e5 100644
--- a/linux/dbus/jackdbus.c
+++ b/dbus/jackdbus.c
diff --git a/linux/dbus/jackdbus.h b/dbus/jackdbus.h
index e2ebef2c..e2ebef2c 100644
--- a/linux/dbus/jackdbus.h
+++ b/dbus/jackdbus.h
diff --git a/linux/dbus/list.h b/dbus/list.h
index fee6e73b..fee6e73b 100644
--- a/linux/dbus/list.h
+++ b/dbus/list.h
diff --git a/linux/dbus/org.jackaudio.service.in b/dbus/org.jackaudio.service.in
index 91b777ac..91b777ac 100644
--- a/linux/dbus/org.jackaudio.service.in
+++ b/dbus/org.jackaudio.service.in
diff --git a/linux/dbus/sigsegv.c b/dbus/sigsegv.c
index 46645408..46645408 100644
--- a/linux/dbus/sigsegv.c
+++ b/dbus/sigsegv.c
diff --git a/linux/dbus/sigsegv.h b/dbus/sigsegv.h
index 55b4f214..55b4f214 100644
--- a/linux/dbus/sigsegv.h
+++ b/dbus/sigsegv.h
diff --git a/linux/dbus/wscript b/dbus/wscript
index baa2268b..deec89e2 100644
--- a/linux/dbus/wscript
+++ b/dbus/wscript
@@ -64,7 +64,12 @@ def build(bld):
         return
 
     obj = bld.create_obj('cc', 'program')
-    obj.includes = ['.', '../../', '../../common', '../../common/jack']
+    if bld.env()['IS_LINUX']:
+        sysdeps_dbus_include = ['../linux', '../posix']
+    if bld.env()['IS_MACOSX']:
+        sysdeps_dbus_include = ['../macosx', '../posix']
+
+    obj.includes = sysdeps_dbus_include + ['.', '../', '../common', '../common/jack']
     obj.source = [
         'jackdbus.c',
         'controller.c',
diff --git a/linux/dbus/xml.c b/dbus/xml.c
index 182b60ff..182b60ff 100644
--- a/linux/dbus/xml.c
+++ b/dbus/xml.c
diff --git a/linux/dbus/xml.h b/dbus/xml.h
index 956e7943..956e7943 100644
--- a/linux/dbus/xml.h
+++ b/dbus/xml.h
diff --git a/linux/dbus/xml_expat.c b/dbus/xml_expat.c
index 1ee1bd2e..1ee1bd2e 100644
--- a/linux/dbus/xml_expat.c
+++ b/dbus/xml_expat.c
diff --git a/linux/dbus/xml_libxml.c b/dbus/xml_libxml.c
index 8644182d..8644182d 100644
--- a/linux/dbus/xml_libxml.c
+++ b/dbus/xml_libxml.c
diff --git a/linux/dbus/xml_nop.c b/dbus/xml_nop.c
index e234076b..e234076b 100644
--- a/linux/dbus/xml_nop.c
+++ b/dbus/xml_nop.c
diff --git a/linux/dbus/xml_write_raw.c b/dbus/xml_write_raw.c
index 8542c31b..8542c31b 100644
--- a/linux/dbus/xml_write_raw.c
+++ b/dbus/xml_write_raw.c
diff --git a/example-clients/wscript b/example-clients/wscript
index 5aa8574a..b92d26dc 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -56,10 +56,14 @@ def configure(conf):
     conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
 
 def build(bld):
+    if bld.env()['IS_LINUX']:
+        os_incdir = ['../linux', '../posix']
+    if bld.env()['IS_MACOSX']:
+        os_incdir = ['../macosx', '../posix']
     for example_program, example_program_source in example_programs.items():
         prog = bld.create_obj('cpp', 'program')
         prog.features.append('cc')
-        prog.includes = ['../common/jack', '../common']
+        prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = example_program_source
         if bld.env()['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
@@ -76,7 +80,7 @@ def build(bld):
     #if bld.env()['BUILD_EXAMPLE_CLIENT_TRANSPORT']
     if bld.env()['BUILD_EXAMPLE_CLIENT_TRANSPORT'] == True and bld.env()['IS_LINUX'] == True:
         prog = bld.create_obj('cc', 'program')
-        prog.includes = ['../common/jack', '../common']
+        prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'transport.c'
         if bld.env()['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
@@ -91,7 +95,7 @@ def build(bld):
 
     if bld.env()['BUILD_EXAMPLE_CLIENT_REC'] == True:
         prog = bld.create_obj('cc', 'program')
-        prog.includes = ['../common/jack', '../common']
+        prog.includes = os_incdir + ['../common/jack', '../common']
         prog.source = 'capture_client.c'
         if bld.env()['IS_MACOSX']:
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
@@ -107,7 +111,7 @@ def build(bld):
     for example_lib, example_lib_source in example_libs.items():
         lib = bld.create_obj('cc', 'shlib')
         lib.env['shlib_PATTERN'] = '%s.so'
-        lib.includes = ['../common/jack', '../common']
+        lib.includes = os_incdir + ['../common/jack', '../common']
         lib.target = example_lib
         lib.source = example_lib_source
 	if bld.env()['IS_MACOSX']:
diff --git a/linux/JackAtomic_os.h b/linux/JackAtomic_os.h
new file mode 100644
index 00000000..4b62d220
--- /dev/null
+++ b/linux/JackAtomic_os.h
@@ -0,0 +1,77 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackAtomic_linux__
+#define __JackAtomic_linux__
+
+#include "JackTypes.h"
+
+#ifdef __PPC__
+
+static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
+{
+    register int result;
+    register UInt32 tmp;
+    asm volatile (
+        "# CAS					\n"
+        "	lwarx	%4, 0, %1	\n"         // creates a reservation on addr
+        "	cmpw	%4, %2		\n"        //  test value at addr
+        "	bne-	1f          \n"
+        "	sync            	\n"         //  synchronize instructions
+        "	stwcx.	%3, 0, %1	\n"         //  if the reservation is not altered
+        //  stores the new value at addr
+        "	bne-	1f          \n"
+        "   li      %0, 1       \n"
+        "	b		2f          \n"
+        "1:                     \n"
+        "   li      %0, 0       \n"
+        "2:                     \n"
+    : "=r" (result)
+                : "r" (addr), "r" (value), "r" (newvalue), "r" (tmp)
+            );
+    return result;
+}
+
+#endif
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#ifdef __SMP__
+#	define LOCK "lock ; "
+#else
+#	define LOCK ""
+#endif
+
+static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
+{
+    register char ret;
+    __asm__ __volatile__ (
+        "# CAS \n\t"
+        LOCK "cmpxchg %2, (%1) \n\t"
+        "sete %0               \n\t"
+    : "=a" (ret)
+                : "c" (addr), "d" (newvalue), "a" (value)
+            );
+    return ret;
+}
+
+#endif
+
+#endif
+
diff --git a/linux/JackPlatformPlug_os.h b/linux/JackPlatformPlug_os.h
new file mode 100644
index 00000000..7b692c6d
--- /dev/null
+++ b/linux/JackPlatformPlug_os.h
@@ -0,0 +1,75 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackPlatformPlug_linux__
+#define __JackPlatformPlug_linux__
+
+namespace Jack
+{
+    struct JackRequest;
+	struct JackResult;
+    
+	class JackPosixThread;
+	class JackFifo;
+
+	class JackSocketServerChannel;
+	class JackSocketClientChannel;
+	class JackSocketServerNotifyChannel;
+	class JackSocketNotifyChannel;
+	class JackClientSocket;
+	class JackNetUnixSocket;
+}
+
+/* __JackPlatformThread__ */
+#include "JackPosixThread.h"
+namespace Jack { typedef JackPosixThread JackThread; }
+
+/* __JackPlatformSynchro__  client activation */
+#include "JackFifo.h"
+namespace Jack { typedef JackFifo JackSynchro; }
+
+/* __JackPlatformChannelTransaction__ */
+#include "JackSocket.h"
+namespace Jack { typedef JackClientSocket JackChannelTransaction; }
+
+#include "JackProcessSync.h"
+/* __JackPlatformProcessSync__ */
+/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
+
+/* __JackPlatformServerChannel__ */ 
+#include "JackSocketServerChannel.h"
+namespace Jack { typedef JackSocketServerChannel JackServerChannel; }
+
+/* __JackPlatformClientChannel__ */
+#include "JackSocketClientChannel.h"
+namespace Jack { typedef JackSocketClientChannel JackClientChannel; }
+
+/* __JackPlatformServerNotifyChannel__ */
+#include "JackSocketServerNotifyChannel.h"
+namespace Jack { typedef JackSocketServerNotifyChannel JackServerNotifyChannel; }
+
+/* __JackPlatformNotifyChannel__ */
+#include "JackSocketNotifyChannel.h"
+namespace Jack { typedef JackSocketNotifyChannel JackNotifyChannel; }
+
+/* __JackPlatformNetSocket__ */
+#include "JackNetUnixSocket.h"
+namespace Jack { typedef JackNetUnixSocket JackNetSocket; }
+
+#endif
diff --git a/linux/JackTime_os.h b/linux/JackTime_os.h
new file mode 100644
index 00000000..12505e9a
--- /dev/null
+++ b/linux/JackTime_os.h
@@ -0,0 +1,61 @@
+/*
+Copyright (C) 2001-2003 Paul Davis
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackTime_linux__
+#define __JackTime_linux__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <unistd.h>
+
+    static inline void JackSleep(long usec) 
+    {
+        usleep(usec);
+    }
+
+#ifdef GETCYCLE_TIME
+#include "cycles.h"
+    extern jack_time_t __jack_cpu_mhz;
+    jack_time_t GetMhz();
+    void InitTime();
+    static inline jack_time_t GetMicroSeconds(void) 
+    {
+        return get_cycles() / __jack_cpu_mhz;
+    }
+#else
+#include <time.h>
+    void InitTime();
+    static inline jack_time_t GetMicroSeconds(void) 
+    {
+        struct timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        return (jack_time_t)ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    }
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/linux/alsa/JackAlsaAdapter.h b/linux/alsa/JackAlsaAdapter.h
index bd2748ca..966d4413 100644
--- a/linux/alsa/JackAlsaAdapter.h
+++ b/linux/alsa/JackAlsaAdapter.h
@@ -25,7 +25,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <assert.h>
 #include <alsa/asoundlib.h>
 #include "JackAudioAdapterInterface.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackError.h"
 #include "jack.h"
 #include "jslist.h"
@@ -603,7 +603,7 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
     EXPORT jack_driver_desc_t* jack_get_descriptor();
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index 3e58144c..0eeb834f 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -53,7 +53,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "memops.h"
 
 #include "JackPosixThread.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 namespace Jack
 {
diff --git a/common/cycles.h b/linux/cycles.h
index 2913b1da..2913b1da 100644
--- a/common/cycles.h
+++ b/linux/cycles.h
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
index 8df66bb8..826fe9f1 100644
--- a/linux/firewire/JackFFADODriver.cpp
+++ b/linux/firewire/JackFFADODriver.cpp
@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackPort.h"
 #include "JackGraphManager.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
 namespace Jack
 {
diff --git a/linux/wscript b/linux/wscript
index 76fea2db..dc5e3ede 100644
--- a/linux/wscript
+++ b/linux/wscript
@@ -16,7 +16,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
     driver.features.append('cc')
     driver.env['shlib_PATTERN'] = 'jack_%s.so'
     driver.defines = 'HAVE_CONFIG_H'
-    driver.includes = ['.', '../common', '../common/jack']
+    driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack']
     driver.target = target
     driver.source = sources
     driver.inst_var = bld.env()['ADDON_DIR']
@@ -27,7 +27,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
 
 def build(bld):
     jackd = bld.create_obj('cpp', 'program')
-    jackd.includes = ['../common/jack', '../common']
+    jackd.includes = ['../linux', '../posix', '../common/jack', '../common']
     jackd.defines = 'HAVE_CONFIG_H'
     jackd.source = ['../common/Jackdmp.cpp']
     jackd.uselib = 'PTHREAD DL RT'
diff --git a/macosx/JackAtomic_os.h b/macosx/JackAtomic_os.h
new file mode 100644
index 00000000..f02fad47
--- /dev/null
+++ b/macosx/JackAtomic_os.h
@@ -0,0 +1,77 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackAtomic_APPLE__
+#define __JackAtomic_APPLE__
+
+#include "JackTypes.h"
+
+#if defined(__ppc__) || defined(__ppc64__)
+
+static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
+{
+    register int result;
+    asm volatile (
+        "# CAS					\n"
+        "	lwarx	r0, 0, %1	\n"         // creates a reservation on addr
+        "	cmpw	r0, %2		\n"			//  test value at addr
+        "	bne-	1f          \n"
+        "	sync            	\n"         //  synchronize instructions
+        "	stwcx.	%3, 0, %1	\n"         //  if the reservation is not altered
+        //  stores the new value at addr
+        "	bne-	1f          \n"
+        "   li      %0, 1       \n"
+        "	b		2f          \n"
+        "1:                     \n"
+        "   li      %0, 0       \n"
+        "2:                     \n"
+    : "=r" (result)
+                : "r" (addr), "r" (value), "r" (newvalue)
+                : "r0"
+            );
+    return result;
+}
+
+#endif
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#ifdef __SMP__
+#	define LOCK "lock ; "
+#else
+#	define LOCK ""
+#endif
+
+static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
+{
+    register char ret;
+    __asm__ __volatile__ (
+        "# CAS \n\t"
+        LOCK "cmpxchg %2, (%1) \n\t"
+        "sete %0               \n\t"
+    : "=a" (ret)
+                : "c" (addr), "d" (newvalue), "a" (value)
+            );
+    return ret;
+}
+
+#endif
+
+#endif
+
diff --git a/macosx/JackCoreAudioAdapter.h b/macosx/JackCoreAudioAdapter.h
index 83d386d7..2c7f7849 100644
--- a/macosx/JackCoreAudioAdapter.h
+++ b/macosx/JackCoreAudioAdapter.h
@@ -137,7 +137,7 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
 EXPORT jack_driver_desc_t* jack_get_descriptor();
diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp
index 9a631e9b..df5658ad 100644
--- a/macosx/JackCoreAudioDriver.cpp
+++ b/macosx/JackCoreAudioDriver.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackClientControl.h"
 #include "JackDriverLoader.h"
 #include "JackGlobals.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <iostream>
 
 namespace Jack
diff --git a/macosx/JackMacLibClientRPC.cpp b/macosx/JackMacLibClientRPC.cpp
index 4c78c287..725c018e 100644
--- a/macosx/JackMacLibClientRPC.cpp
+++ b/macosx/JackMacLibClientRPC.cpp
@@ -34,7 +34,7 @@ using namespace Jack;
 rpc_type rpc_jack_client_sync_notify(mach_port_t client_port, int refnum, client_name_t name, int notify, int value1, int value2, int* result)
 {
     jack_log("rpc_jack_client_sync_notify ref = %ld name = %s notify = %ld val1 = %ld val2 = %ld", refnum, name, notify, value1, value2);
-    JackClient* client = JackLibGlobals::fGlobals->fClientTable[client_port];
+    JackClient* client = gClientTable[client_port];
     assert(client);
     *result = client->ClientNotify(refnum, name, notify, true, value1, value2);
     return KERN_SUCCESS;
@@ -43,7 +43,7 @@ rpc_type rpc_jack_client_sync_notify(mach_port_t client_port, int refnum, client
 rpc_type rpc_jack_client_async_notify(mach_port_t client_port, int refnum, client_name_t name, int notify,  int value1, int value2)
 {
     jack_log("rpc_jack_client_async_notify ref = %ld name = %s notify = %ld val1 = %ld val2 = %ld", refnum, name, notify, value1, value2);
-    JackClient* client = JackLibGlobals::fGlobals->fClientTable[client_port];
+    JackClient* client = gClientTable[client_port];
     assert(client);
     client->ClientNotify(refnum, name, notify, false, value1, value2);
     return KERN_SUCCESS;
diff --git a/macosx/JackMachClientChannel.cpp b/macosx/JackMachClientChannel.cpp
index ca90dcf1..8ffcd5d6 100644
--- a/macosx/JackMachClientChannel.cpp
+++ b/macosx/JackMachClientChannel.cpp
@@ -33,6 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 namespace Jack
 {
 
+std::map<mach_port_t, JackClient*> gClientTable;
+
 JackMachClientChannel::JackMachClientChannel():fPrivatePort(0),fThread(this)
 {}
 
@@ -89,14 +91,14 @@ int JackMachClientChannel::Open(const char* server_name, const char* name, char*
         return -1;
     }
 
-    JackLibGlobals::fGlobals->fClientTable[fClientPort.GetPort()] = client;
+    gClientTable[fClientPort.GetPort()] = client;
     return 0;
 }
 
 void JackMachClientChannel::Close()
 {
     jack_log("JackMachClientChannel::Close");
-    JackLibGlobals::fGlobals->fClientTable.erase(fClientPort.GetPort());
+    gClientTable.erase(fClientPort.GetPort());
     fServerPort.DisconnectPort();
     fClientPort.DestroyPort();
 
@@ -314,7 +316,7 @@ void JackMachClientChannel::InternalClientUnload(int refnum, int int_ref, int* s
 bool JackMachClientChannel::Init()
 {
     jack_log("JackMachClientChannel::Init");
-    JackClient* client = JackLibGlobals::fGlobals->fClientTable[fClientPort.GetPort()];
+    JackClient* client = gClientTable[fClientPort.GetPort()];
     return client->Init();
 }
 
@@ -323,7 +325,7 @@ bool JackMachClientChannel::Execute()
     kern_return_t res;
     if ((res = mach_msg_server(JackRPCClient_server, 1024, fClientPort.GetPort(), 0)) != KERN_SUCCESS) {
         jack_error("JackMachClientChannel::Execute err = %s", mach_error_string(res));
-        JackClient* client = JackLibGlobals::fGlobals->fClientTable[fClientPort.GetPort()];
+        JackClient* client = gClientTable[fClientPort.GetPort()];
         client->ShutDown();
         return false;
     } else {
diff --git a/macosx/JackMachClientChannel.h b/macosx/JackMachClientChannel.h
index 26b4e608..dd678029 100644
--- a/macosx/JackMachClientChannel.h
+++ b/macosx/JackMachClientChannel.h
@@ -22,13 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackChannel.h"
 #include "JackMachPort.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
+#include <map>
 
 namespace Jack
 {
 
-class JackLibClient;
-
 /*!
 \brief JackClientChannel using Mach IPC.
 */
@@ -92,6 +91,7 @@ class JackMachClientChannel : public detail::JackClientChannelInterface, public
         bool Execute();
 };
 
+extern std::map<mach_port_t, JackClient*> gClientTable;
 
 } // end of namespace
 
diff --git a/macosx/JackMachSemaphore.h b/macosx/JackMachSemaphore.h
index 390530c1..5d33c52b 100644
--- a/macosx/JackMachSemaphore.h
+++ b/macosx/JackMachSemaphore.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackMachSemaphore__
 #define __JackMachSemaphore__
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "JackSynchro.h"
 #include <mach/mach.h>
 #include <mach/mach_types.h>
diff --git a/macosx/JackMachServerChannel.h b/macosx/JackMachServerChannel.h
index bede52a1..a95cf04a 100644
--- a/macosx/JackMachServerChannel.h
+++ b/macosx/JackMachServerChannel.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackMachServerChannel__
 
 #include "JackChannel.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackMachPort.h"
 #include <map>
 
diff --git a/macosx/JackPlatformPlug_os.h b/macosx/JackPlatformPlug_os.h
new file mode 100644
index 00000000..9213acd0
--- /dev/null
+++ b/macosx/JackPlatformPlug_os.h
@@ -0,0 +1,67 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackPlatformPlug_APPLE__
+#define __JackPlatformPlug_APPLE__
+
+namespace Jack
+{
+	class JackMachThread;
+	class JackMachSemaphore;
+
+	class JackMachServerChannel;
+	class JackMachClientChannel;
+	class JackMachServerNotifyChannel;
+	class JackMachNotifyChannel;
+	class JackNetUnixSocket;
+}
+
+/* __JackPlatformThread__ */
+#include "JackMachThread.h"
+namespace Jack { typedef JackMachThread JackThread; }
+
+/* __JackPlatformSynchro__  client activation */
+#include "JackMachSemaphore.h"
+namespace Jack { typedef JackMachSemaphore JackSynchro; }
+
+/* __JackPlatformProcessSync__ */
+#include "JackProcessSync.h"
+/* Only on windows a special JackProcessSync is used. It is directly defined by including JackProcessSync.h here */
+
+/* __JackPlatformServerChannel__ */ 
+#include "JackMachServerChannel.h"
+namespace Jack { typedef JackMachServerChannel JackServerChannel; }
+
+/* __JackPlatformClientChannel__ */
+#include "JackMachClientChannel.h"
+namespace Jack { typedef JackMachClientChannel JackClientChannel; }
+
+/* __JackPlatformServerNotifyChannel__ */
+#include "JackMachServerNotifyChannel.h"
+namespace Jack { typedef JackMachServerNotifyChannel JackServerNotifyChannel; }
+
+/* __JackPlatformNotifyChannel__ */
+#include "JackMachNotifyChannel.h"
+namespace Jack { typedef JackMachNotifyChannel JackNotifyChannel; }
+
+/* __JackPlatformNetSocket__ */
+#include "JackNetUnixSocket.h"
+namespace Jack { typedef JackNetUnixSocket JackNetSocket; }
+
+#endif
diff --git a/macosx/JackTime_os.h b/macosx/JackTime_os.h
new file mode 100644
index 00000000..2d705828
--- /dev/null
+++ b/macosx/JackTime_os.h
@@ -0,0 +1,52 @@
+/*
+Copyright (C) 2001-2003 Paul Davis
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackTime_APPLE__
+#define __JackTime_APPLE__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <mach/mach_time.h>
+#include <unistd.h>
+
+    extern EXPORT double __jack_time_ratio;
+
+    static inline jack_time_t GetMicroSeconds(void) 
+    {
+        return (jack_time_t) (mach_absolute_time () * __jack_time_ratio);
+    }
+
+    /* This should only be called ONCE per process. */
+    void InitTime();
+
+    static inline void JackSleep(int usec) 
+    {
+        usleep(usec);
+    }
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/macosx/Jackdmp.xcodeproj/project.pbxproj b/macosx/Jackdmp.xcodeproj/project.pbxproj
index b93543ac..b55d1863 100644
--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -59,7 +59,6 @@
 				4B699DB8097D421700A18468 /* PBXTargetDependency */,
 				4B699DBA097D421700A18468 /* PBXTargetDependency */,
 				4B699DBC097D421700A18468 /* PBXTargetDependency */,
-				4B978E800A31D8B7009E2DD1 /* PBXTargetDependency */,
 				BA222AF20DC883F3001A17F4 /* PBXTargetDependency */,
 				4BD624D30CBCF55700DE782F /* PBXTargetDependency */,
 				BA222AF00DC883EF001A17F4 /* PBXTargetDependency */,
@@ -101,10 +100,6 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		4B02069E0DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */; };
-		4B02069F0DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */; };
-		4B0206A00DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */; };
-		4B0206A10DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */; };
 		4B0A28ED0D520852002EFF74 /* tw.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A28EC0D520852002EFF74 /* tw.c */; };
 		4B0A29260D52108E002EFF74 /* tw.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A28EC0D520852002EFF74 /* tw.c */; };
 		4B19B3040E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3020E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp */; };
@@ -114,11 +109,8 @@
 		4B19B3150E2362E800DD4A82 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */; };
 		4B19B3160E2362E800DD4A82 /* JackAudioAdapterInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3090E2362E700DD4A82 /* JackAudioAdapterInterface.h */; };
 		4B19B3190E2362E800DD4A82 /* JackException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30C0E2362E700DD4A82 /* JackException.h */; };
-		4B19B31A0E2362E800DD4A82 /* JackExports.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30D0E2362E700DD4A82 /* JackExports.h */; };
 		4B19B31B0E2362E800DD4A82 /* JackLibSampleRateResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */; };
 		4B19B31C0E2362E800DD4A82 /* JackLibSampleRateResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */; };
-		4B19B31D0E2362E800DD4A82 /* JackPlatformChannelTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3100E2362E700DD4A82 /* JackPlatformChannelTransaction.h */; };
-		4B19B31E0E2362E800DD4A82 /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3110E2362E700DD4A82 /* JackProcessSync.h */; };
 		4B19B31F0E2362E800DD4A82 /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3120E2362E700DD4A82 /* JackResampler.cpp */; };
 		4B35C41E0D4731D1000DE7AE /* Jackdmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D2250834F06A00C94B91 /* Jackdmp.cpp */; };
 		4B35C4290D4731D1000DE7AE /* JackMachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B799AD707899652003F3F15 /* JackMachPort.h */; };
@@ -126,7 +118,6 @@
 		4B35C42B0D4731D1000DE7AE /* JackTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1830834EE5800C94B91 /* JackTime.h */; };
 		4B35C42C0D4731D1000DE7AE /* JackShmMem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1870834EE7900C94B91 /* JackShmMem.h */; };
 		4B35C42D0D4731D1000DE7AE /* shm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D18F0834EE8400C94B91 /* shm.h */; };
-		4B35C42E0D4731D1000DE7AE /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1970834EE9700C94B91 /* JackPosixThread.h */; };
 		4B35C42F0D4731D1000DE7AE /* JackThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D19F0834EE9E00C94B91 /* JackThread.h */; };
 		4B35C4300D4731D1000DE7AE /* JackActivationCount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */; };
 		4B35C4310D4731D1000DE7AE /* JackChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1AF0834EEC400C94B91 /* JackChannel.h */; };
@@ -165,7 +156,6 @@
 		4B35C45A0D4731D1000DE7AE /* JackMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B799AD607899652003F3F15 /* JackMachPort.cpp */; };
 		4B35C45B0D4731D1000DE7AE /* JackShmMem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */; };
 		4B35C45C0D4731D1000DE7AE /* shm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1900834EE8400C94B91 /* shm.c */; };
-		4B35C45D0D4731D1000DE7AE /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */; };
 		4B35C45E0D4731D1000DE7AE /* JackActivationCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */; };
 		4B35C45F0D4731D1000DE7AE /* JackGraphManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1C80834EF2200C94B91 /* JackGraphManager.cpp */; };
 		4B35C4600D4731D1000DE7AE /* JackPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1D00834EF2F00C94B91 /* JackPort.cpp */; };
@@ -196,7 +186,6 @@
 		4B35C4890D4731D1000DE7AE /* JackTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1830834EE5800C94B91 /* JackTime.h */; };
 		4B35C48A0D4731D1000DE7AE /* JackShmMem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1870834EE7900C94B91 /* JackShmMem.h */; };
 		4B35C48B0D4731D1000DE7AE /* shm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D18F0834EE8400C94B91 /* shm.h */; };
-		4B35C48C0D4731D1000DE7AE /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1970834EE9700C94B91 /* JackPosixThread.h */; };
 		4B35C48D0D4731D1000DE7AE /* JackThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D19F0834EE9E00C94B91 /* JackThread.h */; };
 		4B35C48E0D4731D1000DE7AE /* JackActivationCount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */; };
 		4B35C48F0D4731D1000DE7AE /* JackChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1AF0834EEC400C94B91 /* JackChannel.h */; };
@@ -244,7 +233,6 @@
 		4B35C4C40D4731D1000DE7AE /* JackMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B799AD607899652003F3F15 /* JackMachPort.cpp */; };
 		4B35C4C50D4731D1000DE7AE /* JackShmMem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */; };
 		4B35C4C60D4731D1000DE7AE /* shm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1900834EE8400C94B91 /* shm.c */; };
-		4B35C4C70D4731D1000DE7AE /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */; };
 		4B35C4C80D4731D1000DE7AE /* JackActivationCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */; };
 		4B35C4C90D4731D1000DE7AE /* JackGraphManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1C80834EF2200C94B91 /* JackGraphManager.cpp */; };
 		4B35C4CA0D4731D1000DE7AE /* JackPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1D00834EF2F00C94B91 /* JackPort.cpp */; };
@@ -302,10 +290,7 @@
 		4B35C5DA0D4731D2000DE7AE /* JackError.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1770834EE4800C94B91 /* JackError.h */; };
 		4B35C5DB0D4731D2000DE7AE /* JackConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B66A8580934964500A89560 /* JackConstants.h */; };
 		4B35C5DD0D4731D2000DE7AE /* JackMachSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF6C1D508ACE64C001E2013 /* JackMachSemaphore.cpp */; };
-		4B35C5DE0D4731D2000DE7AE /* JackFifo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B56880F08B5C8620022B32D /* JackFifo.cpp */; };
-		4B35C5DF0D4731D2000DE7AE /* JackPosixSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */; };
 		4B35C5E00D4731D2000DE7AE /* JackMachThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFB741E08AD2B9900DB99B8 /* JackMachThread.cpp */; };
-		4B35C5E10D4731D2000DE7AE /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */; };
 		4B35C5E20D4731D2000DE7AE /* testSynchroServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577FB08BF8E4600F82DE1 /* testSynchroServer.cpp */; };
 		4B35C5F60D4731D2000DE7AE /* testSynchroClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BA577BC08BF8BE200F82DE1 /* testSynchroClient.cpp */; };
 		4B35C60A0D4731D2000DE7AE /* testSynchroServerClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBD13CC08C71EB40079F7FF /* testSynchroServerClient.cpp */; };
@@ -349,10 +334,7 @@
 		4B5DB9840CD2429B00EBA5EE /* JackDebugClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B98AE010931D30C0091932A /* JackDebugClient.h */; };
 		4B5E08C30E5B66EE00BEE4E0 /* JackAudioAdapterInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3090E2362E700DD4A82 /* JackAudioAdapterInterface.h */; };
 		4B5E08C40E5B66EE00BEE4E0 /* JackException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30C0E2362E700DD4A82 /* JackException.h */; };
-		4B5E08C50E5B66EE00BEE4E0 /* JackExports.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30D0E2362E700DD4A82 /* JackExports.h */; };
 		4B5E08C60E5B66EE00BEE4E0 /* JackLibSampleRateResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */; };
-		4B5E08C70E5B66EE00BEE4E0 /* JackPlatformChannelTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3100E2362E700DD4A82 /* JackPlatformChannelTransaction.h */; };
-		4B5E08C80E5B66EE00BEE4E0 /* JackProcessSync.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3110E2362E700DD4A82 /* JackProcessSync.h */; };
 		4B5E08CC0E5B66EE00BEE4E0 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */; };
 		4B5E08CD0E5B66EE00BEE4E0 /* JackLibSampleRateResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */; };
 		4B5E08CE0E5B66EE00BEE4E0 /* JackResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3120E2362E700DD4A82 /* JackResampler.cpp */; };
@@ -362,8 +344,6 @@
 		4B5E08EC0E5B67EB00BEE4E0 /* JackNetInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B76C7690E5AB2DB00E2AC21 /* JackNetInterface.h */; };
 		4B5E08EE0E5B680200BEE4E0 /* JackAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3060E2362E700DD4A82 /* JackAudioAdapter.cpp */; };
 		4B5E08EF0E5B680200BEE4E0 /* JackAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3070E2362E700DD4A82 /* JackAudioAdapter.h */; };
-		4B5E08F40E5B681500BEE4E0 /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA047C720E14E7540041F3B6 /* JackNetUnixSocket.cpp */; };
-		4B5E08F50E5B681500BEE4E0 /* JackNetUnixSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = BA047C730E14E7540041F3B6 /* JackNetUnixSocket.h */; };
 		4B5F253E0DEE9B8F0041E486 /* JackLockedEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B5F253D0DEE9B8F0041E486 /* JackLockedEngine.h */; };
 		4B60CE490AAABA31004956AA /* connect.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B60CE480AAABA31004956AA /* connect.c */; };
 		4B60CE4A0AAABA31004956AA /* connect.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B60CE480AAABA31004956AA /* connect.c */; };
@@ -373,7 +353,6 @@
 		4B699C04097D421600A18468 /* JackTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1830834EE5800C94B91 /* JackTime.h */; };
 		4B699C05097D421600A18468 /* JackShmMem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1870834EE7900C94B91 /* JackShmMem.h */; };
 		4B699C06097D421600A18468 /* shm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D18F0834EE8400C94B91 /* shm.h */; };
-		4B699C07097D421600A18468 /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1970834EE9700C94B91 /* JackPosixThread.h */; };
 		4B699C08097D421600A18468 /* JackThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D19F0834EE9E00C94B91 /* JackThread.h */; };
 		4B699C09097D421600A18468 /* JackActivationCount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */; };
 		4B699C0A097D421600A18468 /* JackChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1AF0834EEC400C94B91 /* JackChannel.h */; };
@@ -399,7 +378,6 @@
 		4B699C27097D421600A18468 /* JackMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B799AD607899652003F3F15 /* JackMachPort.cpp */; };
 		4B699C28097D421600A18468 /* JackShmMem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */; };
 		4B699C29097D421600A18468 /* shm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1900834EE8400C94B91 /* shm.c */; };
-		4B699C2A097D421600A18468 /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */; };
 		4B699C2B097D421600A18468 /* JackActivationCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */; };
 		4B699C2C097D421600A18468 /* JackGraphManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1C80834EF2200C94B91 /* JackGraphManager.cpp */; };
 		4B699C2D097D421600A18468 /* JackPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1D00834EF2F00C94B91 /* JackPort.cpp */; };
@@ -421,7 +399,6 @@
 		4B699C50097D421600A18468 /* JackTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1830834EE5800C94B91 /* JackTime.h */; };
 		4B699C51097D421600A18468 /* JackShmMem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1870834EE7900C94B91 /* JackShmMem.h */; };
 		4B699C52097D421600A18468 /* shm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D18F0834EE8400C94B91 /* shm.h */; };
-		4B699C53097D421600A18468 /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1970834EE9700C94B91 /* JackPosixThread.h */; };
 		4B699C54097D421600A18468 /* JackThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D19F0834EE9E00C94B91 /* JackThread.h */; };
 		4B699C55097D421600A18468 /* JackActivationCount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */; };
 		4B699C56097D421600A18468 /* JackChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF8D1AF0834EEC400C94B91 /* JackChannel.h */; };
@@ -454,7 +431,6 @@
 		4B699C7E097D421600A18468 /* JackMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B799AD607899652003F3F15 /* JackMachPort.cpp */; };
 		4B699C7F097D421600A18468 /* JackShmMem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */; };
 		4B699C80097D421600A18468 /* shm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1900834EE8400C94B91 /* shm.c */; };
-		4B699C81097D421600A18468 /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */; };
 		4B699C82097D421600A18468 /* JackActivationCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */; };
 		4B699C83097D421600A18468 /* JackGraphManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1C80834EF2200C94B91 /* JackGraphManager.cpp */; };
 		4B699C84097D421600A18468 /* JackPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1D00834EF2F00C94B91 /* JackPort.cpp */; };
@@ -545,12 +521,8 @@
 		4BA7BDD00DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		4BA7BDD10DC22F4500AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BA7BDCB0DC22F4500AA3457 /* Jackservermp.framework */; };
 		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 */; };
-		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 */; };
@@ -569,6 +541,18 @@
 		4BC216850A444BAD00BDA09F /* JackServerAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8D1F50834EFB000C94B91 /* JackServerAPI.cpp */; };
 		4BC216890A444BDE00BDA09F /* JackServerGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC216880A444BDE00BDA09F /* JackServerGlobals.cpp */; };
 		4BC2168E0A444BED00BDA09F /* JackServerGlobals.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC2168D0A444BED00BDA09F /* JackServerGlobals.h */; };
+		4BC3B6A40E703B2E0066E42F /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
+		4BC3B6A50E703B2E0066E42F /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */; };
+		4BC3B6A60E703B2E0066E42F /* JackPosixThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */; };
+		4BC3B6A70E703B2E0066E42F /* JackPosixThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */; };
+		4BC3B6AB0E703B690066E42F /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6AA0E703B690066E42F /* JackProcessSync.cpp */; };
+		4BC3B6AC0E703B690066E42F /* JackProcessSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6AA0E703B690066E42F /* JackProcessSync.cpp */; };
+		4BC3B6BB0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */; };
+		4BC3B6BC0E703BCC0066E42F /* JackNetUnixSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6BA0E703BCC0066E42F /* JackNetUnixSocket.h */; };
+		4BC3B6BD0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */; };
+		4BC3B6BE0E703BCC0066E42F /* JackNetUnixSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6BA0E703BCC0066E42F /* JackNetUnixSocket.h */; };
+		4BC3B6BF0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */; };
+		4BC3B6C00E703BCC0066E42F /* JackNetUnixSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC3B6BA0E703BCC0066E42F /* JackNetUnixSocket.h */; };
 		4BCC87960D57168300A7FEB1 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
 		4BCC87970D57168300A7FEB1 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
 		4BCC87980D57168300A7FEB1 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BCC87950D57168300A7FEB1 /* Accelerate.framework */; };
@@ -597,10 +581,7 @@
 		4BFA82BC0DF6A9E40087B4E1 /* showtime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363F3D0DEB0C31001F72D9 /* showtime.c */; };
 		4BFA82C80DF6A9E40087B4E1 /* impulse_grabber.c in Sources */ = {isa = PBXBuildFile; fileRef = 4B363F750DEB0D7D001F72D9 /* impulse_grabber.c */; };
 		4BFA99AA0AAAF40C009E916C /* jdelay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFA99A90AAAF40C009E916C /* jdelay.cpp */; };
-		BA047C750E14E7830041F3B6 /* JackNetUnixSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA047C720E14E7540041F3B6 /* JackNetUnixSocket.cpp */; };
 		BA047C760E14E79D0041F3B6 /* JackNetSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = BA047C710E14E7540041F3B6 /* JackNetSocket.h */; };
-		BA047C770E14E79D0041F3B6 /* JackNetUnixSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = BA047C730E14E7540041F3B6 /* JackNetUnixSocket.h */; };
-		BA047C780E14E79D0041F3B6 /* JackPlatformNetSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = BA047C740E14E7540041F3B6 /* JackPlatformNetSocket.h */; };
 		BA1510900E1D19B9004A8C63 /* JackPortAudioDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA15108E0E1D19B9004A8C63 /* JackPortAudioDevices.cpp */; };
 		BA1510910E1D19B9004A8C63 /* JackPortAudioDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = BA15108F0E1D19B9004A8C63 /* JackPortAudioDevices.h */; };
 		BA1510990E1D1A2C004A8C63 /* JackPortAudioDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA15108E0E1D19B9004A8C63 /* JackPortAudioDevices.cpp */; };
@@ -938,13 +919,6 @@
 			remoteGlobalIDString = 4B699D03097D421600A18468;
 			remoteInfo = "jack_external_metro Universal";
 		};
-		4B978E7F0A31D8B7009E2DD1 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 4B978DB10A31CF4A009E2DD1;
-			remoteInfo = "jack_portaudio Universal";
-		};
 		4BA693E80CBE5BBA00EAD520 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -1131,7 +1105,6 @@
 
 /* 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; };
@@ -1157,25 +1130,6 @@
 		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; };
-		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; };
-		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; };
@@ -1212,11 +1166,8 @@
 		4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterInterface.cpp; path = ../common/JackAudioAdapterInterface.cpp; sourceTree = SOURCE_ROOT; };
 		4B19B3090E2362E700DD4A82 /* JackAudioAdapterInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackAudioAdapterInterface.h; path = ../common/JackAudioAdapterInterface.h; sourceTree = SOURCE_ROOT; };
 		4B19B30C0E2362E700DD4A82 /* JackException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackException.h; path = ../common/JackException.h; sourceTree = SOURCE_ROOT; };
-		4B19B30D0E2362E700DD4A82 /* JackExports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackExports.h; path = ../common/JackExports.h; sourceTree = SOURCE_ROOT; };
 		4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackLibSampleRateResampler.cpp; path = ../common/JackLibSampleRateResampler.cpp; sourceTree = SOURCE_ROOT; };
 		4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackLibSampleRateResampler.h; path = ../common/JackLibSampleRateResampler.h; sourceTree = SOURCE_ROOT; };
-		4B19B3100E2362E700DD4A82 /* JackPlatformChannelTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformChannelTransaction.h; path = ../common/JackPlatformChannelTransaction.h; sourceTree = SOURCE_ROOT; };
-		4B19B3110E2362E700DD4A82 /* JackProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackProcessSync.h; path = ../common/JackProcessSync.h; sourceTree = SOURCE_ROOT; };
 		4B19B3120E2362E700DD4A82 /* JackResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackResampler.cpp; path = ../common/JackResampler.cpp; sourceTree = SOURCE_ROOT; };
 		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; };
@@ -1274,8 +1225,6 @@
 		4B4E9AF90E5F1090000A3278 /* JackControlAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackControlAPI.h; path = ../common/JackControlAPI.h; sourceTree = SOURCE_ROOT; };
 		4B4F9C8A0DC20C0400706CB0 /* JackMessageBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackMessageBuffer.cpp; path = ../common/JackMessageBuffer.cpp; sourceTree = SOURCE_ROOT; };
 		4B4F9C8B0DC20C0400706CB0 /* JackMessageBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackMessageBuffer.h; path = ../common/JackMessageBuffer.h; sourceTree = SOURCE_ROOT; };
-		4B56880F08B5C8620022B32D /* JackFifo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackFifo.cpp; path = ../common/JackFifo.cpp; sourceTree = SOURCE_ROOT; };
-		4B56881008B5C8620022B32D /* JackFifo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackFifo.h; path = ../common/JackFifo.h; sourceTree = SOURCE_ROOT; };
 		4B57F5950D72C27900B4E719 /* jack_thread_wait */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_thread_wait; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B5A1BBB0CD1CB9E0005BF74 /* jack_midiseq */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_midiseq; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B5A1BBD0CD1CC110005BF74 /* midiseq.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = midiseq.c; path = "../example-clients/midiseq.c"; sourceTree = SOURCE_ROOT; };
@@ -1329,16 +1278,6 @@
 		4B8F3D4A0E06C4A10096D19C /* JackEngineTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackEngineTiming.h; path = ../common/JackEngineTiming.h; sourceTree = SOURCE_ROOT; };
 		4B940B9B06DDDE5B00D77F60 /* AudioHardware.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AudioHardware.h; path = /System/Library/Frameworks/CoreAudio.framework/Versions/A/Headers/AudioHardware.h; sourceTree = "<absolute>"; };
 		4B95BCAD0D913073000F7695 /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = control.h; path = ../common/jack/control.h; sourceTree = SOURCE_ROOT; };
-		4B97440C08AF54590094983C /* JackSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocket.cpp; path = ../common/JackSocket.cpp; sourceTree = SOURCE_ROOT; };
-		4B97440D08AF54590094983C /* JackSocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSocket.h; path = ../common/JackSocket.h; sourceTree = SOURCE_ROOT; };
-		4B97441408AF546F0094983C /* JackSocketClientChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSocketClientChannel.h; path = ../common/JackSocketClientChannel.h; sourceTree = SOURCE_ROOT; };
-		4B97441508AF546F0094983C /* JackSocketClientChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketClientChannel.cpp; path = ../common/JackSocketClientChannel.cpp; sourceTree = SOURCE_ROOT; };
-		4B97441A08AF54930094983C /* JackSocketNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSocketNotifyChannel.h; path = ../common/JackSocketNotifyChannel.h; sourceTree = SOURCE_ROOT; };
-		4B97441B08AF54930094983C /* JackSocketServerChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSocketServerChannel.h; path = ../common/JackSocketServerChannel.h; sourceTree = SOURCE_ROOT; };
-		4B97452B08AF6D4B0094983C /* JackSocketServerChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketServerChannel.cpp; path = ../common/JackSocketServerChannel.cpp; sourceTree = SOURCE_ROOT; };
-		4B97458708AF74FF0094983C /* JackSocketNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketNotifyChannel.cpp; path = ../common/JackSocketNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
-		4B9745CB08AF771B0094983C /* JackSocketServerNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackSocketServerNotifyChannel.h; path = ../common/JackSocketServerNotifyChannel.h; sourceTree = SOURCE_ROOT; };
-		4B9745D908AF78200094983C /* JackSocketServerNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketServerNotifyChannel.cpp; path = ../common/JackSocketServerNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
 		4B978DBB0A31CF4A009E2DD1 /* jack_portaudio.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_portaudio.so; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B978DEB0A31D099009E2DD1 /* JackPortAudioDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortAudioDriver.h; path = ../windows/JackPortAudioDriver.h; sourceTree = SOURCE_ROOT; };
 		4B978DEC0A31D099009E2DD1 /* JackPortAudioDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortAudioDriver.cpp; path = ../windows/JackPortAudioDriver.cpp; sourceTree = SOURCE_ROOT; };
@@ -1367,14 +1306,24 @@
 		4BC2168D0A444BED00BDA09F /* JackServerGlobals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackServerGlobals.h; path = ../common/JackServerGlobals.h; sourceTree = SOURCE_ROOT; };
 		4BC3988908B3CF6C00B6F371 /* JackDummyDriver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackDummyDriver.cpp; path = ../common/JackDummyDriver.cpp; sourceTree = SOURCE_ROOT; };
 		4BC3988A08B3CF6C00B6F371 /* JackDummyDriver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackDummyDriver.h; path = ../common/JackDummyDriver.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackPosixThread.cpp; path = ../posix/JackPosixThread.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPosixThread.h; path = ../posix/JackPosixThread.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6AA0E703B690066E42F /* JackProcessSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackProcessSync.cpp; path = ../posix/JackProcessSync.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6AD0E703B8D0066E42F /* JackSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocket.cpp; path = ../posix/JackSocket.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6AE0E703B8D0066E42F /* JackSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackSocket.h; path = ../posix/JackSocket.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6AF0E703B8D0066E42F /* JackSocketClientChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketClientChannel.cpp; path = ../posix/JackSocketClientChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6B00E703B8D0066E42F /* JackSocketClientChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackSocketClientChannel.h; path = ../posix/JackSocketClientChannel.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6B10E703B8D0066E42F /* JackSocketNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketNotifyChannel.cpp; path = ../posix/JackSocketNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6B20E703B8D0066E42F /* JackSocketNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackSocketNotifyChannel.h; path = ../posix/JackSocketNotifyChannel.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6B30E703B8D0066E42F /* JackSocketServerChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketServerChannel.cpp; path = ../posix/JackSocketServerChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6B40E703B8D0066E42F /* JackSocketServerChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackSocketServerChannel.h; path = ../posix/JackSocketServerChannel.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6B50E703B8D0066E42F /* JackSocketServerNotifyChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackSocketServerNotifyChannel.cpp; path = ../posix/JackSocketServerNotifyChannel.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6B60E703B8D0066E42F /* JackSocketServerNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackSocketServerNotifyChannel.h; path = ../posix/JackSocketServerNotifyChannel.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackPosixSemaphore.cpp; path = ../posix/JackPosixSemaphore.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPosixSemaphore.h; path = ../posix/JackPosixSemaphore.h; sourceTree = SOURCE_ROOT; };
+		4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackNetUnixSocket.cpp; path = ../posix/JackNetUnixSocket.cpp; sourceTree = SOURCE_ROOT; };
+		4BC3B6BA0E703BCC0066E42F /* JackNetUnixSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackNetUnixSocket.h; path = ../posix/JackNetUnixSocket.h; sourceTree = SOURCE_ROOT; };
 		4BC8326D0DF42C7D00DD1C93 /* JackMutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackMutex.h; path = ../common/JackMutex.h; sourceTree = SOURCE_ROOT; };
-		4BC834940DF4632F00DD1C93 /* JackPlatformClientChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformClientChannel.h; path = ../common/JackPlatformClientChannel.h; sourceTree = SOURCE_ROOT; };
-		4BC834950DF4632F00DD1C93 /* JackPlatformNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformNotifyChannel.h; path = ../common/JackPlatformNotifyChannel.h; sourceTree = SOURCE_ROOT; };
-		4BC834960DF4632F00DD1C93 /* JackPlatformProcessSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformProcessSync.h; path = ../common/JackPlatformProcessSync.h; sourceTree = SOURCE_ROOT; };
-		4BC834970DF4632F00DD1C93 /* JackPlatformServerChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformServerChannel.h; path = ../common/JackPlatformServerChannel.h; sourceTree = SOURCE_ROOT; };
-		4BC834980DF4632F00DD1C93 /* JackPlatformServerNotifyChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformServerNotifyChannel.h; path = ../common/JackPlatformServerNotifyChannel.h; sourceTree = SOURCE_ROOT; };
-		4BC834990DF4632F00DD1C93 /* JackPlatformSynchro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformSynchro.h; path = ../common/JackPlatformSynchro.h; sourceTree = SOURCE_ROOT; };
-		4BC8349A0DF4632F00DD1C93 /* JackPlatformThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackPlatformThread.h; path = ../common/JackPlatformThread.h; sourceTree = SOURCE_ROOT; };
 		4BCC87950D57168300A7FEB1 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
 		4BD4B4D409BACD9600750C0F /* JackTransportEngine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackTransportEngine.h; path = ../common/JackTransportEngine.h; sourceTree = SOURCE_ROOT; };
 		4BD4B4D509BACD9600750C0F /* JackTransportEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackTransportEngine.cpp; path = ../common/JackTransportEngine.cpp; sourceTree = SOURCE_ROOT; };
@@ -1387,8 +1336,6 @@
 		4BE6C6A30A3E096F005A203A /* jack_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_test; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BE6C6AC0A3E0A65005A203A /* jack_test.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = jack_test.cpp; path = ../tests/jack_test.cpp; sourceTree = SOURCE_ROOT; };
 		4BE99D300AD7A04800C59091 /* jack_cpu */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_cpu; sourceTree = BUILT_PRODUCTS_DIR; };
-		4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPosixSemaphore.cpp; path = ../common/JackPosixSemaphore.cpp; sourceTree = SOURCE_ROOT; };
-		4BEE0B2D08ACBB9F00D22B43 /* JackPosixSemaphore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPosixSemaphore.h; path = ../common/JackPosixSemaphore.h; sourceTree = SOURCE_ROOT; };
 		4BF3937C0626BF3600CC67FA /* JackMacLibClientRPC.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMacLibClientRPC.cpp; sourceTree = SOURCE_ROOT; };
 		4BF4BAB00E3480AB00403CDF /* JackAudioAdapterFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioAdapterFactory.cpp; path = ../common/JackAudioAdapterFactory.cpp; sourceTree = SOURCE_ROOT; };
 		4BF520520CB8D0E80037470E /* timestamps.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = timestamps.c; path = ../common/timestamps.c; sourceTree = SOURCE_ROOT; };
@@ -1410,8 +1357,6 @@
 		4BF8D1880834EE7900C94B91 /* JackShmMem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackShmMem.cpp; path = ../common/JackShmMem.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8D18F0834EE8400C94B91 /* shm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = shm.h; path = ../common/shm.h; sourceTree = SOURCE_ROOT; };
 		4BF8D1900834EE8400C94B91 /* shm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = shm.c; path = ../common/shm.c; sourceTree = SOURCE_ROOT; };
-		4BF8D1970834EE9700C94B91 /* JackPosixThread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPosixThread.h; path = ../common/JackPosixThread.h; sourceTree = SOURCE_ROOT; };
-		4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPosixThread.cpp; path = ../common/JackPosixThread.cpp; sourceTree = SOURCE_ROOT; };
 		4BF8D19F0834EE9E00C94B91 /* JackThread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackThread.h; path = ../common/JackThread.h; sourceTree = SOURCE_ROOT; };
 		4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackActivationCount.h; path = ../common/JackActivationCount.h; sourceTree = SOURCE_ROOT; };
 		4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackActivationCount.cpp; path = ../common/JackActivationCount.cpp; sourceTree = SOURCE_ROOT; };
@@ -1478,9 +1423,6 @@
 		4BFB741E08AD2B9900DB99B8 /* JackMachThread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JackMachThread.cpp; sourceTree = SOURCE_ROOT; };
 		4BFB741F08AD2B9900DB99B8 /* JackMachThread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JackMachThread.h; sourceTree = SOURCE_ROOT; };
 		BA047C710E14E7540041F3B6 /* JackNetSocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackNetSocket.h; path = ../common/JackNetSocket.h; sourceTree = SOURCE_ROOT; };
-		BA047C720E14E7540041F3B6 /* JackNetUnixSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackNetUnixSocket.cpp; path = ../common/JackNetUnixSocket.cpp; sourceTree = SOURCE_ROOT; };
-		BA047C730E14E7540041F3B6 /* JackNetUnixSocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackNetUnixSocket.h; path = ../common/JackNetUnixSocket.h; sourceTree = SOURCE_ROOT; };
-		BA047C740E14E7540041F3B6 /* JackPlatformNetSocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPlatformNetSocket.h; path = ../common/JackPlatformNetSocket.h; sourceTree = SOURCE_ROOT; };
 		BA15108E0E1D19B9004A8C63 /* JackPortAudioDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortAudioDevices.cpp; path = ../windows/JackPortAudioDevices.cpp; sourceTree = SOURCE_ROOT; };
 		BA15108F0E1D19B9004A8C63 /* JackPortAudioDevices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortAudioDevices.h; path = ../windows/JackPortAudioDevices.h; sourceTree = SOURCE_ROOT; };
 		BA222ACF0DC88132001A17F4 /* jack_net.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = jack_net.so; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2183,7 +2125,6 @@
 			isa = PBXGroup;
 			children = (
 				4B05A04C0DF72BC000840F4C /* alsa */,
-				4B05A0660DF72BC000840F4C /* dbus */,
 				4B05A07D0DF72BC000840F4C /* driver.h */,
 				4B05A07E0DF72BC000840F4C /* firewire */,
 				4B05A0820DF72BC000840F4C /* freebob */,
@@ -2224,33 +2165,6 @@
 			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 */,
-				4B05A0740DF72BC000840F4C /* sigsegv.c */,
-				4B05A0750DF72BC000840F4C /* sigsegv.h */,
-				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 = (
@@ -2334,11 +2248,8 @@
 				4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */,
 				4B19B3090E2362E700DD4A82 /* JackAudioAdapterInterface.h */,
 				4B19B30C0E2362E700DD4A82 /* JackException.h */,
-				4B19B30D0E2362E700DD4A82 /* JackExports.h */,
 				4B19B30E0E2362E700DD4A82 /* JackLibSampleRateResampler.cpp */,
 				4B19B30F0E2362E700DD4A82 /* JackLibSampleRateResampler.h */,
-				4B19B3100E2362E700DD4A82 /* JackPlatformChannelTransaction.h */,
-				4B19B3110E2362E700DD4A82 /* JackProcessSync.h */,
 				4B19B3120E2362E700DD4A82 /* JackResampler.cpp */,
 				4B19B3020E2362BB00DD4A82 /* JackCoreAudioAdapter.cpp */,
 				4B19B3030E2362BB00DD4A82 /* JackCoreAudioAdapter.h */,
@@ -2433,10 +2344,9 @@
 		4BA33DF905EDFD8C000CCD5F /* Thread */ = {
 			isa = PBXGroup;
 			children = (
+				4BC3B6A20E703B2E0066E42F /* JackPosixThread.cpp */,
+				4BC3B6A30E703B2E0066E42F /* JackPosixThread.h */,
 				4BF8D19F0834EE9E00C94B91 /* JackThread.h */,
-				4BC8349A0DF4632F00DD1C93 /* JackPlatformThread.h */,
-				4BF8D1970834EE9700C94B91 /* JackPosixThread.h */,
-				4BF8D1980834EE9700C94B91 /* JackPosixThread.cpp */,
 				4BFB741F08AD2B9900DB99B8 /* JackMachThread.h */,
 				4BFB741E08AD2B9900DB99B8 /* JackMachThread.cpp */,
 			);
@@ -2459,18 +2369,14 @@
 		4BA3874007947A46008D8992 /* Synchro */ = {
 			isa = PBXGroup;
 			children = (
+				4BC3B6B70E703BAA0066E42F /* JackPosixSemaphore.cpp */,
+				4BC3B6B80E703BAA0066E42F /* JackPosixSemaphore.h */,
+				4BC3B6AA0E703B690066E42F /* JackProcessSync.cpp */,
 				4BD561C708EEB910006BBC2A /* JackSynchro.h */,
-				4BC834960DF4632F00DD1C93 /* JackPlatformProcessSync.h */,
-				4BC834990DF4632F00DD1C93 /* JackPlatformSynchro.h */,
-				4B02069D0DC0BAB400319AF1 /* JackProcessSync.cpp */,
 				4BF8D1A70834EEB400C94B91 /* JackActivationCount.h */,
 				4BF8D1A80834EEB400C94B91 /* JackActivationCount.cpp */,
-				4B56881008B5C8620022B32D /* JackFifo.h */,
-				4B56880F08B5C8620022B32D /* JackFifo.cpp */,
 				4BF6C1D608ACE64C001E2013 /* JackMachSemaphore.h */,
 				4BF6C1D508ACE64C001E2013 /* JackMachSemaphore.cpp */,
-				4BEE0B2D08ACBB9F00D22B43 /* JackPosixSemaphore.h */,
-				4BEE0B2C08ACBB9F00D22B43 /* JackPosixSemaphore.cpp */,
 				4BC8326D0DF42C7D00DD1C93 /* JackMutex.h */,
 			);
 			name = Synchro;
@@ -2551,11 +2457,7 @@
 			children = (
 				4BF8D1AF0834EEC400C94B91 /* JackChannel.h */,
 				4BB371D40C1AD85A0050C1E4 /* JackNotification.h */,
-				4BC834970DF4632F00DD1C93 /* JackPlatformServerChannel.h */,
-				4BC834980DF4632F00DD1C93 /* JackPlatformServerNotifyChannel.h */,
 				4BF8D1B30834EED500C94B91 /* JackInternalClientChannel.h */,
-				4BC834940DF4632F00DD1C93 /* JackPlatformClientChannel.h */,
-				4BC834950DF4632F00DD1C93 /* JackPlatformNotifyChannel.h */,
 				4BFB299908AF452300D450D4 /* Socket */,
 				4BFB299808AF451200D450D4 /* Mach */,
 			);
@@ -2653,17 +2555,17 @@
 		4BFB299908AF452300D450D4 /* Socket */ = {
 			isa = PBXGroup;
 			children = (
+				4BC3B6AD0E703B8D0066E42F /* JackSocket.cpp */,
+				4BC3B6AE0E703B8D0066E42F /* JackSocket.h */,
+				4BC3B6AF0E703B8D0066E42F /* JackSocketClientChannel.cpp */,
+				4BC3B6B00E703B8D0066E42F /* JackSocketClientChannel.h */,
+				4BC3B6B10E703B8D0066E42F /* JackSocketNotifyChannel.cpp */,
+				4BC3B6B20E703B8D0066E42F /* JackSocketNotifyChannel.h */,
+				4BC3B6B30E703B8D0066E42F /* JackSocketServerChannel.cpp */,
+				4BC3B6B40E703B8D0066E42F /* JackSocketServerChannel.h */,
+				4BC3B6B50E703B8D0066E42F /* JackSocketServerNotifyChannel.cpp */,
+				4BC3B6B60E703B8D0066E42F /* JackSocketServerNotifyChannel.h */,
 				4B9B815C08AFA45000D05A28 /* JackRequest.h */,
-				4B97440D08AF54590094983C /* JackSocket.h */,
-				4B97440C08AF54590094983C /* JackSocket.cpp */,
-				4B97441408AF546F0094983C /* JackSocketClientChannel.h */,
-				4B97441508AF546F0094983C /* JackSocketClientChannel.cpp */,
-				4B97441B08AF54930094983C /* JackSocketServerChannel.h */,
-				4B97452B08AF6D4B0094983C /* JackSocketServerChannel.cpp */,
-				4B9745CB08AF771B0094983C /* JackSocketServerNotifyChannel.h */,
-				4B9745D908AF78200094983C /* JackSocketServerNotifyChannel.cpp */,
-				4B97441A08AF54930094983C /* JackSocketNotifyChannel.h */,
-				4B97458708AF74FF0094983C /* JackSocketNotifyChannel.cpp */,
 			);
 			name = Socket;
 			sourceTree = "<group>";
@@ -2671,6 +2573,8 @@
 		BA222AEA0DC88379001A17F4 /* Net */ = {
 			isa = PBXGroup;
 			children = (
+				4BC3B6B90E703BCC0066E42F /* JackNetUnixSocket.cpp */,
+				4BC3B6BA0E703BCC0066E42F /* JackNetUnixSocket.h */,
 				4B5E08DF0E5B676C00BEE4E0 /* JackNetAdapter.cpp */,
 				4B5E08E00E5B676C00BEE4E0 /* JackNetAdapter.h */,
 				4B76C7680E5AB2DB00E2AC21 /* JackNetInterface.cpp */,
@@ -2678,9 +2582,6 @@
 				BA222ADD0DC882A5001A17F4 /* JackNetDriver.h */,
 				BA222ADC0DC882A5001A17F4 /* JackNetDriver.cpp */,
 				BA047C710E14E7540041F3B6 /* JackNetSocket.h */,
-				BA047C720E14E7540041F3B6 /* JackNetUnixSocket.cpp */,
-				BA047C730E14E7540041F3B6 /* JackNetUnixSocket.h */,
-				BA047C740E14E7540041F3B6 /* JackPlatformNetSocket.h */,
 				BA222AEB0DC883B3001A17F4 /* JackNetManager.cpp */,
 				BA222AEC0DC883B3001A17F4 /* JackNetManager.h */,
 				BA222AD60DC88268001A17F4 /* JackNetTool.cpp */,
@@ -2722,10 +2623,7 @@
 				4B19B3140E2362E800DD4A82 /* JackAudioAdapter.h in Headers */,
 				4B19B3160E2362E800DD4A82 /* JackAudioAdapterInterface.h in Headers */,
 				4B19B3190E2362E800DD4A82 /* JackException.h in Headers */,
-				4B19B31A0E2362E800DD4A82 /* JackExports.h in Headers */,
 				4B19B31C0E2362E800DD4A82 /* JackLibSampleRateResampler.h in Headers */,
-				4B19B31D0E2362E800DD4A82 /* JackPlatformChannelTransaction.h in Headers */,
-				4B19B31E0E2362E800DD4A82 /* JackProcessSync.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2746,7 +2644,6 @@
 				4B35C42B0D4731D1000DE7AE /* JackTime.h in Headers */,
 				4B35C42C0D4731D1000DE7AE /* JackShmMem.h in Headers */,
 				4B35C42D0D4731D1000DE7AE /* shm.h in Headers */,
-				4B35C42E0D4731D1000DE7AE /* JackPosixThread.h in Headers */,
 				4B35C42F0D4731D1000DE7AE /* JackThread.h in Headers */,
 				4B35C4300D4731D1000DE7AE /* JackActivationCount.h in Headers */,
 				4B35C4310D4731D1000DE7AE /* JackChannel.h in Headers */,
@@ -2794,7 +2691,6 @@
 				4B35C4890D4731D1000DE7AE /* JackTime.h in Headers */,
 				4B35C48A0D4731D1000DE7AE /* JackShmMem.h in Headers */,
 				4B35C48B0D4731D1000DE7AE /* shm.h in Headers */,
-				4B35C48C0D4731D1000DE7AE /* JackPosixThread.h in Headers */,
 				4B35C48D0D4731D1000DE7AE /* JackThread.h in Headers */,
 				4B35C48E0D4731D1000DE7AE /* JackActivationCount.h in Headers */,
 				4B35C48F0D4731D1000DE7AE /* JackChannel.h in Headers */,
@@ -3084,14 +2980,11 @@
 			files = (
 				4B5E08C30E5B66EE00BEE4E0 /* JackAudioAdapterInterface.h in Headers */,
 				4B5E08C40E5B66EE00BEE4E0 /* JackException.h in Headers */,
-				4B5E08C50E5B66EE00BEE4E0 /* JackExports.h in Headers */,
 				4B5E08C60E5B66EE00BEE4E0 /* JackLibSampleRateResampler.h in Headers */,
-				4B5E08C70E5B66EE00BEE4E0 /* JackPlatformChannelTransaction.h in Headers */,
-				4B5E08C80E5B66EE00BEE4E0 /* JackProcessSync.h in Headers */,
 				4B5E08E20E5B676D00BEE4E0 /* JackNetAdapter.h in Headers */,
 				4B5E08EC0E5B67EB00BEE4E0 /* JackNetInterface.h in Headers */,
 				4B5E08EF0E5B680200BEE4E0 /* JackAudioAdapter.h in Headers */,
-				4B5E08F50E5B681500BEE4E0 /* JackNetUnixSocket.h in Headers */,
+				4BC3B6C00E703BCC0066E42F /* JackNetUnixSocket.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3111,7 +3004,6 @@
 				4B699C04097D421600A18468 /* JackTime.h in Headers */,
 				4B699C05097D421600A18468 /* JackShmMem.h in Headers */,
 				4B699C06097D421600A18468 /* shm.h in Headers */,
-				4B699C07097D421600A18468 /* JackPosixThread.h in Headers */,
 				4B699C08097D421600A18468 /* JackThread.h in Headers */,
 				4B699C09097D421600A18468 /* JackActivationCount.h in Headers */,
 				4B699C0A097D421600A18468 /* JackChannel.h in Headers */,
@@ -3147,6 +3039,7 @@
 				4B9A26010DBF8584006E9FBC /* jslist.h in Headers */,
 				4B4F9C8F0DC20C0400706CB0 /* JackMessageBuffer.h in Headers */,
 				4BB9D4B30E2610B300351653 /* JackTransportEngine.h in Headers */,
+				4BC3B6A50E703B2E0066E42F /* JackPosixThread.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3159,7 +3052,6 @@
 				4B699C50097D421600A18468 /* JackTime.h in Headers */,
 				4B699C51097D421600A18468 /* JackShmMem.h in Headers */,
 				4B699C52097D421600A18468 /* shm.h in Headers */,
-				4B699C53097D421600A18468 /* JackPosixThread.h in Headers */,
 				4B699C54097D421600A18468 /* JackThread.h in Headers */,
 				4B699C55097D421600A18468 /* JackActivationCount.h in Headers */,
 				4B699C56097D421600A18468 /* JackChannel.h in Headers */,
@@ -3206,8 +3098,6 @@
 				4BE4CC040CDA153500CCF5BB /* JackTools.h in Headers */,
 				BA222AD90DC88269001A17F4 /* JackNetTool.h in Headers */,
 				BA047C760E14E79D0041F3B6 /* JackNetSocket.h in Headers */,
-				BA047C770E14E79D0041F3B6 /* JackNetUnixSocket.h in Headers */,
-				BA047C780E14E79D0041F3B6 /* JackPlatformNetSocket.h in Headers */,
 				4B95BCAE0D913073000F7695 /* control.h in Headers */,
 				4B9A26020DBF8584006E9FBC /* jslist.h in Headers */,
 				4B4F9C8D0DC20C0400706CB0 /* JackMessageBuffer.h in Headers */,
@@ -3216,6 +3106,7 @@
 				4B4CA9750E02CF9600F4BFDA /* JackRestartThreadedDriver.h in Headers */,
 				4B8F3D4C0E06C4A10096D19C /* JackEngineTiming.h in Headers */,
 				4B4E9AFB0E5F1090000A3278 /* JackControlAPI.h in Headers */,
+				4BC3B6A70E703B2E0066E42F /* JackPosixThread.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3432,6 +3323,7 @@
 			files = (
 				BA222ADF0DC882A5001A17F4 /* JackNetDriver.h in Headers */,
 				4B76C76B0E5AB2DB00E2AC21 /* JackNetInterface.h in Headers */,
+				4BC3B6BC0E703BCC0066E42F /* JackNetUnixSocket.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3441,6 +3333,7 @@
 			files = (
 				BA222AEE0DC883B3001A17F4 /* JackNetManager.h in Headers */,
 				4B76C76D0E5AB2DB00E2AC21 /* JackNetInterface.h in Headers */,
+				4BC3B6BE0E703BCC0066E42F /* JackNetUnixSocket.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5411,7 +5304,6 @@
 				4B35C45A0D4731D1000DE7AE /* JackMachPort.cpp in Sources */,
 				4B35C45B0D4731D1000DE7AE /* JackShmMem.cpp in Sources */,
 				4B35C45C0D4731D1000DE7AE /* shm.c in Sources */,
-				4B35C45D0D4731D1000DE7AE /* JackPosixThread.cpp in Sources */,
 				4B35C45E0D4731D1000DE7AE /* JackActivationCount.cpp in Sources */,
 				4B35C45F0D4731D1000DE7AE /* JackGraphManager.cpp in Sources */,
 				4B35C4600D4731D1000DE7AE /* JackPort.cpp in Sources */,
@@ -5438,7 +5330,6 @@
 				4B35C47B0D4731D1000DE7AE /* JackEngineControl.cpp in Sources */,
 				4B35C47C0D4731D1000DE7AE /* JackTools.cpp in Sources */,
 				4B9A26610DBF8ADD006E9FBC /* JackError.cpp in Sources */,
-				4B0206A00DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */,
 				4B4F9C900DC20C0400706CB0 /* JackMessageBuffer.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5450,7 +5341,6 @@
 				4B35C4C40D4731D1000DE7AE /* JackMachPort.cpp in Sources */,
 				4B35C4C50D4731D1000DE7AE /* JackShmMem.cpp in Sources */,
 				4B35C4C60D4731D1000DE7AE /* shm.c in Sources */,
-				4B35C4C70D4731D1000DE7AE /* JackPosixThread.cpp in Sources */,
 				4B35C4C80D4731D1000DE7AE /* JackActivationCount.cpp in Sources */,
 				4B35C4C90D4731D1000DE7AE /* JackGraphManager.cpp in Sources */,
 				4B35C4CA0D4731D1000DE7AE /* JackPort.cpp in Sources */,
@@ -5491,7 +5381,6 @@
 				4B35C4F50D4731D1000DE7AE /* JackTools.cpp in Sources */,
 				BA222ADA0DC88269001A17F4 /* JackNetTool.cpp in Sources */,
 				4B9A26640DBF8B14006E9FBC /* JackError.cpp in Sources */,
-				4B0206A10DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */,
 				4B4F9C920DC20C0400706CB0 /* JackMessageBuffer.cpp in Sources */,
 				4B4CA9780E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp in Sources */,
 				4B4E9AFC0E5F1090000A3278 /* JackControlAPI.cpp in Sources */,
@@ -5583,8 +5472,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B35C58D0D4731D2000DE7AE /* testSem.cpp in Sources */,
-				4BA7BE1C0DC2348600AA3457 /* JackFifo.cpp in Sources */,
-				4BA7BE1D0DC2348800AA3457 /* JackPosixSemaphore.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5633,10 +5520,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B35C5DD0D4731D2000DE7AE /* JackMachSemaphore.cpp in Sources */,
-				4B35C5DE0D4731D2000DE7AE /* JackFifo.cpp in Sources */,
-				4B35C5DF0D4731D2000DE7AE /* JackPosixSemaphore.cpp in Sources */,
 				4B35C5E00D4731D2000DE7AE /* JackMachThread.cpp in Sources */,
-				4B35C5E10D4731D2000DE7AE /* JackPosixThread.cpp in Sources */,
 				4B35C5E20D4731D2000DE7AE /* testSynchroServer.cpp in Sources */,
 				4B9A26790DBF8B88006E9FBC /* JackError.cpp in Sources */,
 				4B4F9D820DC2178E00706CB0 /* JackMessageBuffer.cpp in Sources */,
@@ -5774,7 +5658,7 @@
 				4B5E08E10E5B676C00BEE4E0 /* JackNetAdapter.cpp in Sources */,
 				4B5E08EB0E5B67EA00BEE4E0 /* JackNetInterface.cpp in Sources */,
 				4B5E08EE0E5B680200BEE4E0 /* JackAudioAdapter.cpp in Sources */,
-				4B5E08F40E5B681500BEE4E0 /* JackNetUnixSocket.cpp in Sources */,
+				4BC3B6BF0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5795,7 +5679,6 @@
 				4B699C27097D421600A18468 /* JackMachPort.cpp in Sources */,
 				4B699C28097D421600A18468 /* JackShmMem.cpp in Sources */,
 				4B699C29097D421600A18468 /* shm.c in Sources */,
-				4B699C2A097D421600A18468 /* JackPosixThread.cpp in Sources */,
 				4B699C2B097D421600A18468 /* JackActivationCount.cpp in Sources */,
 				4B699C2C097D421600A18468 /* JackGraphManager.cpp in Sources */,
 				4B699C2D097D421600A18468 /* JackPort.cpp in Sources */,
@@ -5820,10 +5703,11 @@
 				4B80D7EA0BA0D17400F035BB /* JackMidiAPI.cpp in Sources */,
 				4BE4CC010CDA153400CCF5BB /* JackTools.cpp in Sources */,
 				4B9A25B50DBF8330006E9FBC /* JackError.cpp in Sources */,
-				4B02069F0DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */,
 				4B4F9C8E0DC20C0400706CB0 /* JackMessageBuffer.cpp in Sources */,
 				4BB9D4B40E2610B400351653 /* JackTransportEngine.cpp in Sources */,
 				4BB9D4E40E26112900351653 /* JackEngineControl.cpp in Sources */,
+				4BC3B6A40E703B2E0066E42F /* JackPosixThread.cpp in Sources */,
+				4BC3B6AB0E703B690066E42F /* JackProcessSync.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5834,7 +5718,6 @@
 				4B699C7E097D421600A18468 /* JackMachPort.cpp in Sources */,
 				4B699C7F097D421600A18468 /* JackShmMem.cpp in Sources */,
 				4B699C80097D421600A18468 /* shm.c in Sources */,
-				4B699C81097D421600A18468 /* JackPosixThread.cpp in Sources */,
 				4B699C82097D421600A18468 /* JackActivationCount.cpp in Sources */,
 				4B699C83097D421600A18468 /* JackGraphManager.cpp in Sources */,
 				4B699C84097D421600A18468 /* JackPort.cpp in Sources */,
@@ -5874,14 +5757,14 @@
 				4B5DB9830CD2429A00EBA5EE /* JackDebugClient.cpp in Sources */,
 				4BE4CC030CDA153500CCF5BB /* JackTools.cpp in Sources */,
 				BA222AD80DC88268001A17F4 /* JackNetTool.cpp in Sources */,
-				BA047C750E14E7830041F3B6 /* JackNetUnixSocket.cpp in Sources */,
 				4B9A25B60DBF8330006E9FBC /* JackError.cpp in Sources */,
-				4B02069E0DC0BAB400319AF1 /* JackProcessSync.cpp in Sources */,
 				4B4F9C8C0DC20C0400706CB0 /* JackMessageBuffer.cpp in Sources */,
 				4BBC93BA0DF9736C002DF220 /* JackWaitThreadedDriver.cpp in Sources */,
 				4B4CA9760E02CF9600F4BFDA /* JackRestartThreadedDriver.cpp in Sources */,
 				4B8F3D4B0E06C4A10096D19C /* JackEngineTiming.cpp in Sources */,
 				4B4E9AFA0E5F1090000A3278 /* JackControlAPI.cpp in Sources */,
+				4BC3B6A60E703B2E0066E42F /* JackPosixThread.cpp in Sources */,
+				4BC3B6AC0E703B690066E42F /* JackProcessSync.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5946,8 +5829,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B699D2C097D421600A18468 /* testSem.cpp in Sources */,
-				4BA7BDDA0DC2300800AA3457 /* JackFifo.cpp in Sources */,
-				4BA7BDDB0DC2300A00AA3457 /* JackPosixSemaphore.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6126,6 +6007,7 @@
 			files = (
 				BA222ADE0DC882A5001A17F4 /* JackNetDriver.cpp in Sources */,
 				4B76C76A0E5AB2DB00E2AC21 /* JackNetInterface.cpp in Sources */,
+				4BC3B6BB0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6135,6 +6017,7 @@
 			files = (
 				BA222AED0DC883B3001A17F4 /* JackNetManager.cpp in Sources */,
 				4B76C76C0E5AB2DB00E2AC21 /* JackNetInterface.cpp in Sources */,
+				4BC3B6BD0E703BCC0066E42F /* JackNetUnixSocket.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6371,11 +6254,6 @@
 			target = 4B699D03097D421600A18468 /* jack_external_metro Universal */;
 			targetProxy = 4B699DBF097D421700A18468 /* PBXContainerItemProxy */;
 		};
-		4B978E800A31D8B7009E2DD1 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 4B978DB10A31CF4A009E2DD1 /* jack_portaudio Universal */;
-			targetProxy = 4B978E7F0A31D8B7009E2DD1 /* PBXContainerItemProxy */;
-		};
 		4BA693E90CBE5BBA00EAD520 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 4BA692A60CBE4BC700EAD520 /* jack_load Universal */;
@@ -6698,10 +6576,7 @@
 		4B19B2FD0E23620F00DD4A82 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					i386,
-					ppc,
-				);
+				ARCHS = i386;
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -6713,7 +6588,11 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					../posix,
+					../common/jack,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -6756,7 +6635,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					../posix,
+					../common/jack,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -10828,7 +10711,12 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -10871,7 +10759,12 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common,
+					../common/jack,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -11023,6 +10916,9 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				HEADER_SEARCH_PATHS = (
+					.,
+					../common/jack,
+					../posix,
 					../common,
 					RPC,
 				);
@@ -11076,6 +10972,9 @@
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				HEADER_SEARCH_PATHS = (
+					.,
+					../common/jack,
+					../posix,
 					../common,
 					RPC,
 				);
@@ -11187,6 +11086,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
 				HEADER_SEARCH_PATHS = (
+					../posix,
 					RPC,
 					../common/jack,
 				);
@@ -11246,6 +11146,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
 				HEADER_SEARCH_PATHS = (
+					../posix,
 					RPC,
 					../common/jack,
 				);
@@ -11356,6 +11257,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
 				HEADER_SEARCH_PATHS = (
+					../posix,
 					RPC,
 					../common/jack,
 				);
@@ -11413,6 +11315,7 @@
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				GENERATE_PKGINFO_FILE = NO;
 				HEADER_SEARCH_PATHS = (
+					../posix,
 					RPC,
 					../common/jack,
 				);
@@ -12082,7 +11985,13 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = RPC;
+				HEADER_SEARCH_PATHS = (
+					../common,
+					.,
+					../common/jack,
+					../posix,
+					RPC,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -12121,7 +12030,13 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
-				HEADER_SEARCH_PATHS = RPC;
+				HEADER_SEARCH_PATHS = (
+					../common,
+					.,
+					../common/jack,
+					../posix,
+					RPC,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -12197,6 +12112,12 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../common,
+					../common/jack,
+					../posix,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -12231,6 +12152,12 @@
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../common,
+					../common/jack,
+					../posix,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -12392,7 +12319,12 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -12431,7 +12363,12 @@
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -12512,7 +12449,12 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -12551,7 +12493,12 @@
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -12632,7 +12579,12 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
@@ -12671,7 +12623,12 @@
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
@@ -12754,7 +12711,11 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					../common/jack,
+					../posix,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -12800,7 +12761,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					../common/jack,
+					../posix,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -12893,6 +12858,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					../common/jack,
+					.,
+					../posix,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -12936,6 +12906,11 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
+				HEADER_SEARCH_PATHS = (
+					../common/jack,
+					.,
+					../posix,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -13778,6 +13753,11 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					../posix,
+					../common/jack,
+					../common,
+				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -13812,7 +13792,11 @@
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Development\"";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					../posix,
+					../common/jack,
+					../common,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
@@ -14595,6 +14579,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../common/jack,
+					../posix,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -14638,6 +14627,11 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../common/jack,
+					../posix,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -14728,7 +14722,12 @@
 				GCC_MODEL_TUNING = G4;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
@@ -14773,7 +14772,12 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G4;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
-				HEADER_SEARCH_PATHS = ../common;
+				HEADER_SEARCH_PATHS = (
+					.,
+					../posix,
+					../common/jack,
+					../common,
+				);
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
diff --git a/macosx/wscript b/macosx/wscript
index 7739b6df..2787933c 100644
--- a/macosx/wscript
+++ b/macosx/wscript
@@ -6,7 +6,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
     driver.features.append('cc')
     driver.env['shlib_PATTERN'] = 'jack_%s.so'
     driver.defines = 'HAVE_CONFIG_H'
-    driver.includes = ['.', '../common', '../common/jack']
+    driver.includes = ['.', '../macosx', '../posix', '../common', '../common/jack']
     driver.target = target
     driver.source = sources
     driver.inst_var = bld.env()['ADDON_DIR']
@@ -21,7 +21,7 @@ def create_jack_audio_driver_obj(bld, target, sources, uselib = None):
     driver.features.append('cc')
     driver.env['shlib_PATTERN'] = 'jack_%s.so'
     driver.defines = 'HAVE_CONFIG_H'
-    driver.includes = ['.', '../common', '../common/jack']
+    driver.includes = ['.', '../macosx', '../posix', '../common', '../common/jack']
     driver.target = target
     driver.source = sources
     driver.inst_var = bld.env()['ADDON_DIR']
@@ -34,7 +34,7 @@ def create_jack_audio_driver_obj(bld, target, sources, uselib = None):
 
 def build(bld):
     jackd = bld.create_obj('cpp', 'program')
-    jackd.includes = ['.', '../common/jack', '../common']
+    jackd.includes = ['.', '../macosx', '../posix', '../common', '../common/jack']
     jackd.defines = 'HAVE_CONFIG_H'
     jackd.source = ['../common/Jackdmp.cpp']
     jackd.uselib = 'PTHREAD DL'
diff --git a/common/JackPlatformNetSocket.h b/posix/JackCompilerDeps_os.h
index c17a5f0f..0a478ca2 100644
--- a/common/JackPlatformNetSocket.h
+++ b/posix/JackCompilerDeps_os.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2008 Romain Moret at Grame
+Copyright (C) 2004-2005 Grame
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,34 +17,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackPlatformNetSocket__
-#define __JackPlatformNetSocket__
+#ifndef __JackCompilerDeps_POSIX__
+#define __JackCompilerDeps_POSIX__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#if __GNUC__
+	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
+	#define	EXPORT __attribute__((visibility("default")))
+#else 
+	#define MEM_ALIGN(x,y) x
+	#define	EXPORT
 #endif
-
-// OSX and LINUX
-#if defined(__APPLE__) || defined (__linux__)
-#include "JackNetUnixSocket.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackNetWinSocket.h"
+	
 #endif
 
-namespace Jack
-{
-
-#if defined(__APPLE__) || defined(__linux__)
-    typedef JackNetUnixSocket JackNetSocket;
-#endif
-
-#ifdef WIN32
-    typedef JackNetWinSocket JackNetSocket;
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformNetSocket__ */
diff --git a/common/JackFifo.cpp b/posix/JackFifo.cpp
index 9b11527a..9b11527a 100644
--- a/common/JackFifo.cpp
+++ b/posix/JackFifo.cpp
diff --git a/common/JackFifo.h b/posix/JackFifo.h
index b0534ea0..a20bf411 100644
--- a/common/JackFifo.h
+++ b/posix/JackFifo.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFifo__
 
 #include "JackSynchro.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <assert.h>
 #include <poll.h>
 
diff --git a/posix/JackMutex_os.h b/posix/JackMutex_os.h
new file mode 100644
index 00000000..45b20639
--- /dev/null
+++ b/posix/JackMutex_os.h
@@ -0,0 +1,89 @@
+/*
+ Copyright (C) 2006 Grame
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ Grame Research Laboratory, 9 rue du Garet, 69001 Lyon - France
+ grame@grame.fr
+*/
+
+#ifndef __JackMutex_POSIX__
+#define __JackMutex_POSIX__
+
+#include <pthread.h>
+
+#include <assert.h>
+#include "JackError.h"
+
+namespace Jack
+{
+
+/*!
+\brief Mutex abstraction.
+*/
+
+class JackMutex
+{
+
+    private:
+
+        pthread_mutex_t fMutex;
+
+    public:
+
+        JackMutex()
+        {
+            // Use recursive mutex
+            pthread_mutexattr_t mutex_attr;
+            int res;
+            res = pthread_mutexattr_init(&mutex_attr);
+            assert(res == 0);
+            res = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+            assert(res == 0);
+            res = pthread_mutex_init(&fMutex, &mutex_attr);
+            assert(res == 0);
+            res = pthread_mutexattr_destroy(&mutex_attr);
+            assert(res == 0);
+        }
+        ~JackMutex()
+        {
+            pthread_mutex_destroy(&fMutex);
+        }
+
+        void Lock()
+        {
+            int res = pthread_mutex_lock(&fMutex);
+            if (res != 0)
+                jack_error("JackMutex::Lock res = %d", res);
+        }
+
+        bool Trylock()
+        {
+            return (pthread_mutex_trylock(&fMutex) == 0);
+        }
+
+        void Unlock()
+        {
+            int res = pthread_mutex_unlock(&fMutex);
+            if (res != 0)
+                jack_error("JackMutex::Unlock res = %d", res);
+        }
+
+};
+
+
+} // namespace
+
+#endif
diff --git a/common/JackNetUnixSocket.cpp b/posix/JackNetUnixSocket.cpp
index 301e4bc5..301e4bc5 100644
--- a/common/JackNetUnixSocket.cpp
+++ b/posix/JackNetUnixSocket.cpp
diff --git a/common/JackNetUnixSocket.h b/posix/JackNetUnixSocket.h
index 00988897..00988897 100644
--- a/common/JackNetUnixSocket.h
+++ b/posix/JackNetUnixSocket.h
diff --git a/common/JackPosixSemaphore.cpp b/posix/JackPosixSemaphore.cpp
index b836217c..b836217c 100644
--- a/common/JackPosixSemaphore.cpp
+++ b/posix/JackPosixSemaphore.cpp
diff --git a/common/JackPosixSemaphore.h b/posix/JackPosixSemaphore.h
index 0a20ed84..8b97691d 100644
--- a/common/JackPosixSemaphore.h
+++ b/posix/JackPosixSemaphore.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackPosixSemaphore__
 
 #include "JackSynchro.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <semaphore.h>
 #include <time.h>
 #include <assert.h>
diff --git a/common/JackPosixThread.cpp b/posix/JackPosixThread.cpp
index 0427b059..0427b059 100644
--- a/common/JackPosixThread.cpp
+++ b/posix/JackPosixThread.cpp
diff --git a/common/JackPosixThread.h b/posix/JackPosixThread.h
index bb7a39bc..6408112e 100644
--- a/common/JackPosixThread.h
+++ b/posix/JackPosixThread.h
@@ -35,7 +35,7 @@ namespace Jack
 \brief The POSIX thread base class.
 */
 
-class EXPORT JackPosixThread : public detail::JackThread
+class EXPORT JackPosixThread : public detail::JackThreadInterface
 {
 
     protected:
@@ -46,10 +46,10 @@ class EXPORT JackPosixThread : public detail::JackThread
     public:
 
         JackPosixThread(JackRunnableInterface* runnable, bool real_time, int priority, int cancellation)
-                : JackThread(runnable, priority, real_time, cancellation), fThread((pthread_t)NULL)
+                : JackThreadInterface(runnable, priority, real_time, cancellation), fThread((pthread_t)NULL)
         {}
         JackPosixThread(JackRunnableInterface* runnable, int cancellation = PTHREAD_CANCEL_ASYNCHRONOUS)
-                : JackThread(runnable, 0, false, cancellation), fThread((pthread_t)NULL)
+                : JackThreadInterface(runnable, 0, false, cancellation), fThread((pthread_t)NULL)
         {}
 
         int Start();
diff --git a/common/JackProcessSync.cpp b/posix/JackProcessSync.cpp
index 8a488310..8a488310 100644
--- a/common/JackProcessSync.cpp
+++ b/posix/JackProcessSync.cpp
diff --git a/common/JackProcessSync.h b/posix/JackProcessSync.h
index 82d3e65f..e689831b 100644
--- a/common/JackProcessSync.h
+++ b/posix/JackProcessSync.h
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackProcessSync__
 #define __JackProcessSync__
 
-#include "JackPlatformSynchro.h"
+#include "JackPlatformPlug.h"
 #include <pthread.h>
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/common/JackPlatformThread.h b/posix/JackShmMem_os.h
index 86f43b9a..651eee9c 100644
--- a/common/JackPlatformThread.h
+++ b/posix/JackShmMem_os.h
@@ -1,4 +1,5 @@
 /*
+Copyright (C) 2001 Paul Davis
 Copyright (C) 2004-2008 Grame
 
 This program is free software; you can redistribute it and/or modify
@@ -17,43 +18,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackPlatformThread__
-#define __JackPlatformThread__
+#ifndef __JackShmMem_POSIX__
+#define __JackShmMem_POSIX__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
+#include <sys/types.h>
+#include <sys/mman.h>
 
-// OSX
-#if defined(__APPLE__)
-#include "JackMachThread.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinThread.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackPosixThread.h"
-#endif
-
-namespace Jack
-{
+#define CHECK_MLOCK(ptr, size) (mlock((ptr), (size)) == 0)
+#define CHECK_MUNLOCK(ptr, size) (munlock((ptr), (size)) == 0)
+#define CHECK_MLOCKALL() (mlockall(MCL_CURRENT | MCL_FUTURE) == 0)
+#define CHECK_MUNLOCKALL() (munlockall() == 0)
 
-#ifdef WIN32
-typedef JackWinThread JackThread;
 #endif
-
-#ifdef __linux__
-typedef JackPosixThread JackThread;
-#endif
-
-#if defined(__APPLE__)
-typedef JackMachThread JackThread;
-#endif
-
-} // end of namespace
-
-#endif /* __JackPlatformThread__ */
diff --git a/common/JackSocket.cpp b/posix/JackSocket.cpp
index db700f08..db700f08 100644
--- a/common/JackSocket.cpp
+++ b/posix/JackSocket.cpp
diff --git a/common/JackSocket.h b/posix/JackSocket.h
index 04074b0b..04074b0b 100644
--- a/common/JackSocket.h
+++ b/posix/JackSocket.h
diff --git a/common/JackSocketClientChannel.cpp b/posix/JackSocketClientChannel.cpp
index b9c578b7..b9c578b7 100644
--- a/common/JackSocketClientChannel.cpp
+++ b/posix/JackSocketClientChannel.cpp
diff --git a/common/JackSocketClientChannel.h b/posix/JackSocketClientChannel.h
index e13619bc..f898975b 100644
--- a/common/JackSocketClientChannel.h
+++ b/posix/JackSocketClientChannel.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackChannel.h"
 #include "JackSocket.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackRequest.h"
 #include "JackError.h"
 
diff --git a/common/JackSocketNotifyChannel.cpp b/posix/JackSocketNotifyChannel.cpp
index 196c849f..196c849f 100644
--- a/common/JackSocketNotifyChannel.cpp
+++ b/posix/JackSocketNotifyChannel.cpp
diff --git a/common/JackSocketNotifyChannel.h b/posix/JackSocketNotifyChannel.h
index 9a40bbcb..9a40bbcb 100644
--- a/common/JackSocketNotifyChannel.h
+++ b/posix/JackSocketNotifyChannel.h
diff --git a/common/JackSocketServerChannel.cpp b/posix/JackSocketServerChannel.cpp
index ae415bc0..ae415bc0 100644
--- a/common/JackSocketServerChannel.cpp
+++ b/posix/JackSocketServerChannel.cpp
diff --git a/common/JackSocketServerChannel.h b/posix/JackSocketServerChannel.h
index b5025ada..d0c1ba64 100644
--- a/common/JackSocketServerChannel.h
+++ b/posix/JackSocketServerChannel.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackChannel.h"
 #include "JackSocket.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include <poll.h>
 #include <map>
 
diff --git a/common/JackSocketServerNotifyChannel.cpp b/posix/JackSocketServerNotifyChannel.cpp
index c5758967..c5758967 100644
--- a/common/JackSocketServerNotifyChannel.cpp
+++ b/posix/JackSocketServerNotifyChannel.cpp
diff --git a/common/JackSocketServerNotifyChannel.h b/posix/JackSocketServerNotifyChannel.h
index 4d8afa54..4d8afa54 100644
--- a/common/JackSocketServerNotifyChannel.h
+++ b/posix/JackSocketServerNotifyChannel.h
diff --git a/posix/JackSystemDeps_os.h b/posix/JackSystemDeps_os.h
new file mode 100644
index 00000000..5b46c09d
--- /dev/null
+++ b/posix/JackSystemDeps_os.h
@@ -0,0 +1,27 @@
+/*
+Copyright (C) 2004-2006 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __JackSystemDeps_POSIX__
+#define __JackSystemDeps_POSIX__
+
+#include <inttypes.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#endif
diff --git a/posix/JackTypes_os.h b/posix/JackTypes_os.h
new file mode 100644
index 00000000..84307c15
--- /dev/null
+++ b/posix/JackTypes_os.h
@@ -0,0 +1,29 @@
+/*
+  Copyright (C) 2001 Paul Davis
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackTypes_POSIX__
+#define __JackTypes_POSIX__
+
+#include <stdint.h>
+#include <pthread.h>
+
+typedef unsigned long long UInt64;
+typedef pthread_key_t jack_tls_key;
+
+#endif
diff --git a/tests/testSem.cpp b/tests/testSem.cpp
index f26a8473..a3e9c4c0 100644
--- a/tests/testSem.cpp
+++ b/tests/testSem.cpp
@@ -29,7 +29,7 @@
 #include "JackPosixSemaphore.h"
 #include "JackFifo.h"
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 #define ITER 500000
 
diff --git a/tests/testSynchroClient.cpp b/tests/testSynchroClient.cpp
index 6ffbe325..6da201c5 100644
--- a/tests/testSynchroClient.cpp
+++ b/tests/testSynchroClient.cpp
@@ -47,7 +47,7 @@
 	#include "JackFifo.h"
 #endif
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 #define ITER 1000
 
diff --git a/tests/testSynchroServer.cpp b/tests/testSynchroServer.cpp
index a43b882c..561988d3 100644
--- a/tests/testSynchroServer.cpp
+++ b/tests/testSynchroServer.cpp
@@ -47,7 +47,7 @@
 	#include "JackFifo.h"
 #endif
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 #define ITER 1000
 
diff --git a/tests/testSynchroServerClient.cpp b/tests/testSynchroServerClient.cpp
index 8372a555..1e1f4609 100644
--- a/tests/testSynchroServerClient.cpp
+++ b/tests/testSynchroServerClient.cpp
@@ -47,15 +47,13 @@
 	#include "JackFifo.h"
 #endif
 
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 
 #define ITER 100000
 
 #define SERVER "serveur1"
 #define CLIENT "client1"
 
-#include "JackPlatformSynchro.h"
-
 using namespace Jack;
 
 #ifdef WIN32
diff --git a/tests/wscript b/tests/wscript
index daf94ceb..fcccc3b1 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -14,7 +14,10 @@ def build(bld):
     for test_program, test_program_sources in test_programs.items():
         prog = bld.create_obj('cpp', 'program')
         prog.features.append('cc')
-        prog.includes = ['../macosx', '../common/jack', '../common']
+	if bld.env()['IS_MACOSX']:
+	    prog.includes = ['../macosx', '../posix', '../common/jack', '../common']
+	if bld.env()['IS_LINUX']:
+	    prog.includes = ['../linux', '../posix', '../common/jack', '../common']
         prog.source = test_program_sources
         if bld.env()['IS_LINUX']:
             prog.uselib = 'RT'
diff --git a/windows/JackAtomic_os.h b/windows/JackAtomic_os.h
new file mode 100644
index 00000000..38947437
--- /dev/null
+++ b/windows/JackAtomic_os.h
@@ -0,0 +1,80 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackAtomic_WIN32__
+#define __JackAtomic_WIN32__
+
+#include "JackTypes.h"
+
+#ifndef __MINGW32__
+#ifdef __SMP__
+#	define LOCK lock
+#else
+#	define LOCK
+#endif
+
+#ifndef inline
+	#define inline __inline
+#endif
+
+//----------------------------------------------------------------
+// CAS functions
+//----------------------------------------------------------------
+inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void * addr)
+{
+    register char c;
+    __asm {
+        push	ebx
+        push	esi
+        mov	esi, addr
+        mov	eax, value
+        mov	ebx, newvalue
+        LOCK cmpxchg dword ptr [esi], ebx
+        sete	c
+        pop	esi
+        pop	ebx
+    }
+    return c;
+}
+
+#else
+
+#ifdef __SMP__
+#	define LOCK "lock ; "
+#else
+#	define LOCK ""
+#endif
+
+static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
+{
+    register char ret;
+    __asm__ __volatile__ (
+        "# CAS \n\t"
+        LOCK "cmpxchg %2, (%1) \n\t"
+        "sete %0               \n\t"
+    : "=a" (ret)
+                : "c" (addr), "d" (newvalue), "a" (value)
+            );
+    return ret;
+}
+
+#endif
+
+#endif
+
diff --git a/windows/JackCompilerDeps_os.h b/windows/JackCompilerDeps_os.h
new file mode 100644
index 00000000..e639e899
--- /dev/null
+++ b/windows/JackCompilerDeps_os.h
@@ -0,0 +1,32 @@
+/*
+Copyright (C) 2004-2005 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __JackCompilerDeps_WIN32__
+#define __JackCompilerDeps_WIN32__
+
+#if __GNUC__
+	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
+	#define	EXPORT __attribute__ ((visibility("default")))
+#else 
+	//#define MEM_ALIGN(x,y) __declspec(align(y)) x
+	#define MEM_ALIGN(x,y) x
+	#define	EXPORT __declspec(dllexport)
+#endif
+
+#endif
diff --git a/windows/JackMutex_os.h b/windows/JackMutex_os.h
new file mode 100644
index 00000000..98000cfb
--- /dev/null
+++ b/windows/JackMutex_os.h
@@ -0,0 +1,75 @@
+/*
+ Copyright (C) 2006 Grame
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ Grame Research Laboratory, 9 rue du Garet, 69001 Lyon - France
+ grame@grame.fr
+*/
+
+#ifndef __JackMutex_WIN32__
+#define __JackMutex_WIN32__
+
+#include <windows.h>
+
+#include <assert.h>
+#include "JackError.h"
+
+namespace Jack
+{
+
+/*!
+\brief Mutex abstraction.
+*/
+
+class JackMutex
+{
+
+    private:
+
+        HANDLE fMutex;
+
+    public:
+
+        JackMutex()
+        {
+            // In recursive mode by default
+            fMutex = (HANDLE)CreateMutex(0, FALSE, 0);
+        }
+        ~JackMutex()
+        {
+            CloseHandle(fMutex);
+        }
+
+        void Lock()
+        {
+            DWORD dwWaitResult = WaitForSingleObject(fMutex, INFINITE);
+        }
+
+        bool Trylock()
+        {
+           return (WAIT_OBJECT_0 == WaitForSingleObject(fMutex, 0));
+        }
+
+        void Unlock()
+        {
+            ReleaseMutex(fMutex);
+        }
+
+};
+
+} // namespace
+
+#endif
diff --git a/windows/JackPlatformPlug_os.h b/windows/JackPlatformPlug_os.h
new file mode 100644
index 00000000..4a9effca
--- /dev/null
+++ b/windows/JackPlatformPlug_os.h
@@ -0,0 +1,75 @@
+/*
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software 
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackPlatformPlug_WIN32__
+#define __JackPlatformPlug_WIN32__
+
+namespace Jack
+{
+    struct JackRequest;
+	struct JackResult;
+    
+	class JackWinThread;
+	class JackWinSemaphore;
+	class JackWinProcessSync;
+	class JackWinNamedPipeServerChannel;
+	class JackWinNamedPipeClientChannel;
+	class JackWinNamedPipeServerNotifyChannel;
+	class JackWinNamedPipeNotifyChannel;
+	class JackWinNamedPipe;
+	class JackNetWinSocket;
+}
+
+/* __JackPlatformThread__ */
+#include "JackWinThread.h"
+namespace Jack { typedef JackWinThread JackThread; }
+
+/* __JackPlatformSynchro__  client activation */
+#include "JackWinSemaphore.h"
+namespace Jack { typedef JackWinSemaphore JackSynchro; }
+
+/* __JackPlatformChannelTransaction__ */
+#include "JackWinNamedPipe.h"
+namespace Jack { typedef JackWinNamedPipe JackChannelTransaction; }
+
+/* __JackPlatformProcessSync__ */
+#include "JackWinProcessSync.h"
+namespace Jack { typedef JackWinProcessSync JackProcessSync; }
+
+/* __JackPlatformServerChannel__ */ 
+#include "JackWinNamedPipeServerChannel.h"
+namespace Jack { typedef JackWinNamedPipeServerChannel JackServerChannel; }
+
+/* __JackPlatformClientChannel__ */
+#include "JackWinNamedPipeClientChannel.h"
+namespace Jack { typedef JackWinNamedPipeClientChannel JackClientChannel; }
+
+/* __JackPlatformServerNotifyChannel__ */
+#include "JackWinNamedPipeServerNotifyChannel.h"
+namespace Jack { typedef JackWinNamedPipeServerNotifyChannel JackServerNotifyChannel; }
+
+/* __JackPlatformNotifyChannel__ */
+#include "JackWinNamedPipeNotifyChannel.h"
+namespace Jack { typedef JackWinNamedPipeNotifyChannel JackNotifyChannel; }
+
+/* __JackPlatformNetSocket__ */
+#include "JackNetWinSocket.h"
+namespace Jack { typedef JackNetWinSocket JackNetSocket; }
+
+#endif
diff --git a/windows/JackPortAudioAdapter.h b/windows/JackPortAudioAdapter.h
index aa3c97d0..73205a40 100644
--- a/windows/JackPortAudioAdapter.h
+++ b/windows/JackPortAudioAdapter.h
@@ -68,7 +68,7 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include "driver_interface.h"
 
     EXPORT jack_driver_desc_t* jack_get_descriptor();
diff --git a/windows/JackPortAudioDriver.cpp b/windows/JackPortAudioDriver.cpp
index 42f6e28b..60160471 100644
--- a/windows/JackPortAudioDriver.cpp
+++ b/windows/JackPortAudioDriver.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackEngineControl.h"
 #include "JackError.h"
 #include "JackTime.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 #include <iostream>
 #include <assert.h>
 
@@ -263,7 +263,7 @@ extern "C"
 {
 #endif
 
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
 
     EXPORT jack_driver_desc_t* driver_get_descriptor()
     {
diff --git a/common/JackPlatformProcessSync.h b/windows/JackShmMem_os.h
index 8c4c62c0..24fffb6a 100644
--- a/common/JackPlatformProcessSync.h
+++ b/windows/JackShmMem_os.h
@@ -1,4 +1,5 @@
 /*
+Copyright (C) 2001 Paul Davis
 Copyright (C) 2004-2008 Grame
 
 This program is free software; you can redistribute it and/or modify
@@ -17,35 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
-#ifndef __JackPlatformProcessSync__
-#define __JackPlatformProcessSync__
+#ifndef __JackShmMem_WIN32__
+#define __JackShmMem_WIN32__
 
-#ifdef HAVE_CONFIG_H
-#include "config.h" 
-#endif 
+#include <windows.h>
 
-// OSX
-#if defined(__APPLE__)
-#include "JackProcessSync.h"
-#endif
-
-// WINDOWS
-#ifdef WIN32
-#include "JackWinProcessSync.h"
-#endif
-
-// LINUX
-#ifdef __linux__
-#include "JackProcessSync.h"
-#endif
-
-namespace Jack
-{
+#define CHECK_MLOCK(ptr, size) (VirtualLock((ptr), (size)) != 0)
+#define CHECK_MUNLOCK(ptr, size) (VirtualUnlock((ptr), (size)) != 0)
+#define CHECK_MLOCKALL()(false)
+#define CHECK_MUNLOCKALL()(false)
 
-#ifdef WIN32
-typedef JackWinProcessSync JackProcessSync;
 #endif
-
-} // end of namespace
-
-#endif /* __JackPlatformProcessSync__ */
diff --git a/windows/JackSystemDeps_os.h b/windows/JackSystemDeps_os.h
new file mode 100644
index 00000000..fc3c8b7f
--- /dev/null
+++ b/windows/JackSystemDeps_os.h
@@ -0,0 +1,31 @@
+/*
+Copyright (C) 2004-2006 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __JackSystemDeps_WIN32__
+#define __JackSystemDeps_WIN32__
+
+#include <windows.h>
+
+#pragma warning (disable : 4786)
+
+#define PATH_MAX 1024
+#define ENOBUFS 55
+
+#endif
+
diff --git a/windows/JackTime_os.h b/windows/JackTime_os.h
new file mode 100644
index 00000000..693c0f40
--- /dev/null
+++ b/windows/JackTime_os.h
@@ -0,0 +1,46 @@
+/*
+Copyright (C) 2001-2003 Paul Davis
+Copyright (C) 2004-2008 Grame
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef __JackTime_WIN32__
+#define __JackTime_WIN32__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    extern EXPORT LARGE_INTEGER _jack_freq;
+
+    EXPORT jack_time_t GetMicroSeconds(void) ;
+
+    void InitTime();
+
+    static void JackSleep(int usec) 
+    {
+        Sleep(usec / 1000);
+    }
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+
diff --git a/common/JackPlatformChannelTransaction.h b/windows/JackTypes_os.h
index a287c030..1e1187e1 100644
--- a/common/JackPlatformChannelTransaction.h
+++ b/windows/JackTypes_os.h
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004-2006 Grame
+  Copyright (C) 2001 Paul Davis
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
@@ -17,29 +17,14 @@ Copyright (C) 2004-2006 Grame
 
 */
 
-#ifndef __JackPlatformChannelTransaction__
-#define __JackPlatformChannelTransaction__
+#ifndef __JackTypes_WIN32__
+#define __JackTypes_WIN32__
 
-#ifdef WIN32
-#include "JackWinNamedPipe.h"
-#else
-#include "JackSocket.h"
-#endif
-
-namespace Jack
-{
-
-/*!
-\brief Channel input/output communication.
-*/
-
-#ifdef WIN32
-typedef JackWinNamedPipe JackChannelTransaction;
-#else
-typedef JackClientSocket JackChannelTransaction;
-#endif
+#include <windows.h>
 
-} // end of namespace
+typedef ULONGLONG UInt64;
+typedef unsigned short uint16_t;
+typedef DWORD jack_tls_key;
 
 #endif
 
diff --git a/windows/JackWinNamedPipeClientChannel.h b/windows/JackWinNamedPipeClientChannel.h
index 5c33f8cf..38344ad0 100644
--- a/windows/JackWinNamedPipeClientChannel.h
+++ b/windows/JackWinNamedPipeClientChannel.h
@@ -22,7 +22,7 @@ Copyright (C) 2004-2006 Grame
 
 #include "JackChannel.h"
 #include "JackWinNamedPipe.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include "JackRequest.h"
 
 namespace Jack
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 0a8701c4..74ea7cca 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -22,7 +22,7 @@ Copyright (C) 2004-2006 Grame
 
 #include "JackChannel.h"
 #include "JackWinNamedPipe.h"
-#include "JackPlatformThread.h"
+#include "JackPlatformPlug.h"
 #include <list>
 
 namespace Jack
diff --git a/windows/JackWinThread.cpp b/windows/JackWinThread.cpp
index 2704fa88..03ea77d0 100644
--- a/windows/JackWinThread.cpp
+++ b/windows/JackWinThread.cpp
@@ -59,7 +59,7 @@ DWORD WINAPI JackWinThread::ThreadHandler(void* arg)
 }
 
 JackWinThread::JackWinThread(JackRunnableInterface* runnable)
-        : JackThread(runnable, 0, false, 0)
+        : JackThreadInterface(runnable, 0, false, 0)
 {
     fEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
     fThread = NULL;
diff --git a/windows/JackWinThread.h b/windows/JackWinThread.h
index 5322f34f..dd71cdb5 100644
--- a/windows/JackWinThread.h
+++ b/windows/JackWinThread.h
@@ -23,19 +23,20 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackWinThread__
 
 #include "JackThread.h"
-#include "JackExports.h"
+#include "JackCompilerDeps.h"
+#include "JackSystemDeps.h"
 #include <windows.h>
 
 namespace Jack
 {
 
-typedef DWORD  (WINAPI *ThreadCallback)(void *arg);
+typedef DWORD (WINAPI *ThreadCallback)(void *arg);
 
 /*!
 \brief Windows threads.
 */
 
-class EXPORT JackWinThread : public detail::JackThread
+class EXPORT JackWinThread : public detail::JackThreadInterface
 {
 
     private:
@@ -73,3 +74,4 @@ class EXPORT JackWinThread : public detail::JackThread
 } // end of namespace
 
 #endif
+
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index a5c3d1f6..3253957a 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -16,9 +16,9 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -34,9 +34,9 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -53,9 +53,9 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_connect.cbp b/windows/jack_connect.cbp
index 4c3304cb..b32151ca 100644
--- a/windows/jack_connect.cbp
+++ b/windows/jack_connect.cbp
@@ -14,9 +14,10 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -30,9 +31,10 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -47,9 +49,10 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_disconnect.cbp b/windows/jack_disconnect.cbp
index 41ed168a..e6d35085 100644
--- a/windows/jack_disconnect.cbp
+++ b/windows/jack_disconnect.cbp
@@ -14,9 +14,10 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -30,9 +31,10 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -47,9 +49,10 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\example-clients" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -58,6 +61,10 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
+			<Add directory="..\example-clients" />
+			<Add directory="..\windows" />
+			<Add directory="..\common\jack" />
+			<Add directory="..\common" />
 		</Compiler>
 		<Linker>
 			<Add library="kernel32" />
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index 3dbeec3a..b05459c1 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -15,9 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -32,9 +32,9 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -50,9 +50,9 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_load.cbp b/windows/jack_load.cbp
index 7a47928d..1bf136a1 100644
--- a/windows/jack_load.cbp
+++ b/windows/jack_load.cbp
@@ -15,9 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -31,9 +31,9 @@
 				<Compiler>
 					<Add option="-g" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -49,9 +49,9 @@
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index f7e4f24d..d67d496a 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -15,8 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -30,8 +31,9 @@
 				<Compiler>
 					<Add option="-g" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -46,8 +48,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_metro.cbp b/windows/jack_metro.cbp
index 56b1f691..3bb60061 100644
--- a/windows/jack_metro.cbp
+++ b/windows/jack_metro.cbp
@@ -15,9 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -32,9 +32,9 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -50,9 +50,9 @@
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="..\example-clients" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 3c73040e..abf0c11d 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -15,9 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -32,9 +32,9 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -50,9 +50,9 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -61,9 +61,9 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add directory="..\common" />
-			<Add directory="..\common\jack" />
 			<Add directory="..\windows" />
+			<Add directory="..\common\jack" />
+			<Add directory="..\common" />
 		</Compiler>
 		<Linker>
 			<Add option="-enable-auto-import" />
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index 8aef7adb..6cb91c4b 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -15,9 +15,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -32,9 +32,9 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -50,9 +50,9 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_netmanager.cbp b/windows/jack_netmanager.cbp
index c413cb50..1b11a14d 100644
--- a/windows/jack_netmanager.cbp
+++ b/windows/jack_netmanager.cbp
@@ -14,9 +14,9 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -30,9 +30,9 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -47,9 +47,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index a84ea58d..4e0cfc13 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -21,8 +21,9 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="..\windows" />
@@ -44,8 +45,9 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -68,8 +70,9 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jack_unload.cbp b/windows/jack_unload.cbp
index dc7638fc..40172b08 100644
--- a/windows/jack_unload.cbp
+++ b/windows/jack_unload.cbp
@@ -14,9 +14,9 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -30,9 +30,9 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -47,9 +47,9 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
-					<Add directory="..\common" />
-					<Add directory="..\common\jack" />
 					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index 2b7b43e6..c49e1424 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -21,8 +21,9 @@
 					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
@@ -42,8 +43,9 @@
 					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
@@ -65,8 +67,9 @@
 					<Add option="-D_MBCS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
diff --git a/windows/libjack.cbp b/windows/libjack.cbp
index 1aef5885..d5e58864 100644
--- a/windows/libjack.cbp
+++ b/windows/libjack.cbp
@@ -26,8 +26,9 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add library="kernel32" />
@@ -64,8 +65,9 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add library="kernel32" />
@@ -103,8 +105,9 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
 					<Add library="kernel32" />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index dda74d1b..e548f7ee 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -26,8 +26,9 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 			</Target>
 			<Target title="Win32 Debug">
@@ -50,8 +51,9 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 			</Target>
 			<Target title="Win32 Monitor">
@@ -75,8 +77,9 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
-					<Add directory="..\common" />
+					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
 				</Compiler>
 			</Target>
 		</Build>
diff --git a/wscript b/wscript
index 0262c855..748b2eaf 100644
--- a/wscript
+++ b/wscript
@@ -66,7 +66,7 @@ def set_options(opt):
     opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
     opt.add_option('--doxygen', action='store_true', default=False, help='Enable build of doxygen documentation')
     opt.add_option('--monitor', action='store_true', default=False, help='Build with monitoring records')
-    opt.sub_options('linux/dbus')
+    opt.sub_options('dbus')
 
 def configure(conf):
     platform = conf.detect_platform()
@@ -86,7 +86,7 @@ def configure(conf):
     if conf.env['IS_LINUX']:
         conf.sub_config('linux')
     if Params.g_options.dbus:
-        conf.sub_config('linux/dbus')
+        conf.sub_config('dbus')
     conf.sub_config('example-clients')
 
     conf.env['LIB_PTHREAD'] = ['pthread']
@@ -100,10 +100,6 @@ def configure(conf):
 
     conf.define('ADDON_DIR', os.path.normpath(conf.env['PREFIX'] + '/lib/jack'))
     conf.define('JACK_LOCATION', os.path.normpath(conf.env['PREFIX'] + '/bin'))
-    if conf.env['IS_LINUX']:
-        conf.define('SOCKET_RPC_FIFO_SEMA', 1)
-    if conf.env['IS_MACOSX']:
-        conf.define('MACH_RPC_MACH_SEMA', 1)
     conf.define('__SMP__', 1)
     conf.define('USE_POSIX_SHM', 1)
     conf.define('JACKMP', 1)
@@ -166,7 +162,7 @@ def build(bld):
     if bld.env()['IS_LINUX']:
         bld.add_subdirs('linux')
         if bld.env()['BUILD_JACKDBUS'] == True:
-            bld.add_subdirs('linux/dbus')
+            bld.add_subdirs('dbus')
         bld.add_subdirs('example-clients')
         bld.add_subdirs('tests')
     if bld.env()['IS_MACOSX']:
@@ -174,7 +170,7 @@ def build(bld):
         bld.add_subdirs('example-clients')
         bld.add_subdirs('tests')
         if bld.env()['BUILD_JACKDBUS'] == True:
-            bld.add_subdirs('linux/dbus')
+            bld.add_subdirs('dbus')
 
     if bld.env()['BUILD_DOXYGEN_DOCS'] == True:
         share_dir = bld.env().get_destdir() + Params.g_build.env()['PREFIX'] + '/share/jack-audio-connection-kit'