diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index ba5ad176..fa92b04d 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -24,6 +24,9 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libsamplerate-0-x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -44,6 +47,9 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libsamplerate-0-x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -65,6 +71,9 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libsamplerate-0-x86_64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -87,6 +96,9 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libsamplerate-0" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackaudioadapter.res jackaudioadapter.rc" />
@@ -112,6 +124,9 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libsamplerate-0" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackaudioadapter.res jackaudioadapter.rc" />
@@ -138,6 +153,9 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libsamplerate-0" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackaudioadapter.res jackaudioadapter.rc" />
@@ -160,9 +178,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libsamplerate-0" />
-			<Add library="libjackserver" />
-			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="..\common\JackAudioAdapter.cpp" />
 		<Unit filename="..\common\JackAudioAdapterFactory.cpp" />
diff --git a/windows/jack_connect.cbp b/windows/jack_connect.cbp
index 68556aff..1af53ac1 100644
--- a/windows/jack_connect.cbp
+++ b/windows/jack_connect.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -94,6 +98,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -114,6 +119,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -133,7 +139,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_disconnect.cbp b/windows/jack_disconnect.cbp
index dee17bf9..0017ca8e 100644
--- a/windows/jack_disconnect.cbp
+++ b/windows/jack_disconnect.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -94,6 +98,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -114,6 +119,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -137,7 +143,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\connect.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index c6470141..d0f7e470 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -22,6 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -40,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,6 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -79,6 +82,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
@@ -102,6 +106,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackdummydriver.res jackdummydriver.rc" />
@@ -126,6 +131,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
@@ -148,8 +154,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-		</Linker>
+        </Linker>
 		<Unit filename="jackdummydriver.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
diff --git a/windows/jack_latent_client.cbp b/windows/jack_latent_client.cbp
index a94149ae..797d3231 100644
--- a/windows/jack_latent_client.cbp
+++ b/windows/jack_latent_client.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,6 +38,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -54,6 +56,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -73,6 +76,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -91,6 +95,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -110,6 +115,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -128,7 +134,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\latent_client.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_load.cbp b/windows/jack_load.cbp
index aba14311..e46d5b15 100644
--- a/windows/jack_load.cbp
+++ b/windows/jack_load.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,6 +38,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -55,6 +57,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -74,6 +77,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -92,6 +96,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -112,6 +117,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/windows/jack_loopback.cbp b/windows/jack_loopback.cbp
index 7582c952..9406a5a9 100644
--- a/windows/jack_loopback.cbp
+++ b/windows/jack_loopback.cbp
@@ -22,6 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -40,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,6 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -79,6 +82,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackloopbackdriver.res jackloopbackdriver.rc" />
@@ -102,6 +106,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackloopbackdriver.res jackloopbackdriver.rc" />
@@ -126,6 +131,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackloopbackdriver.res jackloopbackdriver.rc" />
@@ -148,7 +154,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="jackloopbackdriver.rc">
 			<Option compilerVar="WINDRES" />
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index 036134d9..6876aae0 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,6 +38,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -54,6 +56,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -73,6 +76,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -91,6 +95,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -110,6 +115,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/windows/jack_metro.cbp b/windows/jack_metro.cbp
index 166dd751..1f1498cc 100644
--- a/windows/jack_metro.cbp
+++ b/windows/jack_metro.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -94,6 +98,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -114,6 +119,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 3cbd564e..684f3821 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -22,6 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -40,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,6 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -79,6 +82,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetadapter.res jacknetadapter.rc" />
@@ -102,6 +106,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                  <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetadapter.res jacknetadapter.rc" />
@@ -126,6 +131,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetadapter.res jacknetadapter.rc" />
@@ -152,7 +158,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="libsamplerate-0" />
 			<Add directory="Release\bin" />
 		</Linker>
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index c4ab7f5f..a0d8cbf0 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -22,6 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -40,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,6 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -79,6 +82,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
@@ -102,6 +106,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                  <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetdriver.res jacknetdriver.rc" />
@@ -126,6 +131,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                  <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
@@ -149,7 +155,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="ws2_32" />
 		</Linker>
 		<Unit filename="..\common\JackNetDriver.cpp" />
diff --git a/windows/jack_netmanager.cbp b/windows/jack_netmanager.cbp
index e603f621..3b9bd5f7 100644
--- a/windows/jack_netmanager.cbp
+++ b/windows/jack_netmanager.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetmanager.res jacknetmanager.rc" />
@@ -97,6 +101,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetmanager.res jacknetmanager.rc" />
@@ -120,6 +125,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetmanager.res jacknetmanager.rc" />
@@ -144,8 +150,7 @@
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
 			<Add library="ws2_32" />
-			<Add library="libjackserver" />
-		</Linker>
+        </Linker>
 		<Unit filename="..\common\JackNetManager.cpp" />
 		<Unit filename="jacknetmanager.rc">
 			<Option compilerVar="WINDRES" />
