diff --git a/library/DataStaticsFields.cpp b/library/DataStaticsFields.cpp
index 11a270251..8ff0770fc 100644
--- a/library/DataStaticsFields.cpp
+++ b/library/DataStaticsFields.cpp
@@ -18,21 +18,16 @@ namespace df {
 
 #ifndef STATIC_FIELDS_GROUP
     INTEGER_IDENTITY_TRAITS(char);
-    INTEGER_IDENTITY_TRAITS(int8_t);
-    INTEGER_IDENTITY_TRAITS(uint8_t);
-    INTEGER_IDENTITY_TRAITS(int16_t);
-    INTEGER_IDENTITY_TRAITS(uint16_t);
-    INTEGER_IDENTITY_TRAITS(int32_t);
-    INTEGER_IDENTITY_TRAITS(uint32_t);
-    INTEGER_IDENTITY_TRAITS(int64_t);
-    INTEGER_IDENTITY_TRAITS(uint64_t);
-#ifdef _WIN32
+    INTEGER_IDENTITY_TRAITS(signed char);
+    INTEGER_IDENTITY_TRAITS(unsigned char);
+    INTEGER_IDENTITY_TRAITS(short);
+    INTEGER_IDENTITY_TRAITS(unsigned short);
+    INTEGER_IDENTITY_TRAITS(int);
+    INTEGER_IDENTITY_TRAITS(unsigned int);
     INTEGER_IDENTITY_TRAITS(long);
     INTEGER_IDENTITY_TRAITS(unsigned long);
-#else
-    INTEGER_IDENTITY_TRAITS(intptr_t);
-    INTEGER_IDENTITY_TRAITS(uintptr_t);
-#endif
+    INTEGER_IDENTITY_TRAITS(long long);
+    INTEGER_IDENTITY_TRAITS(unsigned long long);
     FLOAT_IDENTITY_TRAITS(float);
     FLOAT_IDENTITY_TRAITS(double);
 
diff --git a/library/include/DataIdentity.h b/library/include/DataIdentity.h
index a04311ac4..556731e46 100644
--- a/library/include/DataIdentity.h
+++ b/library/include/DataIdentity.h
@@ -516,21 +516,16 @@ namespace df
 #define FLOAT_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(float, type)
 
     INTEGER_IDENTITY_TRAITS(char);
-    INTEGER_IDENTITY_TRAITS(int8_t);
-    INTEGER_IDENTITY_TRAITS(uint8_t);
-    INTEGER_IDENTITY_TRAITS(int16_t);
-    INTEGER_IDENTITY_TRAITS(uint16_t);
-    INTEGER_IDENTITY_TRAITS(int32_t);
-    INTEGER_IDENTITY_TRAITS(uint32_t);
-    INTEGER_IDENTITY_TRAITS(int64_t);
-    INTEGER_IDENTITY_TRAITS(uint64_t);
-#ifdef _WIN32
+    INTEGER_IDENTITY_TRAITS(signed char);
+    INTEGER_IDENTITY_TRAITS(unsigned char);
+    INTEGER_IDENTITY_TRAITS(short);
+    INTEGER_IDENTITY_TRAITS(unsigned short);
+    INTEGER_IDENTITY_TRAITS(int);
+    INTEGER_IDENTITY_TRAITS(unsigned int);
     INTEGER_IDENTITY_TRAITS(long);
     INTEGER_IDENTITY_TRAITS(unsigned long);
-#else
-    INTEGER_IDENTITY_TRAITS(intptr_t);
-    INTEGER_IDENTITY_TRAITS(uintptr_t);
-#endif
+    INTEGER_IDENTITY_TRAITS(long long);
+    INTEGER_IDENTITY_TRAITS(unsigned long long);
     FLOAT_IDENTITY_TRAITS(float);
     FLOAT_IDENTITY_TRAITS(double);