diff --git a/common/JackError.h b/common/JackError.h
index 68dd88dd..492e023e 100644
--- a/common/JackError.h
+++ b/common/JackError.h
@@ -25,7 +25,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <string.h>
 #include <errno.h>
-#include <stdio.h>
 #include "JackExports.h"
 #include "types.h"
 
diff --git a/common/JackFifo.cpp b/common/JackFifo.cpp
index c82f613d..de6a494a 100644
--- a/common/JackFifo.cpp
+++ b/common/JackFifo.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <stdio.h>
 
 namespace Jack
 {
diff --git a/common/JackFifo.h b/common/JackFifo.h
index 315ef71a..b0534ea0 100644
--- a/common/JackFifo.h
+++ b/common/JackFifo.h
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSynchro.h"
 #include "JackExports.h"
 #include <assert.h>
-#include <stdio.h>
 #include <poll.h>
 
 namespace Jack
diff --git a/common/JackPosixSemaphore.cpp b/common/JackPosixSemaphore.cpp
index ae999c05..aed33e21 100644
--- a/common/JackPosixSemaphore.cpp
+++ b/common/JackPosixSemaphore.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackConstants.h"
 #include "JackError.h"
 #include <fcntl.h>
+#include <stdio.h>
 #include <sys/time.h>
 
 namespace Jack
diff --git a/common/JackPosixSemaphore.h b/common/JackPosixSemaphore.h
index 4110c308..0a20ed84 100644
--- a/common/JackPosixSemaphore.h
+++ b/common/JackPosixSemaphore.h
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackExports.h"
 #include <semaphore.h>
 #include <time.h>
-#include <stdio.h>
 #include <assert.h>
 
 namespace Jack
diff --git a/common/JackRequest.h b/common/JackRequest.h
index 84f7df08..d9dc6f21 100644
--- a/common/JackRequest.h
+++ b/common/JackRequest.h
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "JackConstants.h"
 #include "JackPlatformChannelTransaction.h"
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 namespace Jack
 {
diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
index 40bb345f..480bde7f 100644
--- a/common/JackServerGlobals.cpp
+++ b/common/JackServerGlobals.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackTools.h"
 #include "shm.h"
 #include <getopt.h>
-#include <stdio.h>
+//#include <stdio.h>
 #include <errno.h>
 
 static char* server_name = NULL;
diff --git a/common/JackSocket.cpp b/common/JackSocket.cpp
index c60dc895..ceaddb81 100644
--- a/common/JackSocket.cpp
+++ b/common/JackSocket.cpp
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackSocket.h"
 #include "JackError.h"
 #include <string.h>
+#include <stdio.h>
 
 namespace Jack
 {
diff --git a/common/JackSocket.h b/common/JackSocket.h
index 78a3d673..a2b50694 100644
--- a/common/JackSocket.h
+++ b/common/JackSocket.h
@@ -28,10 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <arpa/inet.h>
 #include <errno.h>
 #include <unistd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+//#include <signal.h>
+//#include <stdlib.h>
+//#include <string.h>
 
 namespace Jack
 {
diff --git a/common/JackSocketServerChannel.cpp b/common/JackSocketServerChannel.cpp
index 4ce8387b..7701808b 100644
--- a/common/JackSocketServerChannel.cpp
+++ b/common/JackSocketServerChannel.cpp
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackClient.h"
 #include "JackNotification.h"
 #include <assert.h>
+#include <signal.h>
 
 using namespace std;
 
diff --git a/common/JackTools.cpp b/common/JackTools.cpp
index 747f3127..41688d3e 100644
--- a/common/JackTools.cpp
+++ b/common/JackTools.cpp
@@ -21,16 +21,16 @@
 #include "config.h"
 #endif
 
+#include "JackConstants.h"
 #include "JackTools.h"
 #include "JackError.h"
 #include <stdlib.h>
+#include <stdio.h>
 
 #ifdef WIN32
 #include <process.h>
 #endif
 
-#include "JackConstants.h"
-
 namespace Jack
 {
 
diff --git a/windows/JackWinEvent.cpp b/windows/JackWinEvent.cpp
index e4c8e981..13c83d5b 100644
--- a/windows/JackWinEvent.cpp
+++ b/windows/JackWinEvent.cpp
@@ -23,6 +23,7 @@ This program is free software; you can redistribute it and/or modify
 
 #include "JackWinEvent.h"
 #include "JackError.h"
+#include <assert.h>
 
 // http://www.codeproject.com/win32/Win32_Event_Handling.asp
 // http://www.codeproject.com/threads/Synchronization.asp
diff --git a/windows/JackWinEvent.h b/windows/JackWinEvent.h
index f2cfd97e..35fcb2f7 100644
--- a/windows/JackWinEvent.h
+++ b/windows/JackWinEvent.h
@@ -22,13 +22,11 @@ This program is free software; you can redistribute it and/or modify
 
 #include "JackSynchro.h"
 #include <windows.h>
-#include <stdio.h>
-#include <assert.h>
 
 namespace Jack
 {
 
-//http://bob.developpez.com/tutapiwin/article_56.php
+// http://bob.developpez.com/tutapiwin/article_56.php
 
 /*!
 \brief Inter process synchronization using system wide events.
diff --git a/windows/JackWinNamedPipe.h b/windows/JackWinNamedPipe.h
index 576b1336..864b6c94 100644
--- a/windows/JackWinNamedPipe.h
+++ b/windows/JackWinNamedPipe.h
@@ -20,8 +20,6 @@ This program is free software; you can redistribute it and/or modify
 #ifndef __JackWinNamedPipe__
 #define __JackWinNamedPipe__
 
-#include <assert.h>
-#include <stdio.h>
 #include <windows.h>
 
 namespace Jack
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 988e7bc1..0a8701c4 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -23,7 +23,6 @@ Copyright (C) 2004-2006 Grame
 #include "JackChannel.h"
 #include "JackWinNamedPipe.h"
 #include "JackPlatformThread.h"
-#include <map>
 #include <list>
 
 namespace Jack
diff --git a/windows/JackWinSemaphore.h b/windows/JackWinSemaphore.h
index 1abdb414..45b84e08 100644
--- a/windows/JackWinSemaphore.h
+++ b/windows/JackWinSemaphore.h
@@ -22,7 +22,6 @@ This program is free software; you can redistribute it and/or modify
 
 #include "JackSynchro.h"
 #include <windows.h>
-#include <stdio.h>
 #include <assert.h>
 
 namespace Jack