diff --git a/modules/acore/framework/Define.h b/modules/acore/framework/Define.h
index 3056e257d..a5e99460a 100644
--- a/modules/acore/framework/Define.h
+++ b/modules/acore/framework/Define.h
@@ -7,12 +7,15 @@
 #ifndef TRINITY_DEFINE_H
 #define TRINITY_DEFINE_H
 
+#include <cstdint>
+#include <cstddef>
+#include <sys/types.h>
+#include <ace/ACE_export.h>
+#include <ace/Default_Constants.h>
+
 #include "CompilerDefs.h"
 
-#include <ace/Basic_Types.h>
-#include <ace/ACE_export.h>
 
-#include <cstddef>
 
 #if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
 #define OS_WIN
@@ -70,13 +73,13 @@
 
 #define SIZEFMTD ACE_SIZE_T_FORMAT_SPECIFIER
 
-typedef ACE_INT64 int64;
-typedef ACE_INT32 int32;
-typedef ACE_INT16 int16;
-typedef ACE_INT8 int8;
-typedef ACE_UINT64 uint64;
-typedef ACE_UINT32 uint32;
-typedef ACE_UINT16 uint16;
-typedef ACE_UINT8 uint8;
+typedef std::int64_t int64;
+typedef std::int32_t int32;
+typedef std::int16_t int16;
+typedef std::int8_t int8;
+typedef std::uint64_t uint64;
+typedef std::uint32_t uint32;
+typedef std::uint16_t uint16;
+typedef std::uint8_t uint8;
 
 #endif //TRINITY_DEFINE_H