diff --git a/common/netjack.c b/common/netjack.c
index e3ec0c33..141f4409 100644
--- a/common/netjack.c
+++ b/common/netjack.c
@@ -59,7 +59,7 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 #include "netjack_packet.h"
 
 // JACK2
-#include "control.h"
+//#include "control.h"
 
 #define MIN(x,y) ((x)<(y) ? (x) : (y))
 
diff --git a/common/netjack_packet.c b/common/netjack_packet.c
index 638e3d82..a48f1824 100644
--- a/common/netjack_packet.c
+++ b/common/netjack_packet.c
@@ -75,7 +75,7 @@
 #include "netjack_packet.h"
 
 // JACK2 specific.
-#include "control.h"
+//#include "control.h"
 
 #ifdef NO_JACK_ERROR
 #define jack_error printf
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index 06a90677..c4c68cdf 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -20,8 +20,8 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjack64" />
 					<Add directory="Release\bin64" />
-                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
@@ -37,8 +37,8 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjack64" />
 					<Add directory="Debug\bin64" />
-                    <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
@@ -55,11 +55,11 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add library="libjack64" />
 					<Add directory="Release\bin64" />
-                    <Add library="libjack64" />
 				</Linker>
 			</Target>
-            <Target title="Win32 Release 32bits">
+			<Target title="Win32 Release 32bits">
 				<Option output="Release\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="1" />
@@ -67,16 +67,16 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 32bits">
@@ -86,16 +86,16 @@
 				<Option compiler="mingw_64" />
 				<Compiler>
 					<Add option="-g" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Debug\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjack" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
@@ -106,16 +106,16 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+					<Add option="-m32" />
 					<Add directory="..\example-clients" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
+					<Add option="-m32" />
+					<Add library="libjack" />
 					<Add directory="Release\bin" />
-                    <Add option="-m32" />
-                    <Add library="libjack" />
 				</Linker>
 			</Target>
 		</Build>
@@ -134,7 +134,7 @@
 			<Add library="uuid" />
 			<Add library="odbc32" />
 			<Add library="odbccp32" />
-			</Linker>
+		</Linker>
 		<Unit filename="..\example-clients\lsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index a0477772..c019044a 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -103,6 +103,9 @@
                     <Add option="-m32" />
                     <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jackd" prefix_auto="1" extension_auto="1" />
@@ -128,6 +131,9 @@
                     <Add option="-m32" />
                     <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Debug/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Profiling 32bits">
 				<Option output="Release\bin\jackd" prefix_auto="1" extension_auto="1" />
@@ -155,6 +161,9 @@
                     <Add option="-m32" />
                     <Add library="libjackserver" />
 				</Linker>
+				<ExtraCommands>
+					<Add before="windres -F pe-i386 -O coff -o Release/jackd.res jackd.rc" />
+				</ExtraCommands>
 			</Target>
 		</Build>
 		<Compiler>
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 8d491b3c..d4585453 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -1,62 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjackserver.cbp" active="1" />
-		<Project filename="jackd.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_portaudio.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_netdriver.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_netonedriver.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_dummy.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_netmanager.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_audioadapter.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
-		<Project filename="jack_netadapter.cbp">
-			<Depends filename="libjackserver.cbp" />
-		</Project>
+		<Project filename="libjackserver.cbp" />
+		<Project filename="jack_portaudio.cbp" />
+		<Project filename="jack_netdriver.cbp" />
+		<Project filename="jack_netonedriver.cbp" />
+		<Project filename="jack_dummy.cbp" />
+		<Project filename="jack_netmanager.cbp" />
+		<Project filename="jack_audioadapter.cbp" />
+		<Project filename="jack_netadapter.cbp" />
 		<Project filename="libjack.cbp" />
