diff --git a/common/JackActivationCount.h b/common/JackActivationCount.h
index 341220bf..be21144c 100644
--- a/common/JackActivationCount.h
+++ b/common/JackActivationCount.h
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackSynchro.h"
 #include "JackTime.h"
+#include "JackTypes.h"
 
 namespace Jack
 {
diff --git a/common/JackAtomic.h b/common/JackAtomic.h
index bba3b5d9..4b8326ad 100644
--- a/common/JackAtomic.h
+++ b/common/JackAtomic.h
@@ -20,13 +20,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackAtomic__
 #define __JackAtomic__
 
+#include "JackTypes.h"
+
+/*
 typedef unsigned short UInt16;
 #if __LP64__
-typedef unsigned int       UInt32;
-typedef signed int         SInt32;
+typedef unsigned int UInt32;
+typedef signed int   SInt32;
 #else
-typedef unsigned long      UInt32;
-typedef signed long        SInt32;
+typedef unsigned long UInt32;
+typedef signed long   SInt32;
 #endif
 
 #ifdef WIN32
@@ -35,6 +38,7 @@ typedef ULONGLONG UInt64;
 #else
 typedef unsigned long long UInt64;
 #endif
+*/
 
 #if defined(__APPLE__)
 
diff --git a/common/JackConstants.h b/common/JackConstants.h
index 5d9c91de..45df3be3 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -85,12 +85,14 @@ namespace Jack
 
 typedef uint16_t jack_int_t;  // Internal type for ports and refnum
 
+/*
 typedef enum {
     NotTriggered,
     Triggered,
     Running,
     Finished,
 } jack_client_state_t;
+*/
 
 } // end of namespace
 
diff --git a/common/JackTypes.h b/common/JackTypes.h
index 96c4c41f..214b9ee1 100644
--- a/common/JackTypes.h
+++ b/common/JackTypes.h
@@ -21,6 +21,23 @@
 #ifndef __JackTypes__
 #define __JackTypes__
 
+typedef unsigned short UInt16;
+#if __LP64__
+typedef unsigned int UInt32;
+typedef signed int   SInt32;
+#else
+typedef unsigned long UInt32;
+typedef signed long   SInt32;
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+typedef ULONGLONG UInt64;
+#else
+typedef unsigned long long UInt64;
+#endif
+
+
 namespace Jack
 {