diff --git a/windows/jack_netonedriver.cbp b/windows/jack_netonedriver.cbp
index baf94692..4232821f 100644
--- a/windows/jack_netonedriver.cbp
+++ b/windows/jack_netonedriver.cbp
@@ -22,6 +22,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -40,6 +41,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -59,6 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -79,6 +82,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetonedriver.res jacknetonedriver.rc" />
@@ -102,6 +106,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
@@ -126,6 +131,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
@@ -149,7 +155,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="ws2_32" />
 		</Linker>
 		<Unit filename="..\common\JackNetOneDriver.cpp" />
diff --git a/windows/jack_netsource.cbp b/windows/jack_netsource.cbp
index b4b4542d..bd335bda 100644
--- a/windows/jack_netsource.cbp
+++ b/windows/jack_netsource.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -94,6 +98,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -114,6 +119,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -137,7 +143,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 			<Add library="libsamplerate-0" />
 			<Add library="ws2_32" />
 			<Add directory="Release\bin" />
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 89488507..40c8e407 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -30,6 +30,8 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -56,6 +58,8 @@
 				<Linker>
 					<Add directory="Debug\bin64" />
 					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -83,6 +87,8 @@
 				<Linker>
 					<Add directory="Release\bin64" />
 					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
+                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -111,6 +117,8 @@
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
@@ -142,6 +150,8 @@
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackportaudio.res jackportaudio.rc" />
@@ -174,6 +184,8 @@
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
+                    <Add library="portaudio_x86" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
@@ -196,8 +208,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
-			<Add library="portaudio_x86" />
 		</Linker>
 		<Unit filename="jackportaudio.rc">
 			<Option compilerVar="WINDRES" />
diff --git a/windows/jack_test.cbp b/windows/jack_test.cbp
index 2cbabdf5..5ca0caf3 100644
--- a/windows/jack_test.cbp
+++ b/windows/jack_test.cbp
@@ -20,7 +20,8 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\Release" />
+					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -38,6 +39,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -56,6 +58,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -75,6 +78,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -94,6 +98,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Debug\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -114,6 +119,7 @@
 				<Linker>
                     <Add option="-m32" />
 					<Add directory="Release\bin" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -133,7 +139,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\tests\test.cpp">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_unload.cbp b/windows/jack_unload.cbp
index c55910b2..90dc0418 100644
--- a/windows/jack_unload.cbp
+++ b/windows/jack_unload.cbp
@@ -20,6 +20,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -36,6 +37,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -53,6 +55,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -71,6 +74,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -89,6 +93,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -108,6 +113,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -127,7 +133,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\example-clients\ipunload.c">
 			<Option compilerVar="CC" />
diff --git a/windows/jack_winmme.cbp b/windows/jack_winmme.cbp
index eaaf0abd..b22dd1d3 100644
--- a/windows/jack_winmme.cbp
+++ b/windows/jack_winmme.cbp
@@ -29,6 +29,7 @@
 				<Linker>
 					<Add directory="..\windows" />
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -54,6 +55,7 @@
 				<Linker>
 					<Add directory="Debug\bin64" />
 					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -80,6 +82,7 @@
 				<Linker>
 					<Add directory="Release\bin64" />
 					<Add directory="..\windows" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -107,6 +110,7 @@
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackwinmme.res jackwinmme.rc" />
@@ -137,6 +141,7 @@
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackwinmme.res jackwinmme.rc" />
@@ -168,6 +173,7 @@
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
                 <ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackwinmme.res jackwinmme.rc" />
@@ -190,7 +196,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 			<Add library="winmm" />
 		</Linker>
 		<Unit filename="jackwinmme.rc">
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index 98a35468..5905e018 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -27,6 +27,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -49,6 +50,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -73,6 +75,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -98,6 +101,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -122,6 +126,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -148,6 +153,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjackserver" />
 				</Linker>
 			</Target>
 		</Build>
@@ -167,7 +173,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjackserver" />
 		</Linker>
 		<Unit filename="..\common\Jackdmp.cpp" />
 		<Unit filename="getopt.c">
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 7b1ed675..47496533 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -1,4 +1,4 @@
-bin64<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
diff --git a/windows/multiple_metro.cbp b/windows/multiple_metro.cbp
index 5502ab87..f66c56db 100644
--- a/windows/multiple_metro.cbp
+++ b/windows/multiple_metro.cbp
@@ -21,6 +21,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,6 +38,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Debug\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -55,6 +57,7 @@
 				</Compiler>
 				<Linker>
 					<Add directory="Release\bin64" />
+                    <Add library="libjack64" />
 				</Linker>
 			</Target>
             <Target title="Win32 Release 32bits">
@@ -74,6 +77,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -92,6 +96,7 @@
 				<Linker>
 					<Add directory="Debug\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -112,6 +117,7 @@
 				<Linker>
 					<Add directory="Release\bin" />
                     <Add option="-m32" />
+                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -131,7 +137,6 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			<Add library="libjack" />
 		</Linker>
 		<Unit filename="..\tests\external_metro.cpp">
 			<Option compilerVar="CC" />