diff --git a/lib/Makefile.am b/lib/Makefile.am
index 66a6da4..e30dda1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -58,7 +58,7 @@ libhcl_la_SOURCES = \
 	logfmt.c \
 	number.c \
 	obj.c \
-	opt-imp.h \
+	opt-impl.h \
 	opt.c \
 	prim.c \
 	print.c \
@@ -75,6 +75,7 @@ libhcl_la_DEPENDENCIES =
 
 if ENABLE_HCLS
 pkglib_LTLIBRARIES += libhcls.la
+pkginclude_HEADERS += hcl-s.h
 libhcls_la_SOURCES = hcl-s.c hcl-s.h
 libhcls_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 libhcls_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@@ -84,6 +85,7 @@ endif
 
 if ENABLE_HCLC
 pkglib_LTLIBRARIES += libhclc.la
+pkginclude_HEADERS += hcl-c.h
 libhclc_la_SOURCES = hcl-c.c hcl-c.h
 libhclc_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 libhclc_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 03ab35c..6eabaa1 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -91,18 +91,20 @@ host_triplet = @host@
 @ENABLE_LIBLTDL_TRUE@am__append_1 = $(LTDL_LIBS)
 @ENABLE_LIBLTDL_FALSE@am__append_2 = $(DL_LIBS)
 @ENABLE_HCLS_TRUE@am__append_3 = libhcls.la
-@ENABLE_HCLC_TRUE@am__append_4 = libhclc.la
-@ENABLE_STATIC_MODULE_TRUE@am__append_5 = -lhcl-arr -lhcl-dic \
+@ENABLE_HCLS_TRUE@am__append_4 = hcl-s.h
+@ENABLE_HCLC_TRUE@am__append_5 = libhclc.la
+@ENABLE_HCLC_TRUE@am__append_6 = hcl-c.h
+@ENABLE_STATIC_MODULE_TRUE@am__append_7 = -lhcl-arr -lhcl-dic \
 @ENABLE_STATIC_MODULE_TRUE@	-lhcl-str
-@ENABLE_STATIC_MODULE_TRUE@am__append_6 = $(abs_builddir)/../mod/libhcl-arr.la \
+@ENABLE_STATIC_MODULE_TRUE@am__append_8 = $(abs_builddir)/../mod/libhcl-arr.la \
 @ENABLE_STATIC_MODULE_TRUE@	$(abs_builddir)/../mod/libhcl-dic.la \
 @ENABLE_STATIC_MODULE_TRUE@	$(abs_builddir)/../mod/libhcl-str.la
 bin_PROGRAMS = hcl$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
 @ENABLE_STATIC_MODULE_FALSE@hcl_DEPENDENCIES = $(am__DEPENDENCIES_4)
-@ENABLE_HCLS_TRUE@am__append_7 = hcls
+@ENABLE_HCLS_TRUE@am__append_9 = hcls
 @ENABLE_HCLS_TRUE@@ENABLE_STATIC_MODULE_FALSE@hcls_DEPENDENCIES = $(am__DEPENDENCIES_4) \
 @ENABLE_HCLS_TRUE@@ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1)
-@ENABLE_HCLC_TRUE@am__append_8 = hclc
+@ENABLE_HCLC_TRUE@am__append_10 = hclc
 @ENABLE_HCLC_TRUE@@ENABLE_STATIC_MODULE_FALSE@hclc_DEPENDENCIES = $(am__DEPENDENCIES_4) \
 @ENABLE_HCLC_TRUE@@ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1)
 subdir = lib
@@ -115,7 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(pkginclude_HEADERS) \
+DIST_COMMON = $(srcdir)/Makefile.am $(am__pkginclude_HEADERS_DIST) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = hcl-cfg.h
@@ -251,6 +253,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__pkginclude_HEADERS_DIST = hcl-cfg.h hcl-cmn.h hcl-rbt.h hcl-tmr.h \
+	hcl-utl.h hcl.h hcl-s.h hcl-c.h
 HEADERS = $(pkginclude_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)hcl-cfg.h.in
@@ -444,15 +448,9 @@ CPPFLAGS_ALL_COMMON = \
 CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON)
 LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
 LIBADD_LIB_COMMON = $(LIBM) $(am__append_1) $(am__append_2)
-pkginclude_HEADERS = \
-	hcl-cfg.h \
-	hcl-cmn.h \
-	hcl-rbt.h \
-	hcl-tmr.h \
-	hcl-utl.h \
-	hcl.h
-
-pkglib_LTLIBRARIES = libhcl.la $(am__append_3) $(am__append_4)
+pkginclude_HEADERS = hcl-cfg.h hcl-cmn.h hcl-rbt.h hcl-tmr.h hcl-utl.h \
+	hcl.h $(am__append_4) $(am__append_6)
+pkglib_LTLIBRARIES = libhcl.la $(am__append_3) $(am__append_5)
 libhcl_la_SOURCES = \
 	hcl-prv.h \
 	logfmtv.h \
@@ -470,7 +468,7 @@ libhcl_la_SOURCES = \
 	logfmt.c \
 	number.c \
 	obj.c \
-	opt-imp.h \
+	opt-impl.h \
 	opt.c \
 	prim.c \
 	print.c \
@@ -483,8 +481,8 @@ libhcl_la_SOURCES = \
 
 libhcl_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 libhcl_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
-libhcl_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_5)
-libhcl_la_DEPENDENCIES = $(am__append_6)
+libhcl_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_7)
+libhcl_la_DEPENDENCIES = $(am__append_8)
 @ENABLE_HCLS_TRUE@libhcls_la_SOURCES = hcl-s.c hcl-s.h
 @ENABLE_HCLS_TRUE@libhcls_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
 @ENABLE_HCLS_TRUE@libhcls_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)