diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index c4f505cd..724cf249 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -185,22 +185,8 @@ jackctl_get_parameter(
     return NULL;
 }
 
-#if defined(WIN32) && !defined(_DEBUG)
-# define USEWINMAIN
-#endif
-
-#ifdef USEWINMAIN
-#include <windows.h>
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdParam, int iCmdShow)
-#else
 int main(int argc, char** argv)
-#endif
 {
-#ifdef USEWINMAIN
-	int argc = __argc;
-	char **argv = __argv;
-#endif
-
     jackctl_server_t * server_ctl;
     const JSList * server_parameters;
     const char* server_name = "default";
diff --git a/windows/JackWinServerLaunch.cpp b/windows/JackWinServerLaunch.cpp
index 72c86486..4a0d35c9 100644
--- a/windows/JackWinServerLaunch.cpp
+++ b/windows/JackWinServerLaunch.cpp
@@ -238,7 +238,7 @@ static int start_server_aux(const char* server_name)
 	}
 #endif
 
-	ret = _spawnv(_P_NOWAIT, command, argv);
+	ret = _spawnv(_P_DETACH, command, argv);
 	Sleep(2500); // Give the server time to launch
 
 	if ((-1) == ret)
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index c19d11e5..584c25d8 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -1,183 +1,179 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="jack_dummy" />
-		<Option pch_mode="2" />
-		<Option compiler="mingw_64" />
-		<Build>
-			<Target title="Win32 Release 64bits">
-				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release64\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Debug 64bits">
-				<Option output="Debug64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug64\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Debug64\bin" />
-                    <Add library="libjackserver64" />
-				</Linker>
-			</Target>
-			<Target title="Win32 Profiling 64bits">
-				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release64\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DJACK_MONITOR" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
-				</Linker>
-			</Target>
-            		<Target title="Win32 Release 32bits">
-				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<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" />
-				</ExtraCommands>
-			</Target>
-			<Target title="Win32 Debug 32bits">
-				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-                    <Add option="-m32" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<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" />
-				</ExtraCommands>
-			</Target>
-			<Target title="Win32 Profiling 32bits">
-				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release\" />
-				<Option type="3" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DJACK_MONITOR" />
-					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<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" />
-				</ExtraCommands>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Linker>
-			<Add library="kernel32" />
-			<Add library="user32" />
-			<Add library="gdi32" />
-			<Add library="winspool" />
-			<Add library="comdlg32" />
-			<Add library="advapi32" />
-			<Add library="shell32" />
-			<Add library="ole32" />
-			<Add library="oleaut32" />
-			<Add library="uuid" />
-			<Add library="odbc32" />
-			<Add library="odbccp32" />
-        </Linker>
-		<Unit filename="jackdummydriver.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
-		<Unit filename="..\common\JackDummyDriver.cpp" />
-		<Extensions>
-			<AutoVersioning>
-				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-			</AutoVersioning>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="jack_dummy" />
+		<Option pch_mode="2" />
+		<Option compiler="mingw_64" />
+		<Build>
+			<Target title="Win32 Release 64bits">
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjackserver64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Debug 64bits">
+				<Option output="Debug64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjackserver64" />
+					<Add directory="Debug64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Profiling 64bits">
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release64\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add library="libjackserver64" />
+					<Add directory="Release64\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Release 32bits">
+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add directory="Release\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
+			</Target>
+			<Target title="Win32 Debug 32bits">
+				<Option output="Debug\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Debug\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add directory="Debug\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
+			</Target>
+			<Target title="Win32 Profiling 32bits">
+				<Option output="Release\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="3" />
+				<Option compiler="mingw_64" />
+				<Compiler>
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-m32" />
+					<Add option="-DBUILD_DLL" />
+					<Add option="-DJACK_MONITOR" />
+					<Add option="-DSERVER_SIDE" />
+					<Add option="-DJACK_32_64" />
+					<Add directory="..\windows" />
+					<Add directory="..\common\jack" />
+					<Add directory="..\common" />
+				</Compiler>
+				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add directory="Release\bin" />
+				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackdummydriver.res jackdummydriver.rc" />
+				</ExtraCommands>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+		</Compiler>
+		<Linker>
+			<Add library="kernel32" />
+			<Add library="user32" />
+			<Add library="gdi32" />
+			<Add library="winspool" />
+			<Add library="comdlg32" />
+			<Add library="advapi32" />
+			<Add library="shell32" />
+			<Add library="ole32" />
+			<Add library="oleaut32" />
+			<Add library="uuid" />
+			<Add library="odbc32" />
+			<Add library="odbccp32" />
+		</Linker>
+		<Unit filename="..\common\JackDummyDriver.cpp" />
+		<Unit filename="jackdummydriver.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Extensions>
+			<AutoVersioning>
+				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
+				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
+			</AutoVersioning>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index 02c9df6b..58b853d9 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -14,17 +14,16 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,14 +36,14 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Debug64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -55,21 +54,20 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<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" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
-            		<Target title="Win32 Release 32bits">
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
@@ -77,21 +75,20 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -103,20 +100,20 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -128,22 +125,21 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<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" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetdriver.res jacknetdriver.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_netonedriver.cbp b/windows/jack_netonedriver.cbp
index d6608119..4168ca01 100644
--- a/windows/jack_netonedriver.cbp
+++ b/windows/jack_netonedriver.cbp
@@ -14,17 +14,16 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,14 +36,14 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Debug64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -55,21 +54,20 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DBUILD_DLL" />
 					<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" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
 					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
 				</Linker>
 			</Target>
