diff --git a/extlib/benz/include/picrin.h b/extlib/benz/include/picrin.h
index 2a75d496..19fe9e16 100644
--- a/extlib/benz/include/picrin.h
+++ b/extlib/benz/include/picrin.h
@@ -34,20 +34,6 @@ extern "C" {
 
 #include <stdio.h>
 
-#if __STDC_VERSION__ >= 199901L
-# include <stdbool.h>
-#else
-# define bool char
-# define true 1
-# define false 0
-#endif
-
-#if __STDC_VERSION__ >= 199901L
-# include <stddef.h>
-#elif ! defined(offsetof)
-# define offsetof(s,m) ((size_t)&(((s *)NULL)->m))
-#endif
-
 #include "picrin/config.h"
 #include "picrin/util.h"
 #include "picrin/compat.h"
diff --git a/extlib/benz/include/picrin/util.h b/extlib/benz/include/picrin/util.h
index 2b69b206..a04c2813 100644
--- a/extlib/benz/include/picrin/util.h
+++ b/extlib/benz/include/picrin/util.h
@@ -9,6 +9,20 @@
 extern "C" {
 #endif
 
+#if __STDC_VERSION__ >= 199901L
+# include <stdbool.h>
+#else
+# define bool char
+# define true 1
+# define false 0
+#endif
+
+#if __STDC_VERSION__ >= 199901L
+# include <stddef.h>
+#elif ! defined(offsetof)
+# define offsetof(s,m) ((size_t)&(((s *)NULL)->m))
+#endif
+
 #if __STDC_VERSION__ >= 201112L
 # include <stdnoreturn.h>
 # define PIC_NORETURN noreturn