diff --git a/include/picrin/port.h b/include/picrin/port.h
index a2c7e472..c421bb11 100644
--- a/include/picrin/port.h
+++ b/include/picrin/port.h
@@ -23,9 +23,6 @@ struct pic_port {
 };
 
 #define pic_port_p(v) (pic_type(v) == PIC_TT_PORT)
-#define pic_env_p(v) (pic_type(v) == PIC_TT_ENV)
-
 #define pic_port_ptr(v) ((struct pic_port *)(v).u.data)
-#define pic_env_ptr(v) ((struct pic_env *)(v).u.data)
 
 #endif
diff --git a/include/picrin/proc.h b/include/picrin/proc.h
index 56db1772..e92ad6c8 100644
--- a/include/picrin/proc.h
+++ b/include/picrin/proc.h
@@ -19,8 +19,10 @@ struct pic_proc {
 };
 
 #define pic_proc_p(o) (pic_type(o) == PIC_TT_PROC)
+#define pic_env_p(o) (pic_type(o) == PIC_TT_ENV)
 
 #define pic_proc_ptr(o) ((struct pic_proc *)(o).u.data)
+#define pic_env_ptr(o) ((struct pic_env *)(o).u.data)
 
 #define pic_proc_cfunc_p(o) (pic_proc_ptr(o)->cfunc_p)