diff --git a/moo/configure b/moo/configure
index 7c6f7b5..2b57a09 100755
--- a/moo/configure
+++ b/moo/configure
@@ -21386,15 +21386,18 @@ else
 
 fi
 
-test "${enable_shared}" = "no" && enable_dynamic_module_is="no"
+if test "x${enable_shared}" = "xno"
+then
+	enable_dynamic_module_is="no"
+fi
 
-if test "${enable_dynamic_module_is}" = "yes"
+if test "x${enable_dynamic_module_is}" = "xyes"
 then
 
 $as_echo "#define MOO_ENABLE_DYNAMIC_MODULE 1" >>confdefs.h
 
 fi
- if test "${enable_dynamic_module_is}" = "yes"; then
+ if test "x${enable_dynamic_module_is}" = "xyes"; then
   ENABLE_DYNAMIC_MODULE_TRUE=
   ENABLE_DYNAMIC_MODULE_FALSE='#'
 else
@@ -21411,7 +21414,10 @@ else
 
 fi
 
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
+if test "x${enable_shared}" = "xno" -a "x${enable_static}" = "xyes"
+then
+	enable_static_module_is="yes"
+fi
 
 if test "${enable_static_module_is}" = "yes"
 then
@@ -21419,7 +21425,7 @@ then
 $as_echo "#define MOO_ENABLE_STATIC_MODULE 1" >>confdefs.h
 
 fi
- if test "${enable_static_module_is}" = "yes"; then
+ if test "x${enable_static_module_is}" = "xyes"; then
   ENABLE_STATIC_MODULE_TRUE=
   ENABLE_STATIC_MODULE_FALSE='#'
 else
@@ -21436,9 +21442,9 @@ else
 
 fi
 
-if test "${enable_libltdl_is}" = "yes"
+if test "x${enable_libltdl_is}" = "xyes"
 then
-	if test "${ac_cv_header_ltdl_h}" = "yes"  -a "${LTDL_LIBS}" != ""
+	if test "x${ac_cv_header_ltdl_h}" = "xyes"  -a "${LTDL_LIBS}" != ""
 	then
 
 $as_echo "#define MOO_ENABLE_LIBLTDL /**/" >>confdefs.h
@@ -21447,7 +21453,7 @@ $as_echo "#define MOO_ENABLE_LIBLTDL /**/" >>confdefs.h
 		enable_libltdl_is="no"
 	fi
 fi
- if test "${enable_libltdl_is}" = "yes"; then
+ if test "x${enable_libltdl_is}" = "xyes"; then
   ENABLE_LIBLTDL_TRUE=
   ENABLE_LIBLTDL_FALSE='#'
 else
diff --git a/moo/configure.ac b/moo/configure.ac
index 1d3b173..f3c1daa 100644
--- a/moo/configure.ac
+++ b/moo/configure.ac
@@ -680,13 +680,16 @@ AC_ARG_ENABLE([dynamic-module],
 	enable_dynamic_module_is=$enableval,
 	enable_dynamic_module_is=yes
 )
-test "${enable_shared}" = "no" && enable_dynamic_module_is="no"
+if test "x${enable_shared}" = "xno"
+then
+	enable_dynamic_module_is="no"
+fi
 
-if test "${enable_dynamic_module_is}" = "yes"
+if test "x${enable_dynamic_module_is}" = "xyes"
 then
 	AC_DEFINE([MOO_ENABLE_DYNAMIC_MODULE],[1],[enable dynamic module capability])
 fi
