diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp
index 519cb4c5..c8a85f1b 100644
--- a/common/JackAPI.cpp
+++ b/common/JackAPI.cpp
@@ -843,7 +843,7 @@ EXPORT jack_nframes_t jack_thread_wait(jack_client_t* ext_client, int status)
         return 0;
     } else {
         jack_error("jack_thread_wait: deprecated, use jack_cycle_wait/jack_cycle_signal");
-        return -1;
+        return 0;
     }
 }
 
diff --git a/common/JackTime.h b/common/JackTime.h
index 349b3569..10ef1e8c 100644
--- a/common/JackTime.h
+++ b/common/JackTime.h
@@ -30,8 +30,8 @@ extern "C"
 {
 #endif
 
-    SERVER_EXPORT void InitTime();	
-    SERVER_EXPORT jack_time_t GetMicroSeconds();
+    SERVER_EXPORT void InitTime();
+    SERVER_EXPORT jack_time_t GetMicroSeconds(void);
     SERVER_EXPORT void JackSleep(long usec);
     SERVER_EXPORT void SetClockSource(jack_timer_type_t source);
     SERVER_EXPORT const char* ClockSourceName(jack_timer_type_t source);
diff --git a/windows/JackTypes_os.h b/windows/JackTypes_os.h
index 9f8057b5..88a8bd8a 100644
--- a/windows/JackTypes_os.h
+++ b/windows/JackTypes_os.h
@@ -20,12 +20,12 @@
 #ifndef __JackTypes_WIN32__
 #define __JackTypes_WIN32__
 
-#include <windows.h>
+#include <windows.h>
+#include "types.h"
 
 typedef ULONGLONG UInt64;
 typedef unsigned short uint16_t;
-typedef DWORD jack_tls_key;
-typedef HANDLE pthread_t;
+typedef DWORD jack_tls_key;
 
 #endif
 
diff --git a/windows/JackWinTime.c b/windows/JackWinTime.c
index e952410b..54da0411 100644
--- a/windows/JackWinTime.c
+++ b/windows/JackWinTime.c
@@ -13,19 +13,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software 
+along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 */
 
-#include <windows.h>
 #include "JackTime.h"
-#include "JackTypes.h"
-#include "JackError.h"
 
 static LARGE_INTEGER _jack_freq;
 
-SERVER_EXPORT void JackSleep(long usec) 
+SERVER_EXPORT void JackSleep(long usec)
 {
 	Sleep(usec / 1000);
 }
@@ -36,11 +33,11 @@ SERVER_EXPORT void InitTime()
 	_jack_freq.QuadPart = _jack_freq.QuadPart / 1000000; // by usec
 }
 
-SERVER_EXPORT jack_time_t GetMicroSeconds(void) 
+SERVER_EXPORT jack_time_t GetMicroSeconds(void)
 {
 	LARGE_INTEGER t1;
 	QueryPerformanceCounter(&t1);
-	return (jack_time_t)(((double)t1.QuadPart) / ((double)_jack_freq.QuadPart));		
+	return (jack_time_t)(((double)t1.QuadPart) / ((double)_jack_freq.QuadPart));
 }
 
 SERVER_EXPORT void SetClockSource(jack_timer_type_t source)
diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index 615bae3f..f8291cd2 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="libjackserver.cbp" />
+		<Project filename="libjackserver.cbp" active="1" />
 		<Project filename="jackd.cbp">
 			<Depends filename="libjackserver.cbp" />
 		</Project>
@@ -46,6 +46,6 @@
 		<Project filename="multiple_metro.cbp">
 			<Depends filename="libjack.cbp" />
 		</Project>
-		<Project filename="jack_winmme.cbp" active="1" />
+		<Project filename="jack_winmme.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>