diff --git a/CMakeLists.txt b/CMakeLists.txt
index 934e304..a9e521d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ if (NOT CONFIGURED_ONCE)
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
             "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         set(compiler_specific "-Werror")
-        set(compiler_specific_cxx "-std=c++0x")
+        set(compiler_specific_cxx "-std=c++14")
     elseif (MSVC)
         set(compiler_specific "/WX /W4 /D_CRT_SECURE_NO_WARNINGS")
     endif ()
diff --git a/Zydis/ZydisAPI.cpp b/Zydis/ZydisAPI.cpp
index e26dc26..a859dce 100644
--- a/Zydis/ZydisAPI.cpp
+++ b/Zydis/ZydisAPI.cpp
@@ -126,7 +126,7 @@ public:
     static FullClassT* fromInstance(ZydisClassT* instance)
     {
         return reinterpret_cast<FullClassT*>(
-            reinterpret_cast<uintptr_t>(instance) - offsetof(FullClassT, instance));
+            reinterpret_cast<uintptr_t>(instance) - sizeof(std::declval<FullClassT>().type));
     }
 };
 #pragma pack(pop)
diff --git a/Zydis/ZydisAPI.h b/Zydis/ZydisAPI.h
index a5a8b29..359a87b 100644
--- a/Zydis/ZydisAPI.h
+++ b/Zydis/ZydisAPI.h
@@ -33,8 +33,9 @@
 
 #define Zydis_EXPORTS
 
-#include <cstdbool>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stddef.h>
 #include "ZydisExportConfig.h"
 
 #ifdef __cplusplus
diff --git a/Zydis/ZydisSymbolResolver.cpp b/Zydis/ZydisSymbolResolver.cpp
index 08b0938..94b9a9f 100644
--- a/Zydis/ZydisSymbolResolver.cpp
+++ b/Zydis/ZydisSymbolResolver.cpp
@@ -88,4 +88,4 @@ void ExactSymbolResolver::clear()
 
 /* ============================================================================================== */
 
-}
\ No newline at end of file
+}
diff --git a/Zydis/ZydisSymbolResolver.hpp b/Zydis/ZydisSymbolResolver.hpp
index d825863..e3d2a2e 100644
--- a/Zydis/ZydisSymbolResolver.hpp
+++ b/Zydis/ZydisSymbolResolver.hpp
@@ -31,6 +31,7 @@
 #ifndef _ZYDIS_SYMBOLRESOLVER_HPP_
 #define _ZYDIS_SYMBOLRESOLVER_HPP_
 
+#include <string>
 #include <unordered_map>
 #include "ZydisTypes.hpp"