-AM_CONDITIONAL(ENABLE_DYNAMIC_MODULE, test "${enable_dynamic_module_is}" = "yes")
+AM_CONDITIONAL(ENABLE_DYNAMIC_MODULE, test "x${enable_dynamic_module_is}" = "xyes")
 
 dnl ===== enable-static-module =====
 AC_ARG_ENABLE([static-module],
@@ -694,13 +697,16 @@ AC_ARG_ENABLE([static-module],
 	enable_static_module_is=$enableval,
 	enable_static_module_is=no
 )
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
+if test "x${enable_shared}" = "xno" -a "x${enable_static}" = "xyes" 
+then
+	enable_static_module_is="yes"
+fi
 
 if test "${enable_static_module_is}" = "yes"
 then
 	AC_DEFINE([MOO_ENABLE_STATIC_MODULE],[1],[link modules statically into the main library])
 fi
-AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module_is}" = "yes")
+AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "x${enable_static_module_is}" = "xyes")
 
 dnl ===== enable-libltdl =====
 AC_ARG_ENABLE([libltdl],
@@ -708,16 +714,16 @@ AC_ARG_ENABLE([libltdl],
 	enable_libltdl_is=$enableval,
 	enable_libltdl_is=no
 )
-if test "${enable_libltdl_is}" = "yes"
+if test "x${enable_libltdl_is}" = "xyes"
 then
-	if test "${ac_cv_header_ltdl_h}" = "yes"  -a "${LTDL_LIBS}" != ""
+	if test "x${ac_cv_header_ltdl_h}" = "xyes"  -a "${LTDL_LIBS}" != ""
 	then
 		AC_DEFINE([MOO_ENABLE_LIBLTDL],[],[use libltdl when loading a dynamic module])
 	else
 		enable_libltdl_is="no"
 	fi
 fi
-AM_CONDITIONAL(ENABLE_LIBLTDL, test "${enable_libltdl_is}" = "yes")
+AM_CONDITIONAL(ENABLE_LIBLTDL, test "x${enable_libltdl_is}" = "xyes")
 
 dnl ===== enable-mod-con =====
 AC_ARG_ENABLE([mod-con],
diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am
index 4806019..29d7e25 100644
--- a/moo/lib/Makefile.am
+++ b/moo/lib/Makefile.am
@@ -39,16 +39,24 @@ pkgincludedir = $(includedir)
 pkglibdir = $(libdir)
 
 pkginclude_HEADERS = \
+	moo.h \
+	moo-bct.h \
+	moo-cmn.h \
+	moo-opt.h \
+	moo-rbt.h \
+	moo-utl.h
+
+pkglib_LTLIBRARIES = libmoo.la
+libmoo_la_SOURCES = \
+	moo.h \
+	moo-bct.h \
 	moo-cmn.h \
 	moo-opt.h \
 	moo-rbt.h \
 	moo-utl.h \
-	moo.h
-
-noinst_HEADERS = moo-prv.h pack1.h unpack.h
-
-pkglib_LTLIBRARIES = libmoo.la
-libmoo_la_SOURCES = \
+	moo-prv.h \
+	pack1.h \
+	unpack.h \
 	bigint.c \
 	comp.c \
 	debug.c  \
diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in
index 488079c..feb0364 100644
--- a/moo/lib/Makefile.in
+++ b/moo/lib/Makefile.in
@@ -124,8 +124,8 @@ 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 $(noinst_HEADERS) \
-	$(pkginclude_HEADERS) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(pkginclude_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = moo-cfg.h
 CONFIG_CLEAN_FILES =
@@ -227,7 +227,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
+HEADERS = $(pkginclude_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)moo-cfg.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -423,15 +423,24 @@ CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(am__append_3) \
 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 = \
+	moo.h \
+	moo-bct.h \
+	moo-cmn.h \
+	moo-opt.h \
+	moo-rbt.h \
+	moo-utl.h
+
+pkglib_LTLIBRARIES = libmoo.la
+libmoo_la_SOURCES = \
+	moo.h \
+	moo-bct.h \
 	moo-cmn.h \
 	moo-opt.h \
 	moo-rbt.h \
 	moo-utl.h \
-	moo.h
-
-noinst_HEADERS = moo-prv.h pack1.h unpack.h
-pkglib_LTLIBRARIES = libmoo.la
-libmoo_la_SOURCES = \
+	moo-prv.h \
+	pack1.h \
+	unpack.h \
 	bigint.c \
 	comp.c \
 	debug.c  \