diff --git a/extlib/benz/include/picrin.h b/extlib/benz/include/picrin.h
index 9975ad65..1784171a 100644
--- a/extlib/benz/include/picrin.h
+++ b/extlib/benz/include/picrin.h
@@ -295,9 +295,6 @@ int xvfprintf(pic_state *, xFILE *fp, const char *fmt, va_list);
 /* extra stuff */
 
 
-typedef struct pic_identifier pic_id;
-typedef pic_id pic_sym;
-
 #include "picrin/state.h"
 
 void *pic_default_allocf(void *, void *, size_t);
diff --git a/extlib/benz/include/picrin/object.h b/extlib/benz/include/picrin/object.h
index 39d9a919..26b3c86b 100644
--- a/extlib/benz/include/picrin/object.h
+++ b/extlib/benz/include/picrin/object.h
@@ -9,6 +9,9 @@
 extern "C" {
 #endif
 
+typedef struct pic_identifier pic_id;
+typedef pic_id pic_sym;
+
 KHASH_DECLARE(env, pic_id *, pic_sym *)
 KHASH_DECLARE(dict, pic_sym *, pic_value)
 KHASH_DECLARE(weak, struct pic_object *, pic_value)
diff --git a/extlib/benz/include/picrin/state.h b/extlib/benz/include/picrin/state.h
index 8d7b6e4a..2d1566da 100644
--- a/extlib/benz/include/picrin/state.h
+++ b/extlib/benz/include/picrin/state.h
@@ -52,7 +52,7 @@ typedef struct {
   struct pic_context *up;
 } pic_callinfo;
 
-KHASH_DECLARE(oblist, struct pic_string *, pic_sym *)
+KHASH_DECLARE(oblist, struct pic_string *, struct pic_identifier *)
 KHASH_DECLARE(ltable, const char *, struct pic_lib)
 
 struct pic_state {