diff --git a/contrib/extractor/ad.exe b/contrib/extractor/ad.exe
index 208eb2da0..608392aec 100755
Binary files a/contrib/extractor/ad.exe and b/contrib/extractor/ad.exe differ
diff --git a/contrib/extractor/loadlib/loadlib.h b/contrib/extractor/loadlib/loadlib.h
index 6acfd107e..537317534 100644
--- a/contrib/extractor/loadlib/loadlib.h
+++ b/contrib/extractor/loadlib/loadlib.h
@@ -3,26 +3,28 @@
 
 #ifdef WIN32
 typedef __int64            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
 typedef unsigned __int64   uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
 #else
 #include <stdint.h>
 #ifndef uint64_t 
+#ifdef __linux__
 #include <linux/types.h> 
 #endif
+#endif
 typedef int64_t            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef int32_t            int32;
+typedef int16_t            int16;
+typedef int8_t             int8;
 typedef uint64_t           uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef uint32_t           uint32;
+typedef uint16_t           uint16;
+typedef uint8_t            uint8;
 #endif
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 65a4f25fe..b71949d83 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8619"
+ #define REVISION_NR "8620"
 #endif // __REVISION_NR_H__