diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index 6efd088..05c471a 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -106,31 +106,36 @@
 //  ------------------------------------------------------------------
 //  Supplements for the built-in types
 
-typedef   signed char   schar;
-typedef unsigned char   uchar;
-typedef unsigned short ushort;
-typedef unsigned int     uint;
-typedef unsigned long   ulong;
-
-typedef unsigned char  bit;
-
 #ifdef _MSC_VER
-typedef uchar      uint8_t;
-typedef schar       int8_t;
-typedef ushort    uint16_t;
-typedef short      int16_t;
-typedef  INT       int32_t;
-typedef UINT      uint32_t;
+typedef   signed char   int8_t;
+typedef unsigned char  uint8_t;
+typedef   signed short  int16_t;
+typedef unsigned short uint16_t;
+typedef   signed long   int32_t;
+typedef unsigned long  uint32_t;
 #endif
 
-typedef uint8_t    byte;
-typedef  int8_t   sbyte;
-typedef uint16_t   word;
-typedef  int16_t  sword;
-typedef uint32_t  dword;
-typedef  int32_t sdword;
+typedef   signed int sint;
+typedef unsigned int uint;
 
-typedef uint32_t time32_t;   /* 32-bit time_t type */
+typedef uint8_t   bit;
+
+typedef  int8_t   sbyte;
+typedef uint8_t   byte;
+typedef  int8_t   schar;
+typedef uint8_t   uchar;
+
+typedef  int16_t  sword;
+typedef uint16_t  word;
+typedef  int16_t  sshort;
+typedef uint16_t  ushort;
+
+typedef  int32_t  sdword;
+typedef uint32_t  dword;
+typedef  int32_t  slong;
+typedef uint32_t  ulong;
+
+typedef uint32_t  time32_t;   /* 32-bit time_t type */
 
 //  ------------------------------------------------------------------
 //  Common function-pointer types
diff --git a/goldlib/msgidlib/typedefs.h b/goldlib/msgidlib/typedefs.h
index 0d6f1f9..c93d323 100755
--- a/goldlib/msgidlib/typedefs.h
+++ b/goldlib/msgidlib/typedefs.h
@@ -3,33 +3,34 @@
 #ifndef __TYPEDEFS_H__
 #define __TYPEDEFS_H__
 
+#ifndef __goldall_h
 #ifdef _MSC_VER
 #include <windows.h>
 
-typedef UCHAR      uint8_t;
-typedef signed char int8_t;
-typedef WORD      uint16_t;
-typedef short      int16_t;
-typedef  INT       int32_t;
-typedef UINT      uint32_t;
+typedef   signed char   int8_t;
+typedef unsigned char  uint8_t;
+typedef   signed short  int16_t;
+typedef unsigned short uint16_t;
+typedef   signed long   int32_t;
+typedef unsigned long  uint32_t;
 
 #else
 #include <stdint.h>
-#endif
+#endif  //#ifdef _MSC_VER
 
-typedef unsigned char bit;
+typedef uint8_t   bit;
 
-typedef uint8_t byte;
+typedef  int8_t   sbyte;
+typedef uint8_t   byte;
 
-typedef int8_t sbyte;
+typedef  int16_t  sword;
+typedef uint16_t  word;
+typedef  int16_t  sshort;
+typedef uint16_t  ushort;
 
-typedef uint16_t word;
-typedef int16_t sword;
+typedef  int32_t  sdword;
+typedef uint32_t  dword;
 
-typedef uint32_t dword;
-typedef int32_t sdword;
+#endif  //#ifndef __goldall_h
 
-typedef uint16_t ushort;
-typedef int16_t  sshort;
-
-#endif
+#endif  //#ifndef __TYPEDEFS_H__
diff --git a/goldlib/smblib/smbdefs.h b/goldlib/smblib/smbdefs.h
index c83e984..123d782 100644
--- a/goldlib/smblib/smbdefs.h
+++ b/goldlib/smblib/smbdefs.h
@@ -44,29 +44,34 @@
 #ifdef _MSC_VER
 #include <windows.h>
 
-typedef UCHAR      uint8_t;
-typedef signed char int8_t;
-typedef WORD      uint16_t;
-typedef short      int16_t;
-typedef  INT       int32_t;
-typedef UINT      uint32_t;
+typedef   signed char   int8_t;
+typedef unsigned char  uint8_t;
+typedef   signed short  int16_t;
+typedef unsigned short uint16_t;
+typedef   signed long   int32_t;
+typedef unsigned long  uint32_t;
 
 #else
 #include <stdint.h>
-#endif
+#endif  //#ifdef _MSC_VER
 
+typedef   signed int sint;
 typedef unsigned int uint;
-typedef signed int   sint;
-typedef unsigned char bit;
-typedef uint8_t byte;
-typedef int8_t sbyte;
-typedef uint16_t word;
-typedef int16_t sword;
-typedef uint32_t dword;
-typedef int32_t sdword;
-typedef uint16_t ushort;
-typedef int16_t  sshort;
-#endif
+
+typedef uint8_t   bit;
+
+typedef  int8_t   sbyte;
+typedef uint8_t   byte;
+
+typedef  int16_t  sword;
+typedef uint16_t  word;
+typedef  int16_t  sshort;
+typedef uint16_t  ushort;
+
+typedef  int32_t  sdword;
+typedef uint32_t  dword;
+
+#endif  //#ifndef __goldall_h
 
 /**********/
 /* Macros */