diff --git a/moo/configure b/moo/configure
index 218dd9b..a942b3e 100755
--- a/moo/configure
+++ b/moo/configure
@@ -19897,15 +19897,15 @@ else
 fi
 
 
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module="yes"
+test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
 
-if test "${enable_static_module}" = "yes"
+if test "${enable_static_module_is}" = "yes"
 then
 
 $as_echo "#define MOO_ENABLE_STATIC_MODULE /**/" >>confdefs.h
 
 fi
- if test "${enable_static_module}" = "yes"; then
+ if test "${enable_static_module_is}" = "yes"; then
   ENABLE_STATIC_MODULE_TRUE=
   ENABLE_STATIC_MODULE_FALSE='#'
 else
diff --git a/moo/configure.ac b/moo/configure.ac
index 844c4f0..c086fd5 100644
--- a/moo/configure.ac
+++ b/moo/configure.ac
@@ -408,13 +408,13 @@ AC_ARG_ENABLE([static-module],
 	enable_static_module_is=no
 )
 
-test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module="yes"
+test "${enable_shared}" = "no" -a "${enable_static}" = "yes" && enable_static_module_is="yes"
 
-if test "${enable_static_module}" = "yes"
+if test "${enable_static_module_is}" = "yes"
 then
 	AC_DEFINE([MOO_ENABLE_STATIC_MODULE],[],[link modules statically into the main library])
 fi
-AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module}" = "yes")
+AM_CONDITIONAL(ENABLE_STATIC_MODULE, test "${enable_static_module_is}" = "yes")
 
 AC_SUBST(MOO_SIZEOF_WCHAR_T, $ac_cv_sizeof_wchar_t)
 AC_SUBST(MOO_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am
index 5d839a8..7d000dd 100644
--- a/moo/lib/Makefile.am
+++ b/moo/lib/Makefile.am
@@ -27,7 +27,6 @@ pkgincludedir = $(includedir)
 pkglibdir = $(libdir)
 
 pkginclude_HEADERS = \
-	moo-cfg.h \
 	moo-cmn.h \
 	moo-rbt.h \
 	moo-utl.h \
diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in
index f6b8eca..df74e61 100644
--- a/moo/lib/Makefile.in
+++ b/moo/lib/Makefile.in
@@ -397,7 +397,6 @@ CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \
 LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
 LIBADD_LIB_COMMON = $(LIBM) $(LIBLTDL) 
 pkginclude_HEADERS = \
-	moo-cfg.h \
 	moo-cmn.h \
 	moo-rbt.h \
 	moo-utl.h \
diff --git a/moo/mod/Makefile.am b/moo/mod/Makefile.am
index bc0fcda..32d3263 100644
--- a/moo/mod/Makefile.am
+++ b/moo/mod/Makefile.am
@@ -41,7 +41,7 @@ pkgmodexecdir = $(libdir)
 
 pkgmodexec_LTLIBRARIES = libmoo-stdio.la libmoo-console.la
 
-libmoo_stdio_la_SOURCES = stdio.c m-stdio.h
+libmoo_stdio_la_SOURCES = stdio.c _stdio.h
 libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
 libmoo_stdio_la_LDFLAGS = $(LDFLAGS_COMMON)
 libmoo_stdio_la_LIBADD = $(LIBADD_COMMON)
diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in
index 0e6672f..7338ea7 100644
--- a/moo/mod/Makefile.in
+++ b/moo/mod/Makefile.in
@@ -150,7 +150,7 @@ libmoo_console_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @ENABLE_STATIC_MODULE_TRUE@am_libmoo_console_la_rpath =
 @ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_DEPENDENCIES =  \
 @ENABLE_STATIC_MODULE_FALSE@	$(am__DEPENDENCIES_1)
-am__libmoo_stdio_la_SOURCES_DIST = stdio.c m-stdio.h
+am__libmoo_stdio_la_SOURCES_DIST = stdio.c _stdio.h
 @ENABLE_STATIC_MODULE_FALSE@am_libmoo_stdio_la_OBJECTS =  \
 @ENABLE_STATIC_MODULE_FALSE@	libmoo_stdio_la-stdio.lo
 @ENABLE_STATIC_MODULE_TRUE@am_libmoo_stdio_la_OBJECTS =  \
@@ -397,7 +397,7 @@ CPPFLAGS_COMMON = -I$(abs_builddir) -I$(abs_builddir)/../lib \
 @ENABLE_STATIC_MODULE_TRUE@libmoo_console_la_SOURCES = console.c 
 @ENABLE_STATIC_MODULE_FALSE@libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
 @ENABLE_STATIC_MODULE_TRUE@libmoo_console_la_CPPFLAGS = $(CPPFLAGS_COMMON)
-@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_SOURCES = stdio.c m-stdio.h
+@ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_SOURCES = stdio.c _stdio.h
 @ENABLE_STATIC_MODULE_TRUE@libmoo_stdio_la_SOURCES = stdio.c 
 @ENABLE_STATIC_MODULE_FALSE@libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)
 @ENABLE_STATIC_MODULE_TRUE@libmoo_stdio_la_CPPFLAGS = $(CPPFLAGS_COMMON)