Renaming of files in preparation for code style tools.

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

45 files changed, 151 insertions, 151 deletions

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