88 files changed, 265 insertions, 264 deletions
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..ece0b5b3 100644
--- a/poxml/antlr/antlr/CharScanner.hpp
+++ b/poxml/antlr/antlr/CharScanner.h
@@ -36,20 +36,21 @@
  */
 
 #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 <functional>
 #include <map>
-#include <cstdio>
+
+#include "antlr/config.h"
+#include "antlr/TokenStream.h"
+#include "antlr/RecognitionException.h"
+#include "antlr/InputBuffer.h"
+#include "antlr/BitSet.h"
+#include "antlr/LexerSharedInputState.h"
 
 ANTLR_BEGIN_NAMESPACE(antlr)
 
 class CharScanner;
 
-class CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)binary_function<ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string,bool> {
+class CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)function<bool(ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string)> {
 private:
 	const CharScanner* scanner;
 public:
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..c50cd5b0 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()
@@ -57,17 +57,17 @@ string c, mi, mip, ms;
   : c=comment mi=msgid
   (
    ( ms=msgstr {
-	mb.comment = QString::fromUtf8(c.c_str());
-	mb.msgid = QString::fromUtf8(mi.c_str());
-	mb.msgstr = QString::fromUtf8(ms.c_str());   
+	mb.comment = TQString::fromUtf8(c.c_str());
+	mb.msgid = TQString::fromUtf8(mi.c_str());
+	mb.msgstr = TQString::fromUtf8(ms.c_str());   
      }
    )
    |
    ( mip=msgid_plural ms=msgstr_plural {
-	mb.comment = QString::fromUtf8(c.c_str());
-	mb.msgid = QString::fromUtf8(mi.c_str());
-	mb.msgid_plural = QString::fromUtf8(mip.c_str());
-	mb.msgstr = QString::fromUtf8(ms.c_str());   
+	mb.comment = TQString::fromUtf8(c.c_str());
+	mb.msgid = TQString::fromUtf8(mi.c_str());
+	mb.msgid_plural = TQString::fromUtf8(mip.c_str());
+	mb.msgstr = TQString::fromUtf8(ms.c_str());   
      }
    )
   )
diff --git a/poxml/lauri.po b/poxml/lauri.po
index d212f69a..9dd0d025 100644
--- a/poxml/lauri.po
+++ b/poxml/lauri.po
@@ -407,7 +407,7 @@ msgid ""
 "-&gt;       int penWidth()\n"
 "-&gt;          { return pen.width(); }\n"
 "\n"
-"      public Q_SLOTS:\n"
+"      public slots:\n"
 "         void updateAllViews(KScribbleView *sender);\n"
 "        \n"
 "      protected:\n"
@@ -429,7 +429,7 @@ msgstr ""
 "                \n"
 "-&gt;       int penWidth()\n"
 "-&gt;          { return pen.width(); }\n"
-"      public Q_SLOTS:\n"
+"      public slots:\n"
 "         void updateAllViews(KScribbleView *sender);\n"
 "        \n"
 "      protected:\n"
diff --git a/poxml/lauri.xml b/poxml/lauri.xml
index 18a1e08a..27715981 100644
--- a/poxml/lauri.xml
+++ b/poxml/lauri.xml
@@ -221,7 +221,7 @@ Send             ppp
 -&gt;       int penWidth()
 -&gt;          { return pen.width(); }
 
-      public Q_SLOTS:
+      public slots:
          void updateAllViews(KScribbleView *sender);
         
       protected:
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..9613021f 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>
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
         headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <null@kde.org>" );
         headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <kde-i18n-doc@kde.org>" );
         TQString revisionDate ( "PO-Revision-Date: " );
-        const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC );
+        const TQDateTime dt = TQDateTime::currentDateTime( TQt::UTC );
         revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
         headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate );
         headerLines << "Plural-Forms: nplurals=1; plural=0;";
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index f8c0e30d..5cce0546 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
         }
     }
 
-    const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC );
+    const TQDateTime now = TQDateTime::currentDateTime( TQt::UTC );
     
     cout << "# SOME DESCRIPTIVE TITLE.\n";
     cout << "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n";