diff --git a/amalgamate.py b/amalgamate.py
index 2d0aa836..1962ed22 100644
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -50,7 +50,7 @@ class Header:
 
 headers: Dict[str, Header] = {}
 
-for path in ['config.h', 'export.h', 'pocketpy.hpp', 'pocketpy_c.h']:
+for path in ['pocketpy.hpp', 'pocketpy_c.h']:
 	headers[path] = Header(path)
 
 directories = ['common', 'objects', 'interpreter', 'compiler', 'modules', 'tools']
diff --git a/docs/2_0_0.md b/docs/2_0_0.md
index dda2df02..eff995ae 100644
--- a/docs/2_0_0.md
+++ b/docs/2_0_0.md
@@ -184,7 +184,7 @@ Please use config macros before `#include "pocketpy.h"` directly.
 #define PK_ENABLE_OS            1
 #define PK_ENABLE_THREAD        1
 #define PK_ENABLE_PROFILER      1
-// for all config macros, please refer to `include/pocketpy/config.h`
+// for all config macros, please refer to `include/pocketpy/common/config.h`
 #include "pocketpy.h"
 ```
 
diff --git a/include/pocketpy/config.h b/include/pocketpy/common/config.h
similarity index 100%
rename from include/pocketpy/config.h
rename to include/pocketpy/common/config.h
diff --git a/include/pocketpy/export.h b/include/pocketpy/common/export.h
similarity index 100%
rename from include/pocketpy/export.h
rename to include/pocketpy/common/export.h
diff --git a/include/pocketpy/common/namedict.hpp b/include/pocketpy/common/namedict.hpp
index aaeacc7f..7ce11673 100644
--- a/include/pocketpy/common/namedict.hpp
+++ b/include/pocketpy/common/namedict.hpp
@@ -2,8 +2,7 @@
 
 #include "pocketpy/common/utils.hpp"
 #include "pocketpy/common/str.hpp"
-
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 
 #include <stdexcept>
 
diff --git a/include/pocketpy/common/version.hpp b/include/pocketpy/common/version.h
similarity index 100%
rename from include/pocketpy/common/version.hpp
rename to include/pocketpy/common/version.h
diff --git a/include/pocketpy/interpreter/gc.hpp b/include/pocketpy/interpreter/gc.hpp
index 30a62c4d..2a3fd0d4 100644
--- a/include/pocketpy/interpreter/gc.hpp
+++ b/include/pocketpy/interpreter/gc.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 #include "pocketpy/common/vector.hpp"
 #include "pocketpy/common/utils.hpp"
 #include "pocketpy/objects/object.hpp"
diff --git a/include/pocketpy/pocketpy_c.h b/include/pocketpy/pocketpy_c.h
index 0f0bfe4e..f894b5d3 100644
--- a/include/pocketpy/pocketpy_c.h
+++ b/include/pocketpy/pocketpy_c.h
@@ -8,7 +8,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "pocketpy/export.h"
+#include "pocketpy/common/export.h"
 
 typedef struct pkpy_vm_handle pkpy_vm;
 typedef int (*pkpy_CFunction)(pkpy_vm*);
diff --git a/src/common/memorypool.cpp b/src/common/memorypool.cpp
index e5137af0..c5cd37c8 100644
--- a/src/common/memorypool.cpp
+++ b/src/common/memorypool.cpp
@@ -1,6 +1,6 @@
 #include "pocketpy/common/memorypool.hpp"
 #include "pocketpy/common/gil.hpp"
-#include "pocketpy/config.h"
+#include "pocketpy/common/config.h"
 
 #include <cstdlib>
 #include <cstring>
diff --git a/src/compiler/compiler.cpp b/src/compiler/compiler.cpp
index 3eb38156..f2dddbe5 100644
--- a/src/compiler/compiler.cpp
+++ b/src/compiler/compiler.cpp
@@ -1,5 +1,5 @@
 #include "pocketpy/compiler/compiler.hpp"
-#include "pocketpy/common/version.hpp"
+#include "pocketpy/common/version.h"
 #include "pocketpy/interpreter/vm.hpp"
 
 #include <stdexcept>
diff --git a/src/modules/modules.cpp b/src/modules/modules.cpp
index 6499b802..b15b45d6 100644
--- a/src/modules/modules.cpp
+++ b/src/modules/modules.cpp
@@ -1,7 +1,7 @@
 #include "pocketpy/modules/modules.hpp"
 #include "pocketpy/interpreter/bindings.hpp"
-#include "pocketpy/common/version.hpp"
-#include "pocketpy/export.h"
+#include "pocketpy/common/version.h"
+#include "pocketpy/common/export.h"
 
 #include "pocketpy/common/_generated.hpp"
 
diff --git a/src/tools/repl.cpp b/src/tools/repl.cpp
index a26c027b..c0f6987d 100644
--- a/src/tools/repl.cpp
+++ b/src/tools/repl.cpp
@@ -1,7 +1,7 @@
 #include "pocketpy/tools/repl.hpp"
 
-#include "pocketpy/common/version.hpp"
-#include "pocketpy/export.h"
+#include "pocketpy/common/version.h"
+#include "pocketpy/common/export.h"
 
 namespace pkpy {
     REPL::REPL(VM* vm) : vm(vm){