-            		<Target title="Win32 Release 32bits">
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
@@ -77,21 +75,20 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -103,20 +100,20 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Debug\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
@@ -128,22 +125,21 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<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" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jacknetonedriver.res jacknetonedriver.rc" />
 				</ExtraCommands>
 			</Target>
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 6aabbc17..f6d46b0a 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -14,7 +14,6 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -22,7 +21,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -30,10 +29,10 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
+					<Add library="portaudio_x86_64" />
 					<Add directory="..\windows" />
 					<Add directory="Release64\bin" />
-                    <Add library="libjackserver64" />
-                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -51,7 +50,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -59,10 +58,10 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
+					<Add library="portaudio_x86_64" />
 					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
-                    <Add library="libjackserver64" />
-                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -73,7 +72,6 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -82,7 +80,7 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -90,13 +88,13 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add library="libjackserver64" />
+					<Add library="portaudio_x86_64" />
 					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
-                    <Add library="libjackserver64" />
-                    <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
-           		<Target title="Win32 Release 32bits">
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release" />
 				<Option type="3" />
@@ -104,8 +102,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -113,7 +110,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -121,13 +118,13 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
 					<Add directory="..\windows" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
-                    <Add library="portaudio_x86" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
@@ -139,7 +136,7 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -147,7 +144,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -155,13 +152,13 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
-                    <Add library="portaudio_x86" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Debug/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
@@ -173,8 +170,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
+					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -183,7 +179,7 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
+					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -191,17 +187,17 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjackserver" />
+					<Add library="portaudio_x86" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
-                    <Add option="-m32" />
-                    <Add library="libjackserver" />
-                    <Add library="portaudio_x86" />
 				</Linker>
-                <ExtraCommands>
+				<ExtraCommands>
 					<Add before="windres -F pe-i386 -O coff -o Release/jackportaudio.res jackportaudio.rc" />
 				</ExtraCommands>
 			</Target>
-        	</Build>
+		</Build>
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index f7ca1129..3a8ca8e5 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -64,7 +64,6 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -149,7 +148,6 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 67a97092..66fab896 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -3,7 +3,7 @@
 	<Workspace title="jack">
 		<Project filename="libjackserver.cbp" />
 		<Project filename="jack_portaudio.cbp" />
-		<Project filename="jack_netdriver.cbp" />
+		<Project filename="jack_netdriver.cbp" active="1" />
 		<Project filename="jack_netonedriver.cbp" />
 		<Project filename="jack_dummy.cbp" />
 		<Project filename="jack_netmanager.cbp" />
@@ -20,7 +20,7 @@
 		<Project filename="multiple_metro.cbp" />
 		<Project filename="jack_winmme.cbp" />
 		<Project filename="jack_loopback.cbp" />
-		<Project filename="jackd.cbp" active="1" />
+		<Project filename="jackd.cbp" />
 		<Project filename="jack_midi_latency_test.cbp" />
 		<Project filename="jack_netadapter.cbp" />
 		<Project filename="jack_netsource.cbp" />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 4cd86297..11289a3d 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -16,7 +16,6 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -85,7 +84,6 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -122,7 +120,6 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -201,7 +198,6 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-m32" />
-					<Add option="-Wl,-subsystem,windows" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />