diff --git a/include/pocketpy/objects/container.h b/include/pocketpy/objects/container.h
index 3d33c3ac..dcc11538 100644
--- a/include/pocketpy/objects/container.h
+++ b/include/pocketpy/objects/container.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include "pocketpy/objects/base.h"
-#include "pocketpy/common/vector.h"
-#include "pocketpy/pocketpy.h"
+#include "pocketpy/common/chunkedvector.h"
+#include "pocketpy/config.h"
+#include <stdint.h>
 
 #define FIXEDHASH_T__HEADER
 #define K py_Name
diff --git a/include/pocketpy/xmacros/fixedhash.h b/include/pocketpy/xmacros/fixedhash.h
index 1a6ae600..7713e495 100644
--- a/include/pocketpy/xmacros/fixedhash.h
+++ b/include/pocketpy/xmacros/fixedhash.h
@@ -1,9 +1,9 @@
+#if !defined(FIXEDHASH_T__HEADER) && !defined(FIXEDHASH_T__SOURCE)
+
 #include "pocketpy/common/chunkedvector.h"
 #include "pocketpy/config.h"
 #include <stdint.h>
 
-#if !defined(FIXEDHASH_T__HEADER) && !defined(FIXEDHASH_T__SOURCE)
-
 #define FIXEDHASH_T__HEADER
 #define FIXEDHASH_T__SOURCE
 /* Input */
diff --git a/include/pocketpy/xmacros/smallmap.h b/include/pocketpy/xmacros/smallmap.h
index 6a14580f..062b4278 100644
--- a/include/pocketpy/xmacros/smallmap.h
+++ b/include/pocketpy/xmacros/smallmap.h
@@ -1,5 +1,7 @@
 #if !defined(SMALLMAP_T__HEADER) && !defined(SMALLMAP_T__SOURCE)
 #include "pocketpy/common/vector.h"
+#include "pocketpy/common/utils.h"
+#include "pocketpy/config.h"
 
 #define SMALLMAP_T__HEADER
 #define SMALLMAP_T__SOURCE