diff --git a/amalgamate.py b/amalgamate.py
index 398b91e8..fd4054a3 100644
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -7,7 +7,7 @@ from typing import List, Dict
 
 assert os.system("python prebuild.py") == 0
 
-with open("include/pocketpy/opcodes.h", "rt", encoding='utf-8') as f:
+with open("include/pocketpy/xmacros/opcodes.h", "rt", encoding='utf-8') as f:
 	OPCODES_TEXT = '\n' + f.read() + '\n'
 
 class Header:
diff --git a/include/pocketpy/objects/codeobject.hpp b/include/pocketpy/objects/codeobject.hpp
index f4b5c743..a6cf5eff 100644
--- a/include/pocketpy/objects/codeobject.hpp
+++ b/include/pocketpy/objects/codeobject.hpp
@@ -21,7 +21,7 @@ enum NameScope { NAME_LOCAL, NAME_GLOBAL, NAME_GLOBAL_UNKNOWN };
 enum Opcode : uint8_t {
 
 #define OPCODE(name) OP_##name,
-#include "pocketpy/opcodes.h"
+#include "pocketpy/xmacros/opcodes.h"
 #undef OPCODE
 };
 
diff --git a/include/pocketpy/opcodes.h b/include/pocketpy/xmacros/opcodes.h
similarity index 100%
rename from include/pocketpy/opcodes.h
rename to include/pocketpy/xmacros/opcodes.h
diff --git a/include/pocketpy/xmacros/smallmap.h b/include/pocketpy/xmacros/smallmap.h
index 37517ec1..3de4628d 100644
--- a/include/pocketpy/xmacros/smallmap.h
+++ b/include/pocketpy/xmacros/smallmap.h
@@ -102,6 +102,8 @@ void SMALLMAP_METHOD(clear)(SMALLMAP* self) {
 #undef KV
 #undef SMALLMAP
 #undef SMALLMAP_METHOD
+#undef CONCAT
+#undef CONCAT_
 
 #undef K
 #undef V
diff --git a/src/interpreter/vm.cpp b/src/interpreter/vm.cpp
index 3f2edb76..6cd04d61 100644
--- a/src/interpreter/vm.cpp
+++ b/src/interpreter/vm.cpp
@@ -11,7 +11,7 @@
 
 const static char* OP_NAMES[] = {
 #define OPCODE(name) #name,
-#include "pocketpy/opcodes.h"
+#include "pocketpy/xmacros/opcodes.h"
 #undef OPCODE
 };