-		<Project filename="jack_load.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_unload.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_lsp.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_latent_client.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_netsource.cbp">
-			<Depends filename="libjack.cbp" />
-			<Depends filename="jack_netonedriver.cbp" />
-		</Project>
-		<Project filename="jack_metro.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_connect.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_disconnect.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
+		<Project filename="jack_load.cbp" />
+		<Project filename="jack_unload.cbp" />
+		<Project filename="jack_lsp.cbp" />
+		<Project filename="jack_latent_client.cbp" />
+		<Project filename="jack_netsource.cbp" />
+		<Project filename="jack_metro.cbp" />
+		<Project filename="jack_connect.cbp" />
+		<Project filename="jack_disconnect.cbp" />
 		<Project filename="jack_test.cbp" />
-		<Project filename="multiple_metro.cbp">
-			<Depends filename="libjack.cbp" />
-		</Project>
-		<Project filename="jack_winmme.cbp" />
+		<Project filename="multiple_metro.cbp" />
+		<Project filename="jack_winmme.cbp" active="1" />
 		<Project filename="jack_loopback.cbp" />
+		<Project filename="jackd.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/windows/portaudio/JackPortAudioDevices.cpp b/windows/portaudio/JackPortAudioDevices.cpp
index 786fb939..d7b8395c 100644
--- a/windows/portaudio/JackPortAudioDevices.cpp
+++ b/windows/portaudio/JackPortAudioDevices.cpp
@@ -18,7 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "JackPortAudioDevices.h"
-#include "JackError.h"
+#include "JackError.h"
+#include <stdlib.h>
 
 using namespace std;
 
diff --git a/windows/winmme/JackWinMMEInputPort.cpp b/windows/winmme/JackWinMMEInputPort.cpp
index acafe158..9dabf2d5 100644
--- a/windows/winmme/JackWinMMEInputPort.cpp
+++ b/windows/winmme/JackWinMMEInputPort.cpp
@@ -181,7 +181,7 @@ void
 JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
 {
     set_threaded_log_function();
-    jack_nframes_t current_frame = GetCurrentFrame();
+    jack_nframes_t current_frame = GetCurrentFrame();
 
     switch (message) {
     case MIM_CLOSE:
@@ -192,7 +192,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
                   "driver thinks that JACK is not processing messages fast "
                   "enough.");
         // Fallthrough on purpose.
-    case MIM_DATA:
+    case MIM_DATA: {
         jack_midi_data_t message_buffer[3];
         jack_midi_data_t status = param1 & 0xff;
         int length = GetMessageLength(status);
@@ -219,14 +219,15 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
             return;
         }
         EnqueueMessage(current_frame, (size_t) length, message_buffer);
-        break;
-    case MIM_LONGDATA:
+        break;
+    }
+    case MIM_LONGDATA: {
         LPMIDIHDR header = (LPMIDIHDR) param1;
         jack_midi_data_t *data = (jack_midi_data_t *) header->lpData;
         size_t length1 = header->dwBytesRecorded;
         if ((data[0] != 0xf0) || (data[length1 - 1] != 0xf7)) {
             jack_error("JackWinMMEInputPort::ProcessWinMME - Discarding "
-                       "%d-byte sysex chunk.", length);
+                       "%d-byte sysex chunk.", length1);
         } else {
             EnqueueMessage(current_frame, length1, data);
         }
@@ -239,7 +240,8 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
             WriteInError("JackWinMMEInputPort::ProcessWinMME", "midiInAddBuffer",
                        result);
         }
-        break;
+        break;
+    }
     case MIM_LONGERROR:
         jack_error("JackWinMMEInputPort::ProcessWinMME - Invalid or "
                    "incomplete sysex message received.");
diff --git a/windows/winmme/JackWinMMEPort.cpp b/windows/winmme/JackWinMMEPort.cpp
index 46c4546b..13ec2302 100644
--- a/windows/winmme/JackWinMMEPort.cpp
+++ b/windows/winmme/JackWinMMEPort.cpp
@@ -18,7 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <memory>
-#include <stdexcept>
+#include <stdexcept>
+#include <stdio.h>
 
 #include "JackWinMMEPort.h"
 #include "JackError.h"