diff --git a/include/pocketpy/common/chunkedvector.h b/include/pocketpy/common/chunkedvector.h
index f82f54db..682210b7 100644
--- a/include/pocketpy/common/chunkedvector.h
+++ b/include/pocketpy/common/chunkedvector.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "pocketpy/export.h"
 #include "pocketpy/common/vector.h"
 typedef struct c11_chunkedvector_chunk {
     int length;
diff --git a/include/pocketpy/xmacros/fixedhash.h b/include/pocketpy/xmacros/fixedhash.h
index bcd0542b..9351e822 100644
--- a/include/pocketpy/xmacros/fixedhash.h
+++ b/include/pocketpy/xmacros/fixedhash.h
@@ -104,4 +104,17 @@ V* METHOD(try_get)(NAME* self, K key) {
     return NULL;
 }
 
-#endif
\ No newline at end of file
+#endif
+
+/* Undefine all macros */
+#undef KV
+#undef METHOD
+#undef CONCAT
+#undef CONCAT_
+
+#undef K
+#undef V
+#undef NAME
+#undef less
+#undef partial_less
+#undef equal