diff --git a/Engine/Hash64.h b/Engine/Hash64.h
index d01fd917c7..fdee8071e7 100644
--- a/Engine/Hash64.h
+++ b/Engine/Hash64.h
@@ -29,9 +29,6 @@
 #include "Global/Macros.h"
 
 #include <vector>
-#if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
-#include <boost/static_assert.hpp>
-#endif
 
 #include "Global/GlobalDefines.h"
 
@@ -74,9 +71,7 @@ class Hash64
     template<typename T>
     static U64 toU64(T value)
     {
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF
-            BOOST_STATIC_ASSERT(sizeof(T) <= 8);
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
+        static_assert(sizeof(T) <= 8, "Type too large");
         alias_cast_t<T> ac;
 
         ac.data = value;
diff --git a/Engine/TrackerContext.cpp b/Engine/TrackerContext.cpp
index 9fb896b606..a3a7ff91cf 100644
--- a/Engine/TrackerContext.cpp
+++ b/Engine/TrackerContext.cpp
@@ -29,13 +29,6 @@
 #include <set>
 #include <sstream> // stringstream
 
-#if !defined(SBK_RUN) && !defined(Q_MOC_RUN)
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF
-// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef]
-#include <boost/bind/bind.hpp>
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
-#endif
-
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QtCore/QWaitCondition>
diff --git a/Global/GlobalDefines.h b/Global/GlobalDefines.h
index a25796b080..330f1392f6 100644
--- a/Global/GlobalDefines.h
+++ b/Global/GlobalDefines.h
@@ -48,7 +48,7 @@
 #undef isalnum
 
 #if !defined(Q_MOC_RUN) && !defined(SBK_RUN)
-#include <boost/cstdint.hpp>
+#include <cstdint>
 #endif
 #include <QtCore/QtGlobal>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)