diff --git a/include/Const.h b/Const.h
similarity index 100%
rename from include/Const.h
rename to Const.h
diff --git a/include/Dict.h b/Dict.h
similarity index 100%
rename from include/Dict.h
rename to Dict.h
diff --git a/Makefile b/Makefile
index 8aff1f2..a5231c7 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ VERSION := $(VMAJOR).$(VMINOR).$(VPATCH)
 LIBVER = 1
 
 CFLAGS += -fPIC
-CPPFLAGS += -I. -I./include -I./sj3h
+CPPFLAGS += -I.
 LDFLAGS += -L.
 
 # Public API library
diff --git a/include/Struct.h b/Struct.h
similarity index 100%
rename from include/Struct.h
rename to Struct.h
diff --git a/sj3h/common.h b/common.h
similarity index 100%
rename from sj3h/common.h
rename to common.h
diff --git a/sj3h/conversion.h b/conversion.h
similarity index 100%
rename from sj3h/conversion.h
rename to conversion.h
diff --git a/sj3h/henkan.h b/henkan.h
similarity index 100%
rename from sj3h/henkan.h
rename to henkan.h
diff --git a/sj3h/inkey.h b/inkey.h
similarity index 100%
rename from sj3h/inkey.h
rename to inkey.h
diff --git a/sj3h/kana.h b/kana.h
similarity index 100%
rename from sj3h/kana.h
rename to kana.h
diff --git a/sj3h/kctype.h b/kctype.h
similarity index 100%
rename from sj3h/kctype.h
rename to kctype.h
diff --git a/sj3h/key.h b/key.h
similarity index 100%
rename from sj3h/key.h
rename to key.h
diff --git a/sj3h/rk.h b/rk.h
similarity index 100%
rename from sj3h/rk.h
rename to rk.h
diff --git a/sj3h/select.h b/select.h
similarity index 100%
rename from sj3h/select.h
rename to select.h
diff --git a/sj3h/sj.h b/sj.h
similarity index 100%
rename from sj3h/sj.h
rename to sj.h
diff --git a/sj3h/sj2.h b/sj2.h
similarity index 100%
rename from sj3h/sj2.h
rename to sj2.h
diff --git a/include/sj3cmd.h b/sj3cmd.h
similarity index 100%
rename from include/sj3cmd.h
rename to sj3cmd.h
diff --git a/include/sj3err.h b/sj3err.h
similarity index 100%
rename from include/sj3err.h
rename to sj3err.h
diff --git a/sj3h/sj3libsj3.h b/sj3libsj3.h
similarity index 100%
rename from sj3h/sj3libsj3.h
rename to sj3libsj3.h
diff --git a/include/sj3lowlib.h b/sj3lowlib.h
similarity index 100%
rename from include/sj3lowlib.h
rename to sj3lowlib.h
diff --git a/include/sj_connect.h b/sj_connect.h
similarity index 100%
rename from include/sj_connect.h
rename to sj_connect.h
diff --git a/include/sj_const.h b/sj_const.h
similarity index 100%
rename from include/sj_const.h
rename to sj_const.h
diff --git a/include/sj_define.h b/sj_define.h
similarity index 100%
rename from include/sj_define.h
rename to sj_define.h
diff --git a/include/sj_dict.h b/sj_dict.h
similarity index 100%
rename from include/sj_dict.h
rename to sj_dict.h
diff --git a/include/sj_euc.h b/sj_euc.h
similarity index 100%
rename from include/sj_euc.h
rename to sj_euc.h
diff --git a/include/sj_func.h b/sj_func.h
similarity index 100%
rename from include/sj_func.h
rename to sj_func.h
diff --git a/include/sj_global.h b/sj_global.h
similarity index 100%
rename from include/sj_global.h
rename to sj_global.h
diff --git a/include/sj_hinsi.h b/sj_hinsi.h
similarity index 100%
rename from include/sj_hinsi.h
rename to sj_hinsi.h
diff --git a/include/sj_kcnv.h b/sj_kcnv.h
similarity index 100%
rename from include/sj_kcnv.h
rename to sj_kcnv.h
diff --git a/include/sj_left.h b/sj_left.h
similarity index 100%
rename from include/sj_left.h
rename to sj_left.h
diff --git a/include/sj_prty.h b/sj_prty.h
similarity index 100%
rename from include/sj_prty.h
rename to sj_prty.h
diff --git a/include/sj_rename.h b/sj_rename.h
similarity index 100%
rename from include/sj_rename.h
rename to sj_rename.h
diff --git a/include/sj_right.h b/sj_right.h
similarity index 100%
rename from include/sj_right.h
rename to sj_right.h
diff --git a/include/sj_struct.h b/sj_struct.h
similarity index 100%
rename from include/sj_struct.h
rename to sj_struct.h
diff --git a/include/sj_study.h b/sj_study.h
similarity index 100%
rename from include/sj_study.h
rename to sj_study.h
diff --git a/include/sj_suuji.h b/sj_suuji.h
similarity index 100%
rename from include/sj_suuji.h
rename to sj_suuji.h
diff --git a/include/sj_sysvdef.h b/sj_sysvdef.h
similarity index 100%
rename from include/sj_sysvdef.h
rename to sj_sysvdef.h
diff --git a/include/sj_table.h b/sj_table.h
similarity index 100%
rename from include/sj_table.h
rename to sj_table.h
diff --git a/include/sj_typedef.h b/sj_typedef.h
similarity index 100%
rename from include/sj_typedef.h
rename to sj_typedef.h
diff --git a/include/sj_var.h b/sj_var.h
similarity index 100%
rename from include/sj_var.h
rename to sj_var.h
diff --git a/include/sj_yomi.h b/sj_yomi.h
similarity index 100%
rename from include/sj_yomi.h
rename to sj_yomi.h
diff --git a/sj3h/wchar16.h b/wchar16.h
similarity index 100%
rename from sj3h/wchar16.h
rename to wchar16.h