diff --git a/windows/JackWinMutex.h b/windows/JackWinMutex.h
index 14623309..8e40ec91 100644
--- a/windows/JackWinMutex.h
+++ b/windows/JackWinMutex.h
@@ -23,7 +23,8 @@
 
 #include "JackCompilerDeps.h"
 #include "JackException.h"
-#include <windows.h>
+#include <windows.h>
+#include <stdio.h>
 
 namespace Jack
 {
diff --git a/windows/Release/bin/libportaudio_x86.a b/windows/Release/bin/libportaudio_x86.a
new file mode 100644
index 00000000..1cfa1e55
Binary files /dev/null and b/windows/Release/bin/libportaudio_x86.a differ
diff --git a/windows/Release/bin/libsamplerate_x86.dll b/windows/Release/bin/libsamplerate_x86.a
similarity index 98%
rename from windows/Release/bin/libsamplerate_x86.dll
rename to windows/Release/bin/libsamplerate_x86.a
index 0eb2f104..df7e0a87 100644
Binary files a/windows/Release/bin/libsamplerate_x86.dll and b/windows/Release/bin/libsamplerate_x86.a differ
diff --git a/windows/Release/bin/portaudio_x86.dll b/windows/Release/bin/portaudio_x86.dll
deleted file mode 100644
index f3993ab2..00000000
Binary files a/windows/Release/bin/portaudio_x86.dll and /dev/null differ
diff --git a/windows/Release64/bin/libportaudio_x86_64.a b/windows/Release64/bin/libportaudio_x86_64.a
new file mode 100644
index 00000000..44f8b90c
Binary files /dev/null and b/windows/Release64/bin/libportaudio_x86_64.a differ
diff --git a/windows/Release64/bin/libsamplerate_x86_64.dll b/windows/Release64/bin/libsamplerate_x86_64.a
similarity index 98%
rename from windows/Release64/bin/libsamplerate_x86_64.dll
rename to windows/Release64/bin/libsamplerate_x86_64.a
index 099bed58..20154d16 100644
Binary files a/windows/Release64/bin/libsamplerate_x86_64.dll and b/windows/Release64/bin/libsamplerate_x86_64.a differ
diff --git a/windows/Release64/bin/portaudio_x86_64.dll b/windows/Release64/bin/portaudio_x86_64.dll
deleted file mode 100644
index 042fbeca..00000000
Binary files a/windows/Release64/bin/portaudio_x86_64.dll and /dev/null differ
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index 148b1f0d..c80a690f 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -69,8 +69,6 @@
 <_><src>..\Release\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjack.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libsamplerate_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\portaudio_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\jack_net.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack\jack_netone.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -99,7 +97,6 @@
 <_><src>.\src\32bits\JackRouter.ini</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\src\32bits\msvcr100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\src\32bits\msvcp100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\portaudio_x86.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
index 2e493fd4..c431d0cd 100644
--- a/windows/Setup/jack64.ci
+++ b/windows/Setup/jack64.ci
@@ -69,7 +69,6 @@
 <_><src>..\Release\bin\libjackserver.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\portaudio_x86.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -78,8 +77,6 @@
 <_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_midi_latency_test.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libsamplerate_x86_64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\portaudio_x86_64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack\jack_net.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack\jack_netone.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
 <_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
@@ -112,7 +109,6 @@
 <_><src>.\src\64bits\JackRouter.ini</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\src\64bits\msvcr100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\src\64bits\msvcp100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\64bits\portaudio_x86_64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
 <_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index be22e0fd..088ca08e 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -17,16 +17,18 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
+					<Add library="libsamplerate_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -41,16 +43,16 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
@@ -66,16 +68,16 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -91,7 +93,7 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -99,9 +101,11 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
+					<Add library="libsamplerate_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -120,7 +124,7 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -128,9 +132,9 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -150,7 +154,7 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -158,9 +162,9 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 35558b61..80a2bcb2 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -23,7 +23,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -44,7 +44,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
@@ -66,7 +66,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -89,7 +89,7 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -115,7 +115,7 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -142,7 +142,7 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index f6d46b0a..df2ce8fe 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -30,7 +30,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="..\windows" />
 					<Add directory="Release64\bin" />
 				</Linker>
@@ -59,7 +61,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
 					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -89,7 +91,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjackserver64" />
-					<Add library="portaudio_x86_64" />
+					<Add library="libportaudio_x86_64.a" />
 					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -120,7 +122,9 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
 				</Linker>
@@ -154,7 +158,7 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -189,7 +193,7 @@
 				<Linker>
 					<Add option="-m32" />
 					<Add library="libjackserver" />
-					<Add library="portaudio_x86" />
+					<Add library="libportaudio_x86.a" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
 				</Linker>
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 518863c9..dc5bb4c0 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjack.cbp" active="1" />
+		<Project filename="libjack.cbp" />
 		<Project filename="libjacknet.cbp" />
 		<Project filename="libjackserver.cbp" />
 		<Project filename="jack_portaudio.cbp" />
@@ -23,7 +23,7 @@
 		<Project filename="jack_loopback.cbp" />
 		<Project filename="jackd.cbp" />
 		<Project filename="jack_midi_latency_test.cbp" />
-		<Project filename="jack_netadapter.cbp" />
+		<Project filename="jack_netadapter.cbp" active="1" />
 		<Project filename="jack_netsource.cbp" />
 		<Project filename="jack_midi_dump.cbp" />
 	</Workspace>
diff --git a/windows/libjacknet.cbp b/windows/libjacknet.cbp
index e7a61097..41b61307 100644
--- a/windows/libjacknet.cbp
+++ b/windows/libjacknet.cbp
@@ -32,7 +32,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -62,7 +62,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
@@ -93,7 +93,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add library="libsamplerate_x86_64" />
+					<Add library="libsamplerate_x86_64.a" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -125,7 +125,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -160,7 +160,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -196,7 +196,7 @@
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add library="libsamplerate_x86" />
+					<Add library="libsamplerate_x86.a" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>