diff --git a/common/JackMidiRawInputWriteQueue.cpp b/common/JackMidiRawInputWriteQueue.cpp
index 63bc79b4..5c76f8b4 100644
--- a/common/JackMidiRawInputWriteQueue.cpp
+++ b/common/JackMidiRawInputWriteQueue.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include <new>
 
 #include "JackMidiRawInputWriteQueue.h"
+#include "JackError.h"
 
 using Jack::JackMidiRawInputWriteQueue;
 
diff --git a/common/JackNetInterface.h b/common/JackNetInterface.h
index 5f76c7ef..b42f72c9 100644
--- a/common/JackNetInterface.h
+++ b/common/JackNetInterface.h
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #define __JackNetInterface__
 
 #include "JackNetTool.h"
+#include <limits.h>
 
 namespace Jack
 {
diff --git a/linux/alsarawmidi/JackALSARawMidiDriver.cpp b/linux/alsarawmidi/JackALSARawMidiDriver.cpp
index 34b1a05b..b9288bd5 100644
--- a/linux/alsarawmidi/JackALSARawMidiDriver.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiDriver.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackEngineControl.h"
 #include "JackError.h"
 #include "JackMidiUtil.h"
+#include "driver_interface.h"
 
 using Jack::JackALSARawMidiDriver;
 
diff --git a/linux/alsarawmidi/JackALSARawMidiInputPort.cpp b/linux/alsarawmidi/JackALSARawMidiInputPort.cpp
index aab449cb..441c9186 100644
--- a/linux/alsarawmidi/JackALSARawMidiInputPort.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiInputPort.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiInputPort.h"
 #include "JackMidiUtil.h"
+#include "JackError.h"
 
 using Jack::JackALSARawMidiInputPort;
 
diff --git a/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp b/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp
index 2da57fde..7d48a505 100644
--- a/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiOutputPort.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <memory>
 
 #include "JackALSARawMidiOutputPort.h"
+#include "JackError.h"
 
 using Jack::JackALSARawMidiOutputPort;
 
diff --git a/linux/alsarawmidi/JackALSARawMidiSendQueue.cpp b/linux/alsarawmidi/JackALSARawMidiSendQueue.cpp
index e234af89..00438dc9 100644
--- a/linux/alsarawmidi/JackALSARawMidiSendQueue.cpp
+++ b/linux/alsarawmidi/JackALSARawMidiSendQueue.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiSendQueue.h"
 #include "JackMidiUtil.h"
+#include "JackError.h"
 
 using Jack::JackALSARawMidiSendQueue;
 
diff --git a/posix/JackPosixMutex.h b/posix/JackPosixMutex.h
index 79e6958e..a7fb00eb 100644
--- a/posix/JackPosixMutex.h
+++ b/posix/JackPosixMutex.h
@@ -23,6 +23,8 @@
 #define __JackPosixMutex__
 
 #include "JackException.h"
+#include "JackCompilerDeps.h"
+
 #include <pthread.h>
 #include <stdio.h>
 #include <assert.h>
@@ -33,7 +35,7 @@ namespace Jack
 \brief Mutex abstraction.
 */
 
-class JackBasePosixMutex
+class SERVER_EXPORT JackBasePosixMutex
 {
 
     protected:
@@ -60,7 +62,7 @@ class JackBasePosixMutex
 
 };
 
-class JackPosixMutex
+class SERVER_EXPORT JackPosixMutex
 {
     protected: