Renaming of files in preparation for code style tools.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7d4f47bd0bf7544dbd7f64ed4089e80780c1d2bd)

129 files changed, 285 insertions, 285 deletions

diff --git a/kapptemplate/existing.module b/kapptemplate/existing.module
index 01a4e710..500f5adf 100644
--- a/kapptemplate/existing.module
+++ b/kapptemplate/existing.module
@@ -20,7 +20,7 @@ function GetCurrentSource
     # Now, find C++ source and header files
     CUR_PWD=$PWD;
     cd $SOURCE_LOCATION;
-    EXISTING_SOURCE=`/bin/ls -x *.C *.cpp *.cc`;
+    EXISTING_SOURCE=`/bin/ls -x *.cpp`;
     EXISTING_HEADER=`/bin/ls -x *.h`;
     cd $CUR_PWD;
 
diff --git a/kbabel/Makefile.am b/kbabel/Makefile.am
index c38a56f3..bb902d4f 100644
--- a/kbabel/Makefile.am
+++ b/kbabel/Makefile.am
@@ -4,5 +4,5 @@ SUBDIRS = common filters datatools kbabeldict commonui catalogmanager kbabel add
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name \*.rc -o -name \*.ui` >> rc.cpp
-	$(XGETTEXT) `find . -name \*.cpp -o -name \*.cc` -o $(podir)/kbabel.pot	
+	$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kbabel.pot	
 
diff --git a/kbabel/common/libgettext/CMakeLists.txt b/kbabel/common/libgettext/CMakeLists.txt
index 6e118d64..a82d9826 100644
--- a/kbabel/common/libgettext/CMakeLists.txt
+++ b/kbabel/common/libgettext/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
 )
 
 
-##### pofiles.cc (source) #######################
+##### pofiles.cpp (source) #######################
 
 add_custom_command( OUTPUT pofiles.cpp
   COMMAND ${LEX_EXECUTABLE} -+ -opofiles.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pofiles.ll
diff --git a/kbabel/common/libgettext/Makefile.am b/kbabel/common/libgettext/Makefile.am
index 6f5f4fe2..304e2537 100644
--- a/kbabel/common/libgettext/Makefile.am
+++ b/kbabel/common/libgettext/Makefile.am
@@ -5,13 +5,13 @@ INCLUDES=$(all_includes)
 #LEX_OUTPUT_ROOT = lex.GettextBase
 #AM_LFLAGS = -+
 
-CLEANFILES = pofiles.cc
+CLEANFILES = pofiles.cpp
 
 noinst_LTLIBRARIES = libgettext.la
 
-libgettext_la_SOURCES = pofiles.cc
+libgettext_la_SOURCES = pofiles.cpp
 
-pofiles.cc: $(srcdir)/pofiles.ll
-	$(LEX) -+ -opofiles.cc $(srcdir)/pofiles.ll
+pofiles.cpp: $(srcdir)/pofiles.ll
+	$(LEX) -+ -opofiles.cpp $(srcdir)/pofiles.ll
 
 noinst_HEADERS = tokens.h pofiles.h
diff --git a/kbabel/datatools/accelerators/CMakeLists.txt b/kbabel/datatools/accelerators/CMakeLists.txt
index 9e9567db..5dcfc21e 100644
--- a/kbabel/datatools/accelerators/CMakeLists.txt
+++ b/kbabel/datatools/accelerators/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_accelstool (module) ################
 
 tde_add_kpart( kbabel_accelstool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/accelerators/Makefile.am b/kbabel/datatools/accelerators/Makefile.am
index 5ee57aae..4eff4d91 100644
--- a/kbabel/datatools/accelerators/Makefile.am
+++ b/kbabel/datatools/accelerators/Makefile.am
@@ -6,7 +6,7 @@ kbabel_accelstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_accelstool.la
 
-kbabel_accelstool_la_SOURCES = main.cc
+kbabel_accelstool_la_SOURCES = main.cpp
 
 kbabel_accelstool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cpp
index 0c7cae3a..0c7cae3a 100644
--- a/kbabel/datatools/accelerators/main.cc
+++ b/kbabel/datatools/accelerators/main.cpp
diff --git a/kbabel/datatools/arguments/CMakeLists.txt b/kbabel/datatools/arguments/CMakeLists.txt
index a767a0e6..7a532ce2 100644
--- a/kbabel/datatools/arguments/CMakeLists.txt
+++ b/kbabel/datatools/arguments/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_argstool (module) #######################
 
 tde_add_kpart( kbabel_argstool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/arguments/Makefile.am b/kbabel/datatools/arguments/Makefile.am
index ab4e2f01..104b9c8d 100644
--- a/kbabel/datatools/arguments/Makefile.am
+++ b/kbabel/datatools/arguments/Makefile.am
@@ -6,7 +6,7 @@ kbabel_argstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_argstool.la
 
-kbabel_argstool_la_SOURCES = main.cc
+kbabel_argstool_la_SOURCES = main.cpp
 
 kbabel_argstool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cpp
index b6c3fa5a..b6c3fa5a 100644
--- a/kbabel/datatools/arguments/main.cc
+++ b/kbabel/datatools/arguments/main.cpp
diff --git a/kbabel/datatools/context/CMakeLists.txt b/kbabel/datatools/context/CMakeLists.txt
index c448cca1..94781fef 100644
--- a/kbabel/datatools/context/CMakeLists.txt
+++ b/kbabel/datatools/context/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_contexttool (module) ###############
 
 tde_add_kpart( kbabel_contexttool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/context/Makefile.am b/kbabel/datatools/context/Makefile.am
index 3b56628a..6dca7415 100644
--- a/kbabel/datatools/context/Makefile.am
+++ b/kbabel/datatools/context/Makefile.am
@@ -6,7 +6,7 @@ kbabel_contexttool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_contexttool.la
 
-kbabel_contexttool_la_SOURCES = main.cc
+kbabel_contexttool_la_SOURCES = main.cpp
 
 kbabel_contexttool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cpp
index 0fb989d2..0fb989d2 100644
--- a/kbabel/datatools/context/main.cc
+++ b/kbabel/datatools/context/main.cpp
diff --git a/kbabel/datatools/equations/CMakeLists.txt b/kbabel/datatools/equations/CMakeLists.txt
index f7b60f01..e4dd4a39 100644
--- a/kbabel/datatools/equations/CMakeLists.txt
+++ b/kbabel/datatools/equations/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_equationstool (module) #############
 
 tde_add_kpart( kbabel_equationstool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/equations/Makefile.am b/kbabel/datatools/equations/Makefile.am
index dac35e6f..48b0f6bc 100644
--- a/kbabel/datatools/equations/Makefile.am
+++ b/kbabel/datatools/equations/Makefile.am
@@ -6,7 +6,7 @@ kbabel_equationstool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_equationstool.la
 
-kbabel_equationstool_la_SOURCES = main.cc
+kbabel_equationstool_la_SOURCES = main.cpp
 
 kbabel_equationstool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cpp
index c0dbbba2..c0dbbba2 100644
--- a/kbabel/datatools/equations/main.cc
+++ b/kbabel/datatools/equations/main.cpp
diff --git a/kbabel/datatools/length/CMakeLists.txt b/kbabel/datatools/length/CMakeLists.txt
index 8750dbc5..df075cad 100644
--- a/kbabel/datatools/length/CMakeLists.txt
+++ b/kbabel/datatools/length/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_lengthtool (module) ################
 
 tde_add_kpart( kbabel_lengthtool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/length/Makefile.am b/kbabel/datatools/length/Makefile.am
index 2359a95b..dc8e2867 100644
--- a/kbabel/datatools/length/Makefile.am
+++ b/kbabel/datatools/length/Makefile.am
@@ -6,7 +6,7 @@ kbabel_lengthtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_lengthtool.la
 
-kbabel_lengthtool_la_SOURCES = main.cc
+kbabel_lengthtool_la_SOURCES = main.cpp
 
 kbabel_lengthtool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cpp
index f1c295eb..f1c295eb 100644
--- a/kbabel/datatools/length/main.cc
+++ b/kbabel/datatools/length/main.cpp
diff --git a/kbabel/datatools/not-translated/CMakeLists.txt b/kbabel/datatools/not-translated/CMakeLists.txt
index 59d36138..41da20a1 100644
--- a/kbabel/datatools/not-translated/CMakeLists.txt
+++ b/kbabel/datatools/not-translated/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_nottranslatedtool (module) #########
 
 tde_add_kpart( kbabel_nottranslatedtool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/not-translated/Makefile.am b/kbabel/datatools/not-translated/Makefile.am
index 40299023..52a88ca9 100644
--- a/kbabel/datatools/not-translated/Makefile.am
+++ b/kbabel/datatools/not-translated/Makefile.am
@@ -6,7 +6,7 @@ kbabel_nottranslatedtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.l
 
 kde_module_LTLIBRARIES = kbabel_nottranslatedtool.la
 
-kbabel_nottranslatedtool_la_SOURCES = main.cc
+kbabel_nottranslatedtool_la_SOURCES = main.cpp
 
 kbabel_nottranslatedtool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cpp
index 68093191..68093191 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cpp
diff --git a/kbabel/datatools/pluralforms/CMakeLists.txt b/kbabel/datatools/pluralforms/CMakeLists.txt
index 2a86d0c3..80b3f102 100644
--- a/kbabel/datatools/pluralforms/CMakeLists.txt
+++ b/kbabel/datatools/pluralforms/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_pluraltool (module) ################
 
 tde_add_kpart( kbabel_pluraltool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/pluralforms/Makefile.am b/kbabel/datatools/pluralforms/Makefile.am
index 951e08cb..53ea610d 100644
--- a/kbabel/datatools/pluralforms/Makefile.am
+++ b/kbabel/datatools/pluralforms/Makefile.am
@@ -6,7 +6,7 @@ kbabel_pluraltool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_pluraltool.la
 
-kbabel_pluraltool_la_SOURCES = main.cc
+kbabel_pluraltool_la_SOURCES = main.cpp
 
 kbabel_pluraltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cpp
index 693a843b..693a843b 100644
--- a/kbabel/datatools/pluralforms/main.cc
+++ b/kbabel/datatools/pluralforms/main.cpp
diff --git a/kbabel/datatools/punctuation/CMakeLists.txt b/kbabel/datatools/punctuation/CMakeLists.txt
index b325342f..d096dcf5 100644
--- a/kbabel/datatools/punctuation/CMakeLists.txt
+++ b/kbabel/datatools/punctuation/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_punctuationtool (module) ###########
 
 tde_add_kpart( kbabel_punctuationtool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/punctuation/Makefile.am b/kbabel/datatools/punctuation/Makefile.am
index 1aceb053..c30ada47 100644
--- a/kbabel/datatools/punctuation/Makefile.am
+++ b/kbabel/datatools/punctuation/Makefile.am
@@ -6,7 +6,7 @@ kbabel_punctuationtool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_punctuationtool.la
 
-kbabel_punctuationtool_la_SOURCES = main.cc
+kbabel_punctuationtool_la_SOURCES = main.cpp
 
 kbabel_punctuationtool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cpp
index 6d779518..6d779518 100644
--- a/kbabel/datatools/punctuation/main.cc
+++ b/kbabel/datatools/punctuation/main.cpp
diff --git a/kbabel/datatools/regexp/CMakeLists.txt b/kbabel/datatools/regexp/CMakeLists.txt
index 77e4553b..e75b53a4 100644
--- a/kbabel/datatools/regexp/CMakeLists.txt
+++ b/kbabel/datatools/regexp/CMakeLists.txt
@@ -36,7 +36,7 @@ install( FILES regexplist.xml DESTINATION ${DATA_INSTALL_DIR}/kbabel )
 ##### kbabel_regexptool (module) ################
 
 tde_add_kpart( kbabel_regexptool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/regexp/Makefile.am b/kbabel/datatools/regexp/Makefile.am
index 42ebe1cb..cc574668 100644
--- a/kbabel/datatools/regexp/Makefile.am
+++ b/kbabel/datatools/regexp/Makefile.am
@@ -6,7 +6,7 @@ kbabel_regexptool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_regexptool.la
 
-kbabel_regexptool_la_SOURCES = main.cc
+kbabel_regexptool_la_SOURCES = main.cpp
 
 kbabel_regexptool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cpp
index e500728e..e500728e 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cpp
diff --git a/kbabel/datatools/regexp/regexplist.xml b/kbabel/datatools/regexp/regexplist.xml
index 72f647cb..39624092 100644
--- a/kbabel/datatools/regexp/regexplist.xml
+++ b/kbabel/datatools/regexp/regexplist.xml
@@ -10,7 +10,7 @@
 			...
 		</regexplist>
 	 
-	Right now the file should be copied to ~/.trinity/share/apps/kbabel/regexplist.xml. I'm sorry this cannot be configured but hope it will in the future. By the time if you need another location you have to modify the source code (main.cc)
+	Right now the file should be copied to ~/.trinity/share/apps/kbabel/regexplist.xml. I'm sorry this cannot be configured but hope it will in the future. By the time if you need another location you have to modify the source code (main.cpp)
 
 	You'll see in the example that most expressions start with '(^| |\\t)+' and then a word. This is to ensure it _is_ a word. Using the usual expressions to ensure we pick up a whole word doesn't work for the catalan language. Anyway, if you need to match a tab be sure you use the '\\t' expression.
 
@@ -300,4 +300,4 @@
 	</item>
 
 
-</regexplist>
\ No newline at end of file
+</regexplist>
diff --git a/kbabel/datatools/setfuzzy/CMakeLists.txt b/kbabel/datatools/setfuzzy/CMakeLists.txt
index 864a5030..5ccf8bac 100644
--- a/kbabel/datatools/setfuzzy/CMakeLists.txt
+++ b/kbabel/datatools/setfuzzy/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_setfuzzytool (module) ##############
 
 tde_add_kpart( kbabel_setfuzzytool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/setfuzzy/Makefile.am b/kbabel/datatools/setfuzzy/Makefile.am
index f1a5b8bc..1b84cb02 100644
--- a/kbabel/datatools/setfuzzy/Makefile.am
+++ b/kbabel/datatools/setfuzzy/Makefile.am
@@ -6,7 +6,7 @@ kbabel_setfuzzytool_la_LIBADD = ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_setfuzzytool.la
 
-kbabel_setfuzzytool_la_SOURCES = main.cc
+kbabel_setfuzzytool_la_SOURCES = main.cpp
 
 kbabel_setfuzzytool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cpp
index 7bc0ed16..7bc0ed16 100644
--- a/kbabel/datatools/setfuzzy/main.cc
+++ b/kbabel/datatools/setfuzzy/main.cpp
diff --git a/kbabel/datatools/whitespace/CMakeLists.txt b/kbabel/datatools/whitespace/CMakeLists.txt
index 13f1c0f1..94784981 100644
--- a/kbabel/datatools/whitespace/CMakeLists.txt
+++ b/kbabel/datatools/whitespace/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_whitespacetool (module) ############
 
 tde_add_kpart( kbabel_whitespacetool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/whitespace/Makefile.am b/kbabel/datatools/whitespace/Makefile.am
index eb3937fb..890d8dc1 100644
--- a/kbabel/datatools/whitespace/Makefile.am
+++ b/kbabel/datatools/whitespace/Makefile.am
@@ -6,7 +6,7 @@ kbabel_whitespacetool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_whitespacetool.la
 
-kbabel_whitespacetool_la_SOURCES = main.cc
+kbabel_whitespacetool_la_SOURCES = main.cpp
 
 kbabel_whitespacetool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cpp
index 06558211..06558211 100644
--- a/kbabel/datatools/whitespace/main.cc
+++ b/kbabel/datatools/whitespace/main.cpp
diff --git a/kbabel/datatools/xml/CMakeLists.txt b/kbabel/datatools/xml/CMakeLists.txt
index 0fa9676d..ea47a588 100644
--- a/kbabel/datatools/xml/CMakeLists.txt
+++ b/kbabel/datatools/xml/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 ##### kbabel_xmltool (module) ###################
 
 tde_add_kpart( kbabel_xmltool AUTOMOC
-  SOURCES main.cc
+  SOURCES main.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/datatools/xml/Makefile.am b/kbabel/datatools/xml/Makefile.am
index 3f116709..2fd2c28d 100644
--- a/kbabel/datatools/xml/Makefile.am
+++ b/kbabel/datatools/xml/Makefile.am
@@ -6,7 +6,7 @@ kbabel_xmltool_la_LIBADD = $(LIB_TDEIO) ../../common/libkbabelcommon.la
 
 kde_module_LTLIBRARIES = kbabel_xmltool.la
 
-kbabel_xmltool_la_SOURCES = main.cc
+kbabel_xmltool_la_SOURCES = main.cpp
 
 kbabel_xmltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cpp
index 59342c0d..59342c0d 100644
--- a/kbabel/datatools/xml/main.cc
+++ b/kbabel/datatools/xml/main.cpp
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.cpp
index a83d947b..a83d947b 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C
+++ b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.cpp
diff --git a/kspy/Makefile.am b/kspy/Makefile.am
index 07d8cdab..42ebfa02 100644
--- a/kspy/Makefile.am
+++ b/kspy/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = 	main.cpp spy.cpp spy.h navview.cpp navview.h propsview.cpp \
 METASOURCES = AUTO
 
 messages: 
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/spy.pot; \
 	fi
diff --git a/poxml/GettextLexer.cpp b/poxml/GettextLexer.cpp
index cc768114..d3e55ea8 100644
--- a/poxml/GettextLexer.cpp
+++ b/poxml/GettextLexer.cpp
@@ -1,12 +1,12 @@
 /* $ANTLR 2.7.1: "gettext.g" -> "GettextLexer.cpp"$ */
-#include "GettextLexer.hpp"
-#include "antlr/CharBuffer.hpp"
-#include "antlr/TokenStreamException.hpp"
-#include "antlr/TokenStreamIOException.hpp"
-#include "antlr/TokenStreamRecognitionException.hpp"
-#include "antlr/CharStreamException.hpp"
-#include "antlr/CharStreamIOException.hpp"
-#include "antlr/NoViableAltForCharException.hpp"
+#include "GettextLexer.h"
+#include "antlr/CharBuffer.h"
+#include "antlr/TokenStreamException.h"
+#include "antlr/TokenStreamIOException.h"
+#include "antlr/TokenStreamRecognitionException.h"
+#include "antlr/CharStreamException.h"
+#include "antlr/CharStreamIOException.h"
+#include "antlr/NoViableAltForCharException.h"
 
 #line 1 "gettext.g"
 
diff --git a/poxml/GettextLexer.hpp b/poxml/GettextLexer.h
index 951ad423..22634ddc 100644
--- a/poxml/GettextLexer.hpp
+++ b/poxml/GettextLexer.h
@@ -7,18 +7,18 @@
 using namespace std;
 #include "parser.h"
 
-#line 11 "GettextLexer.hpp"
-#include "antlr/config.hpp"
-/* $ANTLR 2.7.1: "gettext.g" -> "GettextLexer.hpp"$ */
-#include "antlr/CommonToken.hpp"
-#include "antlr/InputBuffer.hpp"
-#include "antlr/BitSet.hpp"
-#include "GettextParserTokenTypes.hpp"
-#include "antlr/CharScanner.hpp"
+#line 11 "GettextLexer.h"
+#include "antlr/config.h"
+/* $ANTLR 2.7.1: "gettext.g" -> "GettextLexer.h"$ */
+#include "antlr/CommonToken.h"
+#include "antlr/InputBuffer.h"
+#include "antlr/BitSet.h"
+#include "GettextParserTokenTypes.h"
+#include "antlr/CharScanner.h"
 class GettextLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public GettextParserTokenTypes
  {
 #line 1 "gettext.g"
-#line 22 "GettextLexer.hpp"
+#line 22 "GettextLexer.h"
 private:
 	void initLiterals();
 public:
diff --git a/poxml/GettextParser.cpp b/poxml/GettextParser.cpp
index fda1066a..7bcc74e9 100644
--- a/poxml/GettextParser.cpp
+++ b/poxml/GettextParser.cpp
@@ -1,14 +1,14 @@
 /* $ANTLR 2.7.1: "gettext.g" -> "GettextParser.cpp"$ */
-#include "GettextParser.hpp"
-#include "antlr/NoViableAltException.hpp"
-#include "antlr/SemanticException.hpp"
+#include "GettextParser.h"
+#include "antlr/NoViableAltException.h"
+#include "antlr/SemanticException.h"
 #line 12 "gettext.g"
 
 #include <iostream>
-#include "GettextLexer.hpp"
-#include "GettextParser.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/CommonAST.hpp"
+#include "GettextLexer.h"
+#include "GettextParser.h"
+#include "antlr/AST.h"
+#include "antlr/CommonAST.h"
 
 /* 
 int main()
diff --git a/poxml/GettextParser.hpp b/poxml/GettextParser.h
index 46b2b137..6d48b8a3 100644
--- a/poxml/GettextParser.hpp
+++ b/poxml/GettextParser.h
@@ -7,18 +7,18 @@
 using namespace std;
 #include "parser.h"
 
-#line 11 "GettextParser.hpp"
-#include "antlr/config.hpp"
-/* $ANTLR 2.7.1: "gettext.g" -> "GettextParser.hpp"$ */
-#include "antlr/TokenStream.hpp"
-#include "antlr/TokenBuffer.hpp"
-#include "GettextParserTokenTypes.hpp"
-#include "antlr/LLkParser.hpp"
+#line 11 "GettextParser.h"
+#include "antlr/config.h"
+/* $ANTLR 2.7.1: "gettext.g" -> "GettextParser.h"$ */
+#include "antlr/TokenStream.h"
+#include "antlr/TokenBuffer.h"
+#include "GettextParserTokenTypes.h"
+#include "antlr/LLkParser.h"
 
 class GettextParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public GettextParserTokenTypes
  {
 #line 1 "gettext.g"
-#line 22 "GettextParser.hpp"
+#line 22 "GettextParser.h"
 protected:
 	GettextParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k);
 public:
diff --git a/poxml/GettextParserTokenTypes.hpp b/poxml/GettextParserTokenTypes.h
index 05fd7408..d6107c3d 100644
--- a/poxml/GettextParserTokenTypes.hpp
+++ b/poxml/GettextParserTokenTypes.h
@@ -1,7 +1,7 @@
 #ifndef INC_GettextParserTokenTypes_hpp_
 #define INC_GettextParserTokenTypes_hpp_
 
-/* $ANTLR 2.7.1: "gettext.g" -> "GettextParserTokenTypes.hpp"$ */
+/* $ANTLR 2.7.1: "gettext.g" -> "GettextParserTokenTypes.h"$ */
 struct GettextParserTokenTypes {
 	enum {
 		EOF_ = 1,
diff --git a/poxml/antlr/README b/poxml/antlr/README
index 6ca0913b..1f6d902d 100644
--- a/poxml/antlr/README
+++ b/poxml/antlr/README
@@ -64,7 +64,7 @@ and compile with an option to define away the word 'std', such as
 
 CC .... -Dstd= ....
 
-Also in the antlr subdirectory there's a file config.hpp. Tweak this one to
+Also in the antlr subdirectory there's a file config.h. Tweak this one to
 enable/disable the different bells and whistles used in the rest of the code.
 Don't forget to submit those changes back to us (along with compiler info)
 so we can incorporate them in our next release!
diff --git a/poxml/antlr/TODO b/poxml/antlr/TODO
index 51d104c3..0b97e6e5 100644
--- a/poxml/antlr/TODO
+++ b/poxml/antlr/TODO
@@ -10,7 +10,7 @@
 
 * On Thu, Sep 21, 2000 at 12:33:48AM -0700, John Lambert <JohnL@jBASE.com> wrote:
   > 1) The literal EOF is not defined and causes the define of EOF_CHAR  in
-  > CharScanner.hpp to fail.
+  > CharScanner.h to fail.
 
   ANTLR with STL Port. Changing the EOF define to char_traits<char>::eof()
   breaks things for gcc-2.95.2. Fix this in next release portably.
diff --git a/poxml/antlr/antlr/ANTLRException.hpp b/poxml/antlr/antlr/ANTLRException.h
index efbe0d7f..7f8415e5 100644
--- a/poxml/antlr/antlr/ANTLRException.hpp
+++ b/poxml/antlr/antlr/ANTLRException.h
@@ -33,7 +33,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 #include <exception>
 #include <string>
 
diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.h
index a36ffd15..c8610fdd 100644
--- a/poxml/antlr/antlr/AST.hpp
+++ b/poxml/antlr/antlr/AST.h
@@ -33,9 +33,9 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/ASTRefCount.hpp"
-#include "antlr/Token.hpp"
+#include "antlr/config.h"
+#include "antlr/ASTRefCount.h"
+#include "antlr/Token.h"
 #include <vector>
 #include <string>
 
diff --git a/poxml/antlr/antlr/ASTArray.hpp b/poxml/antlr/antlr/ASTArray.h
index 5203acf0..9e7fc51d 100644
--- a/poxml/antlr/antlr/ASTArray.hpp
+++ b/poxml/antlr/antlr/ASTArray.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.h
index 584cee6d..72cc08b1 100644
--- a/poxml/antlr/antlr/ASTFactory.hpp
+++ b/poxml/antlr/antlr/ASTFactory.h
@@ -33,10 +33,10 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/ASTArray.hpp"
-#include "antlr/ASTPair.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
+#include "antlr/ASTArray.h"
+#include "antlr/ASTPair.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/ASTNULLType.hpp b/poxml/antlr/antlr/ASTNULLType.h
index 8f3faa46..f4e3b7a9 100644
--- a/poxml/antlr/antlr/ASTNULLType.hpp
+++ b/poxml/antlr/antlr/ASTNULLType.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/ASTPair.hpp b/poxml/antlr/antlr/ASTPair.h
index eb7629ba..67756087 100644
--- a/poxml/antlr/antlr/ASTPair.hpp
+++ b/poxml/antlr/antlr/ASTPair.h
@@ -32,8 +32,8 @@
  * @author <br>John Lilley, <a href=http://www.Empathy.com>Empathy Software</a>
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/ASTRefCount.hpp b/poxml/antlr/antlr/ASTRefCount.h
index cb44128b..d181af5f 100644
--- a/poxml/antlr/antlr/ASTRefCount.hpp
+++ b/poxml/antlr/antlr/ASTRefCount.h
@@ -33,7 +33,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-# include "antlr/config.hpp"
+# include "antlr/config.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.h
index 7b93c1ef..5593f8e6 100644
--- a/poxml/antlr/antlr/BaseAST.hpp
+++ b/poxml/antlr/antlr/BaseAST.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/BitSet.hpp b/poxml/antlr/antlr/BitSet.h
index 4eb400c7..e1223523 100644
--- a/poxml/antlr/antlr/BitSet.hpp
+++ b/poxml/antlr/antlr/BitSet.h
@@ -1,7 +1,7 @@
 #ifndef INC_BitSet_hpp__
 #define INC_BitSet_hpp__
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 #include <vector>
 #include <stdexcept>
 
diff --git a/poxml/antlr/antlr/CharBuffer.hpp b/poxml/antlr/antlr/CharBuffer.h
index 45d467bb..d67d6b24 100644
--- a/poxml/antlr/antlr/CharBuffer.hpp
+++ b/poxml/antlr/antlr/CharBuffer.h
@@ -46,8 +46,8 @@
  * @see antlr.CharQueue
  */
 
-#include "antlr/config.hpp"
-#include "antlr/InputBuffer.hpp"
+#include "antlr/config.h"
+#include "antlr/InputBuffer.h"
 #include <iostream>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/CharScanner.hpp b/poxml/antlr/antlr/CharScanner.h
index 102d28e0..a2537964 100644
--- a/poxml/antlr/antlr/CharScanner.hpp
+++ b/poxml/antlr/antlr/CharScanner.h
@@ -36,12 +36,12 @@
  */
 
 #include <cstdio>
-#include "antlr/config.hpp"
-#include "antlr/TokenStream.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/InputBuffer.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/LexerSharedInputState.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStream.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/InputBuffer.h"
+#include "antlr/BitSet.h"
+#include "antlr/LexerSharedInputState.h"
 #include <map>
 #include <cstdio>
 
diff --git a/poxml/antlr/antlr/CharStreamException.hpp b/poxml/antlr/antlr/CharStreamException.h
index 33f52061..4febc19c 100644
--- a/poxml/antlr/antlr/CharStreamException.hpp
+++ b/poxml/antlr/antlr/CharStreamException.h
@@ -1,8 +1,8 @@
 #ifndef INC_CharStreamException_hpp__
 #define INC_CharStreamException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/ANTLRException.hpp"
+#include "antlr/config.h"
+#include "antlr/ANTLRException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/CharStreamIOException.hpp b/poxml/antlr/antlr/CharStreamIOException.h
index 1a8b1d1e..3b861065 100644
--- a/poxml/antlr/antlr/CharStreamIOException.hpp
+++ b/poxml/antlr/antlr/CharStreamIOException.h
@@ -1,8 +1,8 @@
 #ifndef INC_CharStreamIOException_hpp__
 #define INC_CharStreamIOException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/CharStreamException.hpp"
+#include "antlr/config.h"
+#include "antlr/CharStreamException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/CircularQueue.hpp b/poxml/antlr/antlr/CircularQueue.h
index eadf8d42..1534719b 100644
--- a/poxml/antlr/antlr/CircularQueue.hpp
+++ b/poxml/antlr/antlr/CircularQueue.h
@@ -33,7 +33,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 #include <vector>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/CommonAST.hpp b/poxml/antlr/antlr/CommonAST.h
index c7ab7313..7e7658ef 100644
--- a/poxml/antlr/antlr/CommonAST.hpp
+++ b/poxml/antlr/antlr/CommonAST.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/BaseAST.hpp"
+#include "antlr/config.h"
+#include "antlr/BaseAST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/CommonASTWithHiddenTokens.hpp b/poxml/antlr/antlr/CommonASTWithHiddenTokens.h
index 11e030e7..6385a0fc 100644
--- a/poxml/antlr/antlr/CommonASTWithHiddenTokens.hpp
+++ b/poxml/antlr/antlr/CommonASTWithHiddenTokens.h
@@ -5,8 +5,8 @@
  *  information from the Token used to create a node.
  */
 
-#include "antlr/config.hpp"
-#include "antlr/CommonAST.hpp"
+#include "antlr/config.h"
+#include "antlr/CommonAST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/CommonHiddenStreamToken.hpp b/poxml/antlr/antlr/CommonHiddenStreamToken.h
index 50ff2354..3ebb437f 100644
--- a/poxml/antlr/antlr/CommonHiddenStreamToken.hpp
+++ b/poxml/antlr/antlr/CommonHiddenStreamToken.h
@@ -1,8 +1,8 @@
 #ifndef INC_CommonHiddenStreamToken_hpp__
 #define INC_CommonHiddenStreamToken_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/CommonToken.hpp"
+#include "antlr/config.h"
+#include "antlr/CommonToken.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/CommonToken.hpp b/poxml/antlr/antlr/CommonToken.h
index 669aa535..19a4e868 100644
--- a/poxml/antlr/antlr/CommonToken.hpp
+++ b/poxml/antlr/antlr/CommonToken.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/Token.hpp"
+#include "antlr/config.h"
+#include "antlr/Token.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/InputBuffer.hpp b/poxml/antlr/antlr/InputBuffer.h
index 96e62191..ae206ecd 100644
--- a/poxml/antlr/antlr/InputBuffer.hpp
+++ b/poxml/antlr/antlr/InputBuffer.h
@@ -46,8 +46,8 @@
  * @see antlr.CharQueue
  */
 
-#include "antlr/config.hpp"
-#include "antlr/CircularQueue.hpp"
+#include "antlr/config.h"
+#include "antlr/CircularQueue.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/LLkParser.hpp b/poxml/antlr/antlr/LLkParser.h
index 8b8db188..2936ddfc 100644
--- a/poxml/antlr/antlr/LLkParser.hpp
+++ b/poxml/antlr/antlr/LLkParser.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/Parser.hpp"
+#include "antlr/config.h"
+#include "antlr/Parser.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/LexerSharedInputState.hpp b/poxml/antlr/antlr/LexerSharedInputState.h
index dba2a5f4..b0792044 100644
--- a/poxml/antlr/antlr/LexerSharedInputState.hpp
+++ b/poxml/antlr/antlr/LexerSharedInputState.h
@@ -1,9 +1,9 @@
 #ifndef INC_LexerSharedInputState_hpp__
 #define INC_LexerSharedInputState_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/InputBuffer.hpp"
-#include "antlr/RefCount.hpp"
+#include "antlr/config.h"
+#include "antlr/InputBuffer.h"
+#include "antlr/RefCount.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/Makefile.am b/poxml/antlr/antlr/Makefile.am
index bafa1347..9150b0cb 100644
--- a/poxml/antlr/antlr/Makefile.am
+++ b/poxml/antlr/antlr/Makefile.am
@@ -1,45 +1,45 @@
 noinst_HEADERS = \
-	ANTLRException.hpp \
-	AST.hpp \
-	ASTArray.hpp \
-	ASTFactory.hpp \
-	ASTNULLType.hpp \
-	ASTPair.hpp \
-	ASTRefCount.hpp \
-	BaseAST.hpp \
-	BitSet.hpp \
-	CharBuffer.hpp \
-	CharScanner.hpp \
-	CharStreamException.hpp \
-	CharStreamIOException.hpp \
-	CircularQueue.hpp \
-	CommonAST.hpp \
-	CommonASTWithHiddenTokens.hpp \
-	CommonHiddenStreamToken.hpp \
-	CommonToken.hpp \
-	InputBuffer.hpp \
-	LLkParser.hpp \
-	LexerSharedInputState.hpp \
-	MismatchedCharException.hpp \
-	MismatchedTokenException.hpp \
-	NoViableAltException.hpp \
-	NoViableAltForCharException.hpp \
-	Parser.hpp \
-	ParserSharedInputState.hpp \
-	RecognitionException.hpp \
-	RefCount.hpp \
-	SemanticException.hpp \
-	String.hpp \
-	Token.hpp \
-	TokenBuffer.hpp \
-	TokenStream.hpp \
-	TokenStreamBasicFilter.hpp \
-	TokenStreamException.hpp \
-	TokenStreamHiddenTokenFilter.hpp \
-	TokenStreamIOException.hpp \
-	TokenStreamRecognitionException.hpp \
-	TokenStreamRetryException.hpp \
-	TokenStreamSelector.hpp \
-	TreeParser.hpp \
-	TreeParserSharedInputState.hpp \
-	config.hpp
+	ANTLRException.h \
+	AST.h \
+	ASTArray.h \
+	ASTFactory.h \
+	ASTNULLType.h \
+	ASTPair.h \
+	ASTRefCount.h \
+	BaseAST.h \
+	BitSet.h \
+	CharBuffer.h \
+	CharScanner.h \
+	CharStreamException.h \
+	CharStreamIOException.h \
+	CircularQueue.h \
+	CommonAST.h \
+	CommonASTWithHiddenTokens.h \
+	CommonHiddenStreamToken.h \
+	CommonToken.h \
+	InputBuffer.h \
+	LLkParser.h \
+	LexerSharedInputState.h \
+	MismatchedCharException.h \
+	MismatchedTokenException.h \
+	NoViableAltException.h \
+	NoViableAltForCharException.h \
+	Parser.h \
+	ParserSharedInputState.h \
+	RecognitionException.h \
+	RefCount.h \
+	SemanticException.h \
+	String.h \
+	Token.h \
+	TokenBuffer.h \
+	TokenStream.h \
+	TokenStreamBasicFilter.h \
+	TokenStreamException.h \
+	TokenStreamHiddenTokenFilter.h \
+	TokenStreamIOException.h \
+	TokenStreamRecognitionException.h \
+	TokenStreamRetryException.h \
+	TokenStreamSelector.h \
+	TreeParser.h \
+	TreeParserSharedInputState.h \
+	config.h
diff --git a/poxml/antlr/antlr/MismatchedCharException.hpp b/poxml/antlr/antlr/MismatchedCharException.h
index ea923a9d..72e694af 100644
--- a/poxml/antlr/antlr/MismatchedCharException.hpp
+++ b/poxml/antlr/antlr/MismatchedCharException.h
@@ -33,10 +33,10 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/CharScanner.hpp"
+#include "antlr/config.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/BitSet.h"
+#include "antlr/CharScanner.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/MismatchedTokenException.hpp b/poxml/antlr/antlr/MismatchedTokenException.h
index ae4a82cd..600086a5 100644
--- a/poxml/antlr/antlr/MismatchedTokenException.hpp
+++ b/poxml/antlr/antlr/MismatchedTokenException.h
@@ -33,11 +33,11 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/Token.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/BitSet.h"
+#include "antlr/Token.h"
+#include "antlr/AST.h"
 #include <vector>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/NoViableAltException.hpp b/poxml/antlr/antlr/NoViableAltException.h
index f85bcf96..6bcc6cfb 100644
--- a/poxml/antlr/antlr/NoViableAltException.hpp
+++ b/poxml/antlr/antlr/NoViableAltException.h
@@ -33,10 +33,10 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/Token.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/config.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/Token.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/NoViableAltForCharException.hpp b/poxml/antlr/antlr/NoViableAltForCharException.h
index 756e9c7f..cc5f6930 100644
--- a/poxml/antlr/antlr/NoViableAltForCharException.hpp
+++ b/poxml/antlr/antlr/NoViableAltForCharException.h
@@ -33,9 +33,9 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/CharScanner.hpp"
+#include "antlr/config.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/CharScanner.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/Parser.hpp b/poxml/antlr/antlr/Parser.h
index 767953d3..fab69bfe 100644
--- a/poxml/antlr/antlr/Parser.hpp
+++ b/poxml/antlr/antlr/Parser.h
@@ -33,12 +33,12 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/TokenBuffer.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/ASTFactory.hpp"
-#include "antlr/ParserSharedInputState.hpp"
+#include "antlr/config.h"
+#include "antlr/BitSet.h"
+#include "antlr/TokenBuffer.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/ASTFactory.h"
+#include "antlr/ParserSharedInputState.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/ParserSharedInputState.hpp b/poxml/antlr/antlr/ParserSharedInputState.h
index b5599954..bcc45171 100644
--- a/poxml/antlr/antlr/ParserSharedInputState.hpp
+++ b/poxml/antlr/antlr/ParserSharedInputState.h
@@ -1,9 +1,9 @@
 #ifndef INC_ParserSharedInputState_hpp__
 #define INC_ParserSharedInputState_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenBuffer.hpp"
-#include "antlr/RefCount.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenBuffer.h"
+#include "antlr/RefCount.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/RecognitionException.hpp b/poxml/antlr/antlr/RecognitionException.h
index c6439111..b7102f17 100644
--- a/poxml/antlr/antlr/RecognitionException.hpp
+++ b/poxml/antlr/antlr/RecognitionException.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/ANTLRException.hpp"
+#include "antlr/config.h"
+#include "antlr/ANTLRException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/RefCount.hpp b/poxml/antlr/antlr/RefCount.h
index 9306576b..12e0bdf6 100644
--- a/poxml/antlr/antlr/RefCount.hpp
+++ b/poxml/antlr/antlr/RefCount.h
@@ -33,7 +33,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/SemanticException.hpp b/poxml/antlr/antlr/SemanticException.h
index 3f1a9447..77eae0e4 100644
--- a/poxml/antlr/antlr/SemanticException.hpp
+++ b/poxml/antlr/antlr/SemanticException.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RecognitionException.hpp"
+#include "antlr/config.h"
+#include "antlr/RecognitionException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/String.hpp b/poxml/antlr/antlr/String.h
index 5fac82d6..863454a7 100644
--- a/poxml/antlr/antlr/String.hpp
+++ b/poxml/antlr/antlr/String.h
@@ -33,7 +33,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/Token.hpp b/poxml/antlr/antlr/Token.h
index b85551c3..6951528d 100644
--- a/poxml/antlr/antlr/Token.hpp
+++ b/poxml/antlr/antlr/Token.h
@@ -33,8 +33,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/RefCount.hpp"
+#include "antlr/config.h"
+#include "antlr/RefCount.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/TokenBuffer.hpp b/poxml/antlr/antlr/TokenBuffer.h
index b7c1b25f..2afcdfa6 100644
--- a/poxml/antlr/antlr/TokenBuffer.hpp
+++ b/poxml/antlr/antlr/TokenBuffer.h
@@ -33,9 +33,9 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStream.hpp"
-#include "antlr/CircularQueue.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStream.h"
+#include "antlr/CircularQueue.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStream.hpp b/poxml/antlr/antlr/TokenStream.h
index e8436419..5e09b307 100644
--- a/poxml/antlr/antlr/TokenStream.hpp
+++ b/poxml/antlr/antlr/TokenStream.h
@@ -38,8 +38,8 @@
  * @author Terence Parr, MageLang Institute
  */
 
-#include "antlr/config.hpp"
-#include "antlr/Token.hpp"
+#include "antlr/config.h"
+#include "antlr/Token.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp b/poxml/antlr/antlr/TokenStreamBasicFilter.h
index 5438878b..af172bc8 100644
--- a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamBasicFilter.h
@@ -1,9 +1,9 @@
 #ifndef INC_TokenStreamBasicFilter_hpp__
 #define INC_TokenStreamBasicFilter_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/TokenStream.hpp"
+#include "antlr/config.h"
+#include "antlr/BitSet.h"
+#include "antlr/TokenStream.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStreamException.hpp b/poxml/antlr/antlr/TokenStreamException.h
index 2dc96776..c923330d 100644
--- a/poxml/antlr/antlr/TokenStreamException.hpp
+++ b/poxml/antlr/antlr/TokenStreamException.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamException_hpp__
 #define INC_TokenStreamException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/ANTLRException.hpp"
+#include "antlr/config.h"
+#include "antlr/ANTLRException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.h
index 47aad001..4acc93e3 100644
--- a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamHiddenTokenFilter_hpp__
 #define INC_TokenStreamHiddenTokenFilter_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStreamBasicFilter.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStreamBasicFilter.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStreamIOException.hpp b/poxml/antlr/antlr/TokenStreamIOException.h
index 9ac6d759..7d13bc1d 100644
--- a/poxml/antlr/antlr/TokenStreamIOException.hpp
+++ b/poxml/antlr/antlr/TokenStreamIOException.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamIOException_hpp__
 #define INC_TokenStreamIOException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStreamException.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStreamException.h"
 #include <exception>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/TokenStreamRecognitionException.hpp b/poxml/antlr/antlr/TokenStreamRecognitionException.h
index 4aa4609f..7d3e2ae7 100644
--- a/poxml/antlr/antlr/TokenStreamRecognitionException.hpp
+++ b/poxml/antlr/antlr/TokenStreamRecognitionException.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamRecognitionException_hpp__
 #define INC_TokenStreamRecognitionException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStreamException.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStreamException.h"
 #include <exception>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/antlr/TokenStreamRetryException.hpp b/poxml/antlr/antlr/TokenStreamRetryException.h
index a940d8c4..c4664ef3 100644
--- a/poxml/antlr/antlr/TokenStreamRetryException.hpp
+++ b/poxml/antlr/antlr/TokenStreamRetryException.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamRetryException_hpp__
 #define INC_TokenStreamRetryException_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStreamException.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStreamException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TokenStreamSelector.hpp b/poxml/antlr/antlr/TokenStreamSelector.h
index 7e7d7398..14b1b22a 100644
--- a/poxml/antlr/antlr/TokenStreamSelector.hpp
+++ b/poxml/antlr/antlr/TokenStreamSelector.h
@@ -1,8 +1,8 @@
 #ifndef INC_TokenStreamSelector_hpp__
 #define INC_TokenStreamSelector_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/TokenStream.hpp"
+#include "antlr/config.h"
+#include "antlr/TokenStream.h"
 #include <map>
 #include <stack>
 
diff --git a/poxml/antlr/antlr/TreeParser.hpp b/poxml/antlr/antlr/TreeParser.h
index ed474bd1..28f13b42 100644
--- a/poxml/antlr/antlr/TreeParser.hpp
+++ b/poxml/antlr/antlr/TreeParser.h
@@ -32,12 +32,12 @@
  * @author <br>John Lilley, <a href=http://www.Empathy.com>Empathy Software</a>
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/ASTFactory.hpp"
-#include "antlr/BitSet.hpp"
-#include "antlr/RecognitionException.hpp"
-#include "antlr/TreeParserSharedInputState.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
+#include "antlr/ASTFactory.h"
+#include "antlr/BitSet.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/TreeParserSharedInputState.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/TreeParserSharedInputState.hpp b/poxml/antlr/antlr/TreeParserSharedInputState.h
index 8f7b0922..49180eb9 100644
--- a/poxml/antlr/antlr/TreeParserSharedInputState.hpp
+++ b/poxml/antlr/antlr/TreeParserSharedInputState.h
@@ -1,8 +1,8 @@
 #ifndef INC_TreeParserSharedInputState_hpp__
 #define INC_TreeParserSharedInputState_hpp__
 
-#include "antlr/config.hpp"
-#include "antlr/RefCount.hpp"
+#include "antlr/config.h"
+#include "antlr/RefCount.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/antlr/config.hpp b/poxml/antlr/antlr/config.h
index 8ac94a3a..8ac94a3a 100644
--- a/poxml/antlr/antlr/config.hpp
+++ b/poxml/antlr/antlr/config.h
diff --git a/poxml/antlr/src/ANTLRException.cpp b/poxml/antlr/src/ANTLRException.cpp
index 42632e71..5b2dc93c 100644
--- a/poxml/antlr/src/ANTLRException.cpp
+++ b/poxml/antlr/src/ANTLRException.cpp
@@ -30,7 +30,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/ANTLRException.hpp"
+#include "antlr/ANTLRException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp
index e44386f7..fbe717fd 100644
--- a/poxml/antlr/src/ASTFactory.cpp
+++ b/poxml/antlr/src/ASTFactory.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/ASTFactory.hpp"
-#include "antlr/CommonAST.hpp"
+#include "antlr/ASTFactory.h"
+#include "antlr/CommonAST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/ASTRefCount.cpp b/poxml/antlr/src/ASTRefCount.cpp
index 1da98306..2498d759 100644
--- a/poxml/antlr/src/ASTRefCount.cpp
+++ b/poxml/antlr/src/ASTRefCount.cpp
@@ -1,5 +1,5 @@
-#include "antlr/ASTRefCount.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/ASTRefCount.h"
+#include "antlr/AST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp
index 4080e0e8..ddb129ef 100644
--- a/poxml/antlr/src/BaseAST.cpp
+++ b/poxml/antlr/src/BaseAST.cpp
@@ -30,7 +30,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/BaseAST.hpp"
+#include "antlr/BaseAST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/BitSet.cpp b/poxml/antlr/src/BitSet.cpp
index 69e70a68..32750009 100644
--- a/poxml/antlr/src/BitSet.cpp
+++ b/poxml/antlr/src/BitSet.cpp
@@ -1,4 +1,4 @@
-#include "antlr/BitSet.hpp"
+#include "antlr/BitSet.h"
 #include <string>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/src/CharBuffer.cpp b/poxml/antlr/src/CharBuffer.cpp
index a43eb153..312af533 100644
--- a/poxml/antlr/src/CharBuffer.cpp
+++ b/poxml/antlr/src/CharBuffer.cpp
@@ -43,7 +43,7 @@
  * @see antlr.CharQueue
  */
 
-#include "antlr/CharBuffer.hpp"
+#include "antlr/CharBuffer.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp
index ff40138d..8374651e 100644
--- a/poxml/antlr/src/CharScanner.cpp
+++ b/poxml/antlr/src/CharScanner.cpp
@@ -30,9 +30,9 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/CharScanner.hpp"
-#include "antlr/CommonToken.hpp"
-#include "antlr/MismatchedCharException.hpp"
+#include "antlr/CharScanner.h"
+#include "antlr/CommonToken.h"
+#include "antlr/MismatchedCharException.h"
 #include <map>
 
 #ifdef HAS_NOT_CCTYPE_H
diff --git a/poxml/antlr/src/CommonAST.cpp b/poxml/antlr/src/CommonAST.cpp
index 3a4067e3..0204b452 100644
--- a/poxml/antlr/src/CommonAST.cpp
+++ b/poxml/antlr/src/CommonAST.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/config.hpp"
-#include "antlr/CommonAST.hpp"
+#include "antlr/config.h"
+#include "antlr/CommonAST.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/CommonASTWithHiddenTokens.cpp b/poxml/antlr/src/CommonASTWithHiddenTokens.cpp
index d6c242d2..6b0213fe 100644
--- a/poxml/antlr/src/CommonASTWithHiddenTokens.cpp
+++ b/poxml/antlr/src/CommonASTWithHiddenTokens.cpp
@@ -1,6 +1,6 @@
-#include "antlr/config.hpp"
-#include "antlr/CommonASTWithHiddenTokens.hpp"
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/config.h"
+#include "antlr/CommonASTWithHiddenTokens.h"
+#include "antlr/CommonHiddenStreamToken.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/CommonHiddenStreamToken.cpp b/poxml/antlr/src/CommonHiddenStreamToken.cpp
index d33927cc..ea3ab8e9 100644
--- a/poxml/antlr/src/CommonHiddenStreamToken.cpp
+++ b/poxml/antlr/src/CommonHiddenStreamToken.cpp
@@ -1,4 +1,4 @@
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/CommonHiddenStreamToken.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/CommonToken.cpp b/poxml/antlr/src/CommonToken.cpp
index ff60bd79..262536ca 100644
--- a/poxml/antlr/src/CommonToken.cpp
+++ b/poxml/antlr/src/CommonToken.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/CommonToken.hpp"
-#include "antlr/String.hpp"
+#include "antlr/CommonToken.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/InputBuffer.cpp b/poxml/antlr/src/InputBuffer.cpp
index 058c32ab..3eb6732b 100644
--- a/poxml/antlr/src/InputBuffer.cpp
+++ b/poxml/antlr/src/InputBuffer.cpp
@@ -43,7 +43,7 @@
  * @see antlr.CharQueue
  */
 
-#include "antlr/InputBuffer.hpp"
+#include "antlr/InputBuffer.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/LLkParser.cpp b/poxml/antlr/src/LLkParser.cpp
index 2f21cd8b..647d6562 100644
--- a/poxml/antlr/src/LLkParser.cpp
+++ b/poxml/antlr/src/LLkParser.cpp
@@ -30,7 +30,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/LLkParser.hpp"
+#include "antlr/LLkParser.h"
 #include <iostream>
 
 ANTLR_BEGIN_NAMESPACE(antlr)
diff --git a/poxml/antlr/src/LexerSharedInputState.cpp b/poxml/antlr/src/LexerSharedInputState.cpp
index a95f33a8..3099a839 100644
--- a/poxml/antlr/src/LexerSharedInputState.cpp
+++ b/poxml/antlr/src/LexerSharedInputState.cpp
@@ -1,5 +1,5 @@
-#include "antlr/LexerSharedInputState.hpp"
-#include "antlr/CharBuffer.hpp"
+#include "antlr/LexerSharedInputState.h"
+#include "antlr/CharBuffer.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/MismatchedCharException.cpp b/poxml/antlr/src/MismatchedCharException.cpp
index 4dede0e8..06e730d0 100644
--- a/poxml/antlr/src/MismatchedCharException.cpp
+++ b/poxml/antlr/src/MismatchedCharException.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/MismatchedCharException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/MismatchedCharException.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/MismatchedTokenException.cpp b/poxml/antlr/src/MismatchedTokenException.cpp
index b8b10808..1ac2f9cb 100644
--- a/poxml/antlr/src/MismatchedTokenException.cpp
+++ b/poxml/antlr/src/MismatchedTokenException.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/MismatchedTokenException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/MismatchedTokenException.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/NoViableAltException.cpp b/poxml/antlr/src/NoViableAltException.cpp
index 433f4325..46fcbd08 100644
--- a/poxml/antlr/src/NoViableAltException.cpp
+++ b/poxml/antlr/src/NoViableAltException.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/NoViableAltException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/NoViableAltException.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/NoViableAltForCharException.cpp b/poxml/antlr/src/NoViableAltForCharException.cpp
index 2ff9120f..9765da58 100644
--- a/poxml/antlr/src/NoViableAltForCharException.cpp
+++ b/poxml/antlr/src/NoViableAltForCharException.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/NoViableAltForCharException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/NoViableAltForCharException.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/Parser.cpp b/poxml/antlr/src/Parser.cpp
index 5a0388d4..115bf228 100644
--- a/poxml/antlr/src/Parser.cpp
+++ b/poxml/antlr/src/Parser.cpp
@@ -30,12 +30,12 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/Parser.hpp"
+#include "antlr/Parser.h"
 
-#include "antlr/BitSet.hpp"
-#include "antlr/TokenBuffer.hpp"
-#include "antlr/MismatchedTokenException.hpp"
-//#include "antlr/ASTFactory.hpp"
+#include "antlr/BitSet.h"
+#include "antlr/TokenBuffer.h"
+#include "antlr/MismatchedTokenException.h"
+//#include "antlr/ASTFactory.h"
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/poxml/antlr/src/ParserSharedInputState.cpp b/poxml/antlr/src/ParserSharedInputState.cpp
index 102aba87..1f70f5ef 100644
--- a/poxml/antlr/src/ParserSharedInputState.cpp
+++ b/poxml/antlr/src/ParserSharedInputState.cpp
@@ -1,4 +1,4 @@
-#include "antlr/ParserSharedInputState.hpp"
+#include "antlr/ParserSharedInputState.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/RecognitionException.cpp b/poxml/antlr/src/RecognitionException.cpp
index 1d1bd53d..cd1c9fd1 100644
--- a/poxml/antlr/src/RecognitionException.cpp
+++ b/poxml/antlr/src/RecognitionException.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/RecognitionException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/RecognitionException.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/String.cpp b/poxml/antlr/src/String.cpp
index 6d9df7a5..79d8cd27 100644
--- a/poxml/antlr/src/String.cpp
+++ b/poxml/antlr/src/String.cpp
@@ -30,7 +30,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/String.hpp"
+#include "antlr/String.h"
 
 #ifdef HAS_NOT_CSTDIO_H
 #include <stdio.h>
diff --git a/poxml/antlr/src/Token.cpp b/poxml/antlr/src/Token.cpp
index f307774f..2da6c313 100644
--- a/poxml/antlr/src/Token.cpp
+++ b/poxml/antlr/src/Token.cpp
@@ -30,8 +30,8 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/Token.hpp"
-#include "antlr/String.hpp"
+#include "antlr/Token.h"
+#include "antlr/String.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/TokenBuffer.cpp b/poxml/antlr/src/TokenBuffer.cpp
index ded5df9b..312d14a2 100644
--- a/poxml/antlr/src/TokenBuffer.cpp
+++ b/poxml/antlr/src/TokenBuffer.cpp
@@ -30,7 +30,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
-#include "antlr/TokenBuffer.hpp"
+#include "antlr/TokenBuffer.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/TokenStreamBasicFilter.cpp b/poxml/antlr/src/TokenStreamBasicFilter.cpp
index 71257f46..c2bfcdcf 100644
--- a/poxml/antlr/src/TokenStreamBasicFilter.cpp
+++ b/poxml/antlr/src/TokenStreamBasicFilter.cpp
@@ -1,4 +1,4 @@
-#include "antlr/TokenStreamBasicFilter.hpp"
+#include "antlr/TokenStreamBasicFilter.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 827ca382..72af82cb 100644
--- a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -1,5 +1,5 @@
-#include "antlr/TokenStreamHiddenTokenFilter.hpp"
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/TokenStreamHiddenTokenFilter.h"
+#include "antlr/CommonHiddenStreamToken.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/TokenStreamSelector.cpp b/poxml/antlr/src/TokenStreamSelector.cpp
index 2e6527a8..073a8f44 100644
--- a/poxml/antlr/src/TokenStreamSelector.cpp
+++ b/poxml/antlr/src/TokenStreamSelector.cpp
@@ -1,5 +1,5 @@
-#include "antlr/TokenStreamSelector.hpp"
-#include "antlr/TokenStreamRetryException.hpp"
+#include "antlr/TokenStreamSelector.h"
+#include "antlr/TokenStreamRetryException.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/antlr/src/TreeParser.cpp b/poxml/antlr/src/TreeParser.cpp
index 6d302737..1e83bd77 100644
--- a/poxml/antlr/src/TreeParser.cpp
+++ b/poxml/antlr/src/TreeParser.cpp
@@ -29,9 +29,9 @@
  * @author <br>John Lilley, <a href=http://www.Empathy.com>Empathy Software</a>
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
-#include "antlr/TreeParser.hpp"
-#include "antlr/ASTNULLType.hpp"
-#include "antlr/MismatchedTokenException.hpp"
+#include "antlr/TreeParser.h"
+#include "antlr/ASTNULLType.h"
+#include "antlr/MismatchedTokenException.h"
 #include <iostream>
 #include <stdlib.h>
 
diff --git a/poxml/antlr/src/TreeParserSharedInputState.cpp b/poxml/antlr/src/TreeParserSharedInputState.cpp
index 89f1d5dc..be7adebb 100644
--- a/poxml/antlr/src/TreeParserSharedInputState.cpp
+++ b/poxml/antlr/src/TreeParserSharedInputState.cpp
@@ -1,4 +1,4 @@
-#include "antlr/TreeParserSharedInputState.hpp"
+#include "antlr/TreeParserSharedInputState.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
diff --git a/poxml/gettext.g b/poxml/gettext.g
index 8da92334..1e0a3b34 100644
--- a/poxml/gettext.g
+++ b/poxml/gettext.g
@@ -11,10 +11,10 @@ options {
 
 {
 #include <iostream>
-#include "GettextLexer.hpp"
-#include "GettextParser.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/CommonAST.hpp"
+#include "GettextLexer.h"
+#include "GettextParser.h"
+#include "antlr/AST.h"
+#include "antlr/CommonAST.h"
 
 /* 
 int main()
diff --git a/poxml/po2xml.cpp b/poxml/po2xml.cpp
index e43f464a..65c4e013 100644
--- a/poxml/po2xml.cpp
+++ b/poxml/po2xml.cpp
@@ -7,10 +7,10 @@
 #include <tqregexp.h>
 
 #include <fstream>
-#include "GettextLexer.hpp"
-#include "GettextParser.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/CommonAST.hpp"
+#include "GettextLexer.h"
+#include "GettextParser.h"
+#include "antlr/AST.h"
+#include "antlr/CommonAST.h"
 
 using namespace std;
 
diff --git a/poxml/swappo.cpp b/poxml/swappo.cpp
index 8e2e8344..16e7ee7f 100644
--- a/poxml/swappo.cpp
+++ b/poxml/swappo.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 using namespace std;
-#include "GettextParser.hpp"
+#include "GettextParser.h"
 #include <fstream>
-#include "GettextLexer.hpp"
+#include "GettextLexer.h"
 
 int main(int argc, char **argv)
 {
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index 1ffff4a8..61338b91 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 using namespace std;
-#include "GettextParser.hpp"
+#include "GettextParser.h"
 #include <fstream>
-#include "GettextLexer.hpp"
+#include "GettextLexer.h"
 
 #include <tqregexp.h>
 #include <tqdatetime.h>
diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am
index a68fd709..c9687f27 100644
--- a/umbrello/umbrello/Makefile.am
+++ b/umbrello/umbrello/Makefile.am
@@ -140,7 +140,7 @@ umbrello_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
 messages: rc.cpp
 	$(PREPARETIPS) > tips.txt
 	$(EXTRACTRC) *.rc codegenerators/*.ui dialogs/*.ui > ./rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.txt -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.txt -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/umbrello.pot; \
 	fi