diff --git a/doc/examples/arguments.cxx b/doc/examples/arguments.cxx
index 898dc32..bf1d1cf 100644
--- a/doc/examples/arguments.cxx
+++ b/doc/examples/arguments.cxx
@@ -5,7 +5,7 @@
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-#include <mrw/args>
+#include <mrw/args.hxx>
 
 void test_func() {
   std::cout<<"test parameter was given on command line"<<std::endl;
diff --git a/src/makefile.am b/src/makefile.am
index 2af95d1..2e5a714 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -14,7 +14,7 @@ nobase_include_HEADERS = mrw/arg.hxx mrw/auto.hxx mrw/configfile.hxx	\
                          mrw/smartpointer.hxx mrw/stacktrace.hxx	\
                          mrw/stdext.hxx mrw/string.hxx			\
                          mrw/tokenizer.hxx mrw/unistd.hxx		\
-                         mrw/vector.hxx mrw/args
+                         mrw/vector.hxx mrw/args.hxx mrw/iomanip.hxx
 
 if HAVE_STACKTRACE
   AM_CPPFLAGS += -DHAVE_STACKTRACE
diff --git a/src/mrw/args b/src/mrw/args.hxx
similarity index 99%
rename from src/mrw/args
rename to src/mrw/args.hxx
index 0c35d9c..aa5fed7 100644
--- a/src/mrw/args
+++ b/src/mrw/args.hxx
@@ -7,7 +7,7 @@
 #ifndef __ARGS__
 #define __ARGS__
 
-#include <mrw/iomanip>
+#include <mrw/iomanip.hxx>
 
 #include <vector>
 #include <map>
diff --git a/src/mrw/iomanip b/src/mrw/iomanip.hxx
similarity index 100%
rename from src/mrw/iomanip
rename to src/mrw/iomanip.hxx