diff --git a/CMakeLists.txt b/CMakeLists.txt
index a13fa7f..5d7c2c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,12 +109,12 @@ target_sources("Zydis"
         "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Utils.h"
         "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Zydis.h"
         "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Internal/LibC.h"
+        "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Internal/SharedData.h"
+        "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Internal/InternalTypes.h"
     PRIVATE
-        "src/InternalTypes.h"
         "src/MetaInfo.c"
         "src/Mnemonic.c"
         "src/Register.c"
-        "src/SharedData.h"
         "src/SharedData.c"
         "src/String.c"
         "src/Utils.c"
@@ -126,9 +126,9 @@ if (ZYDIS_FEATURE_DECODER)
             "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Decoder.h"
             "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/DecoderTypes.h"
             "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Formatter.h"
+            "${CMAKE_CURRENT_LIST_DIR}/include/Zydis/Internal/DecoderData.h"
         PRIVATE 
             "src/Decoder.c"
-            "src/DecoderData.h"
             "src/DecoderData.c"
             "src/Formatter.c")
 endif ()
diff --git a/src/DecoderData.h b/include/Zydis/Internal/DecoderData.h
similarity index 98%
rename from src/DecoderData.h
rename to include/Zydis/Internal/DecoderData.h
index ec54d69..0062607 100644
--- a/src/DecoderData.h
+++ b/include/Zydis/Internal/DecoderData.h
@@ -24,8 +24,8 @@
 
 ***************************************************************************************************/
 
-#ifndef ZYDIS_DECODERDATA_H
-#define ZYDIS_DECODERDATA_H
+#ifndef ZYDIS_INTERNAL_DECODERDATA_H
+#define ZYDIS_INTERNAL_DECODERDATA_H
 
 #include <Zydis/Defines.h>
 #include <Zydis/DecoderTypes.h>
@@ -311,4 +311,4 @@ ZYDIS_NO_EXPORT void ZydisGetInstructionEncodingInfo(const ZydisDecoderTreeNode*
 }
 #endif
 
-#endif /* ZYDIS_DECODERDATA_H */
+#endif /* ZYDIS_INTERNAL_DECODERDATA_H */
diff --git a/src/InternalTypes.h b/include/Zydis/Internal/InternalTypes.h
similarity index 96%
rename from src/InternalTypes.h
rename to include/Zydis/Internal/InternalTypes.h
index fe47051..4b1f1c3 100644
--- a/src/InternalTypes.h
+++ b/include/Zydis/Internal/InternalTypes.h
@@ -24,8 +24,8 @@
 
 ***************************************************************************************************/
 
-#ifndef ZYDIS_INTERNALTYPES_H
-#define ZYDIS_INTERNALTYPES_H
+#ifndef ZYDIS_INTERNAL_INTERNALTYPES_H
+#define ZYDIS_INTERNAL_INTERNALTYPES_H
 
 #include <Zydis/CommonTypes.h>
 #include <Zydis/Defines.h>
@@ -100,4 +100,4 @@ ZYDIS_NO_EXPORT ZYDIS_INLINE void ZydisStringInitWithGeneratedString(ZydisString
 }
 #endif
 
-#endif /* ZYDIS_INTERNALTYPES_H */
+#endif /* ZYDIS_INTERNAL_INTERNALTYPES_H */
diff --git a/include/Zydis/Internal/LibC.h b/include/Zydis/Internal/LibC.h
index d79329c..8fabf87 100644
--- a/include/Zydis/Internal/LibC.h
+++ b/include/Zydis/Internal/LibC.h
@@ -24,8 +24,8 @@
 
 ***************************************************************************************************/
 
-#ifndef ZYDIS_LIBC_H
-#define ZYDIS_LIBC_H
+#ifndef ZYDIS_INTERNAL_LIBC_H
+#define ZYDIS_INTERNAL_LIBC_H
 
 #include <Zydis/Defines.h>
 
@@ -79,4 +79,4 @@ ZYDIS_INLINE ZydisUSize ZydisStrLen(const char* str)
 
 #endif
 
-#endif /* ZYDIS_LIBC_H */
+#endif /* ZYDIS_INTERNAL_LIBC_H */
diff --git a/src/SharedData.h b/include/Zydis/Internal/SharedData.h
similarity index 99%
rename from src/SharedData.h
rename to include/Zydis/Internal/SharedData.h
index 386cee3..30325b7 100644
--- a/src/SharedData.h
+++ b/include/Zydis/Internal/SharedData.h
@@ -24,8 +24,8 @@
 
 ***************************************************************************************************/
 
-#ifndef ZYDIS_SHAREDDATA_H
-#define ZYDIS_SHAREDDATA_H
+#ifndef ZYDIS_INTERNAL_SHAREDDATA_H
+#define ZYDIS_INTERNAL_SHAREDDATA_H
 
 #include <Zydis/Defines.h>
 #include <Zydis/Mnemonic.h>
@@ -717,4 +717,4 @@ ZYDIS_NO_EXPORT void ZydisGetAccessedFlags(const ZydisInstructionDefinition* def
 }
 #endif
 
-#endif /* ZYDIS_SHAREDDATA_H */
+#endif /* ZYDIS_INTERNAL_SHAREDDATA_H */
diff --git a/src/Decoder.c b/src/Decoder.c
index 752fbde..d4d2a9e 100644
--- a/src/Decoder.c
+++ b/src/Decoder.c
@@ -27,8 +27,8 @@
 #include <Zydis/Decoder.h>
 #include <Zydis/Status.h>
 #include <Zydis/Internal/LibC.h>
-#include <DecoderData.h>
-#include <SharedData.h>
+#include <Zydis/Internal/DecoderData.h>
+#include <Zydis/Internal/SharedData.h>
 
 /* ============================================================================================== */
 /* Internal enums and types                                                                       */
diff --git a/src/DecoderData.c b/src/DecoderData.c
index c0d9b91..6946fb0 100644
--- a/src/DecoderData.c
+++ b/src/DecoderData.c
@@ -24,7 +24,7 @@
 
 ***************************************************************************************************/
 
-#include <DecoderData.h>
+#include <Zydis/Internal/DecoderData.h>
 
 /* ============================================================================================== */
 /* Data tables                                                                                    */
diff --git a/src/Mnemonic.c b/src/Mnemonic.c
index e07ff42..5b8732b 100644
--- a/src/Mnemonic.c
+++ b/src/Mnemonic.c
@@ -25,7 +25,7 @@
 ***************************************************************************************************/
 
 #include <Zydis/Mnemonic.h>
-#include <InternalTypes.h>
+#include <Zydis/Internal/InternalTypes.h>
 
 #include <Generated/EnumMnemonic.inc>
 
diff --git a/src/SharedData.c b/src/SharedData.c
index 3e79f0e..9c98246 100644
--- a/src/SharedData.c
+++ b/src/SharedData.c
@@ -24,7 +24,7 @@
 
 ***************************************************************************************************/
 
-#include <SharedData.h>
+#include <Zydis/Internal/SharedData.h>
 
 /* ============================================================================================== */
 /* Data tables                                                                                    */