82 files changed, 341 insertions, 341 deletions
diff --git a/lib/antlr/README b/lib/antlr/README
index 6ca0913b..1f6d902d 100644
--- a/lib/antlr/README
+++ b/lib/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/lib/antlr/TODO b/lib/antlr/TODO
index 51d104c3..0b97e6e5 100644
--- a/lib/antlr/TODO
+++ b/lib/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/lib/antlr/antlr/ANTLRException.hpp b/lib/antlr/antlr/ANTLRException.h
index 426595a2..b67f5771 100644
--- a/lib/antlr/antlr/ANTLRException.hpp
+++ b/lib/antlr/antlr/ANTLRException.h
@@ -1,5 +1,5 @@
-#ifndef INC_ANTLRException_hpp__
-#define INC_ANTLRException_hpp__
+#ifndef INC_ANTLRException_h__
+#define INC_ANTLRException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -56,4 +56,4 @@ private:
 }
 #endif
 
-#endif //INC_ANTLRException_hpp__
+#endif //INC_ANTLRException_h__
diff --git a/lib/antlr/antlr/ANTLRUtil.hpp b/lib/antlr/antlr/ANTLRUtil.h
index 4732588c..33f37792 100644
--- a/lib/antlr/antlr/ANTLRUtil.hpp
+++ b/lib/antlr/antlr/ANTLRUtil.h
@@ -1,5 +1,5 @@
-#ifndef INC_ANTLRUtil_hpp__
-#define INC_ANTLRUtil_hpp__
+#ifndef INC_ANTLRUtil_h__
+#define INC_ANTLRUtil_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 #include <iostream>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.h
index b01a60a9..49d11b76 100644
--- a/lib/antlr/antlr/AST.hpp
+++ b/lib/antlr/antlr/AST.h
@@ -1,5 +1,5 @@
-#ifndef INC_AST_hpp__
-#define INC_AST_hpp__
+#ifndef INC_AST_h__
+#define INC_AST_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-#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>
 
@@ -163,4 +163,4 @@ inline bool operator<( RefAST l, RefAST r )
 }
 #endif
 
-#endif //INC_AST_hpp__
+#endif //INC_AST_h__
diff --git a/lib/antlr/antlr/ASTArray.hpp b/lib/antlr/antlr/ASTArray.h
index 2d224d32..134fc1fb 100644
--- a/lib/antlr/antlr/ASTArray.hpp
+++ b/lib/antlr/antlr/ASTArray.h
@@ -1,5 +1,5 @@
-#ifndef INC_ASTArray_hpp__
-#define INC_ASTArray_hpp__
+#ifndef INC_ASTArray_h__
+#define INC_ASTArray_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/AST.hpp>
+#include <antlr/config.h>
+#include <antlr/AST.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -42,4 +42,4 @@ public:
 }
 #endif
 
-#endif //INC_ASTArray_hpp__
+#endif //INC_ASTArray_h__
diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.h
index 968ab6c5..04d626d9 100644
--- a/lib/antlr/antlr/ASTFactory.hpp
+++ b/lib/antlr/antlr/ASTFactory.h
@@ -1,5 +1,5 @@
-#ifndef INC_ASTFactory_hpp__
-#define INC_ASTFactory_hpp__
+#ifndef INC_ASTFactory_h__
+#define INC_ASTFactory_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,10 +8,10 @@
  * $Id$
  */
 
-#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>
 
 #include <istream>
 #include <utility>
@@ -162,4 +162,4 @@ private:
 }
 #endif
 
-#endif //INC_ASTFactory_hpp__
+#endif //INC_ASTFactory_h__
diff --git a/lib/antlr/antlr/ASTNULLType.hpp b/lib/antlr/antlr/ASTNULLType.h
index 867f5e5b..70d34cca 100644
--- a/lib/antlr/antlr/ASTNULLType.hpp
+++ b/lib/antlr/antlr/ASTNULLType.h
@@ -1,5 +1,5 @@
-#ifndef INC_ASTNULLType_hpp__
-#define INC_ASTNULLType_hpp__
+#ifndef INC_ASTNULLType_h__
+#define INC_ASTNULLType_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/AST.hpp>
+#include <antlr/config.h>
+#include <antlr/AST.h>
 #include <iostream>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -61,4 +61,4 @@ public:
 }
 #endif
 
-#endif //INC_ASTNULLType_hpp__
+#endif //INC_ASTNULLType_h__
diff --git a/lib/antlr/antlr/ASTPair.hpp b/lib/antlr/antlr/ASTPair.h
index d6237902..a3f52959 100644
--- a/lib/antlr/antlr/ASTPair.hpp
+++ b/lib/antlr/antlr/ASTPair.h
@@ -1,5 +1,5 @@
-#ifndef INC_ASTPair_hpp__
-#define INC_ASTPair_hpp__
+#ifndef INC_ASTPair_h__
+#define INC_ASTPair_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/AST.hpp>
+#include <antlr/config.h>
+#include <antlr/AST.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -54,4 +54,4 @@ public:
 }
 #endif
 
-#endif //INC_ASTPair_hpp__
+#endif //INC_ASTPair_h__
diff --git a/lib/antlr/antlr/ASTRefCount.hpp b/lib/antlr/antlr/ASTRefCount.h
index f5ef4422..889ecc9d 100644
--- a/lib/antlr/antlr/ASTRefCount.hpp
+++ b/lib/antlr/antlr/ASTRefCount.h
@@ -1,5 +1,5 @@
-#ifndef INC_ASTRefCount_hpp__
-# define INC_ASTRefCount_hpp__
+#ifndef INC_ASTRefCount_h__
+# define INC_ASTRefCount_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-# include <antlr/config.hpp>
+# include <antlr/config.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -95,4 +95,4 @@ typedef ASTRefCount<AST> RefAST;
 }
 #endif
 
-#endif //INC_ASTRefCount_hpp__
+#endif //INC_ASTRefCount_h__
diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.h
index 1bfc4e56..bb797f24 100644
--- a/lib/antlr/antlr/BaseAST.hpp
+++ b/lib/antlr/antlr/BaseAST.h
@@ -1,5 +1,5 @@
-#ifndef INC_BaseAST_hpp__
-#define INC_BaseAST_hpp__
+#ifndef INC_BaseAST_h__
+#define INC_BaseAST_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/AST.hpp>
+#include <antlr/config.h>
+#include <antlr/AST.h>
 
 #include <iostream>
 
@@ -190,4 +190,4 @@ inline bool BaseAST::equals(RefAST t) const
 }
 #endif
 
-#endif //INC_BaseAST_hpp__
+#endif //INC_BaseAST_h__
diff --git a/lib/antlr/antlr/BitSet.hpp b/lib/antlr/antlr/BitSet.h
index f7619232..696a91a0 100644
--- a/lib/antlr/antlr/BitSet.hpp
+++ b/lib/antlr/antlr/BitSet.h
@@ -1,5 +1,5 @@
-#ifndef INC_BitSet_hpp__
-#define INC_BitSet_hpp__
+#ifndef INC_BitSet_h__
+#define INC_BitSet_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 #include <vector>
 #include <stdexcept>
 
@@ -57,4 +57,4 @@ public:
 }
 #endif
 
-#endif //INC_BitSet_hpp__
+#endif //INC_BitSet_h__
diff --git a/lib/antlr/antlr/CharBuffer.hpp b/lib/antlr/antlr/CharBuffer.h
index fe2b1bc5..647fe466 100644
--- a/lib/antlr/antlr/CharBuffer.hpp
+++ b/lib/antlr/antlr/CharBuffer.h
@@ -1,5 +1,5 @@
-#ifndef INC_CharBuffer_hpp__
-#define INC_CharBuffer_hpp__
+#ifndef INC_CharBuffer_h__
+#define INC_CharBuffer_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,11 +8,11 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
 #include <istream>
 
-#include <antlr/InputBuffer.hpp>
+#include <antlr/InputBuffer.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -53,4 +53,4 @@ private:
 }
 #endif
 
-#endif //INC_CharBuffer_hpp__
+#endif //INC_CharBuffer_h__
diff --git a/lib/antlr/antlr/CharInputBuffer.hpp b/lib/antlr/antlr/CharInputBuffer.h
index 543972a3..8d4b3369 100644
--- a/lib/antlr/antlr/CharInputBuffer.hpp
+++ b/lib/antlr/antlr/CharInputBuffer.h
@@ -1,5 +1,5 @@
-#ifndef INC_CharInputBuffer_hpp__
-# define INC_CharInputBuffer_hpp__
+#ifndef INC_CharInputBuffer_h__
+# define INC_CharInputBuffer_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-# include <antlr/config.hpp>
-# include <antlr/InputBuffer.hpp>
+# include <antlr/config.h>
+# include <antlr/InputBuffer.h>
 
 # ifdef HAS_NOT_CCTYPE_H
 #	include <ctype.h>
@@ -21,12 +21,12 @@
 namespace antlr {
 #endif
 
-/** CharInputBuffer.hpp provides an InputBuffer for plain character arrays (buffers).
+/** CharInputBuffer.h provides an InputBuffer for plain character arrays (buffers).
  */
 class CharInputBuffer : public InputBuffer
 {
 public:
-	/** Construct a CharInputBuffer.hpp object with a char* buffer of 'size'
+	/** Construct a CharInputBuffer.h object with a char* buffer of 'size'
 	 * if 'owner' is true, then the buffer will be delete[]-ed on destruction.
 	 * @note it is assumed the buffer was allocated with new[]!
 	 */
diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.h
index f7e58520..9ad6fc7b 100644
--- a/lib/antlr/antlr/CharScanner.hpp
+++ b/lib/antlr/antlr/CharScanner.h
@@ -1,5 +1,5 @@
-#ifndef INC_CharScanner_hpp__
-#define INC_CharScanner_hpp__
+#ifndef INC_CharScanner_h__
+#define INC_CharScanner_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
 #include <map>
 
@@ -26,13 +26,13 @@
 # include <stdio.h>
 #endif
 
-#include <antlr/TokenStream.hpp>
-#include <antlr/RecognitionException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/MismatchedCharException.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/BitSet.hpp>
-#include <antlr/LexerSharedInputState.hpp>
+#include <antlr/TokenStream.h>
+#include <antlr/RecognitionException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/MismatchedCharException.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/BitSet.h>
+#include <antlr/LexerSharedInputState.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -573,4 +573,4 @@ inline bool CharScannerLiteralsLess::operator() (const ANTLR_USE_NAMESPACE(std)s
 }
 #endif
 
-#endif //INC_CharScanner_hpp__
+#endif //INC_CharScanner_h__
diff --git a/lib/antlr/antlr/CharStreamException.hpp b/lib/antlr/antlr/CharStreamException.h
index a49e3bbb..291593f2 100644
--- a/lib/antlr/antlr/CharStreamException.hpp
+++ b/lib/antlr/antlr/CharStreamException.h
@@ -1,5 +1,5 @@
-#ifndef INC_CharStreamException_hpp__
-#define INC_CharStreamException_hpp__
+#ifndef INC_CharStreamException_h__
+#define INC_CharStreamException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/ANTLRException.hpp>
+#include <antlr/config.h>
+#include <antlr/ANTLRException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -26,4 +26,4 @@ public:
 }
 #endif
 
-#endif //INC_CharStreamException_hpp__
+#endif //INC_CharStreamException_h__
diff --git a/lib/antlr/antlr/CharStreamIOException.hpp b/lib/antlr/antlr/CharStreamIOException.h
index e3e3111e..011aaf1f 100644
--- a/lib/antlr/antlr/CharStreamIOException.hpp
+++ b/lib/antlr/antlr/CharStreamIOException.h
@@ -1,5 +1,5 @@
-#ifndef INC_CharStreamIOException_hpp__
-#define INC_CharStreamIOException_hpp__
+#ifndef INC_CharStreamIOException_h__
+#define INC_CharStreamIOException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/CharStreamException.hpp>
+#include <antlr/config.h>
+#include <antlr/CharStreamException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -28,4 +28,4 @@ public:
 }
 #endif
 
-#endif //INC_CharStreamIOException_hpp__
+#endif //INC_CharStreamIOException_h__
diff --git a/lib/antlr/antlr/CircularQueue.hpp b/lib/antlr/antlr/CircularQueue.h
index 506b4f56..89c593a1 100644
--- a/lib/antlr/antlr/CircularQueue.hpp
+++ b/lib/antlr/antlr/CircularQueue.h
@@ -1,5 +1,5 @@
-#ifndef INC_CircularQueue_hpp__
-#define INC_CircularQueue_hpp__
+#ifndef INC_CircularQueue_h__
+#define INC_CircularQueue_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/Token.hpp>
+#include <antlr/config.h>
+#include <antlr/Token.h>
 #include <vector>
 #include <cassert>
 
@@ -97,4 +97,4 @@ private:
 }
 #endif
 
-#endif //INC_CircularQueue_hpp__
+#endif //INC_CircularQueue_h__
diff --git a/lib/antlr/antlr/CommonAST.hpp b/lib/antlr/antlr/CommonAST.h
index 091d7b6e..a89f5f01 100644
--- a/lib/antlr/antlr/CommonAST.hpp
+++ b/lib/antlr/antlr/CommonAST.h
@@ -1,5 +1,5 @@
-#ifndef INC_CommonAST_hpp__
-#define INC_CommonAST_hpp__
+#ifndef INC_CommonAST_h__
+#define INC_CommonAST_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/BaseAST.hpp>
+#include <antlr/config.h>
+#include <antlr/BaseAST.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -107,4 +107,4 @@ typedef ASTRefCount<CommonAST> RefCommonAST;
 }
 #endif
 
-#endif //INC_CommonAST_hpp__
+#endif //INC_CommonAST_h__
diff --git a/lib/antlr/antlr/CommonASTWithHiddenTokens.hpp b/lib/antlr/antlr/CommonASTWithHiddenTokens.h
index cac7c83e..01772835 100644
--- a/lib/antlr/antlr/CommonASTWithHiddenTokens.hpp
+++ b/lib/antlr/antlr/CommonASTWithHiddenTokens.h
@@ -1,5 +1,5 @@
-#ifndef INC_CommonASTWithHiddenTokens_hpp__
-#define INC_CommonASTWithHiddenTokens_hpp__
+#ifndef INC_CommonASTWithHiddenTokens_h__
+#define INC_CommonASTWithHiddenTokens_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/CommonAST.hpp>
+#include <antlr/config.h>
+#include <antlr/CommonAST.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -57,4 +57,4 @@ typedef ASTRefCount<CommonASTWithHiddenTokens> RefCommonASTWithHiddenTokens;
 }
 #endif
 
-#endif //INC_CommonASTWithHiddenTokens_hpp__
+#endif //INC_CommonASTWithHiddenTokens_h__
diff --git a/lib/antlr/antlr/CommonHiddenStreamToken.hpp b/lib/antlr/antlr/CommonHiddenStreamToken.h
index f3b78c44..8f0e2e38 100644
--- a/lib/antlr/antlr/CommonHiddenStreamToken.hpp
+++ b/lib/antlr/antlr/CommonHiddenStreamToken.h
@@ -1,5 +1,5 @@
-#ifndef INC_CommonHiddenStreamToken_hpp__
-#define INC_CommonHiddenStreamToken_hpp__
+#ifndef INC_CommonHiddenStreamToken_h__
+#define INC_CommonHiddenStreamToken_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/CommonToken.hpp>
+#include <antlr/config.h>
+#include <antlr/CommonToken.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -38,4 +38,4 @@ public:
 }
 #endif
 
-#endif //INC_CommonHiddenStreamToken_hpp__
+#endif //INC_CommonHiddenStreamToken_h__
diff --git a/lib/antlr/antlr/CommonToken.hpp b/lib/antlr/antlr/CommonToken.h
index 51d17b42..6f8d4973 100644
--- a/lib/antlr/antlr/CommonToken.hpp
+++ b/lib/antlr/antlr/CommonToken.h
@@ -1,5 +1,5 @@
-#ifndef INC_CommonToken_hpp__
-#define INC_CommonToken_hpp__
+#ifndef INC_CommonToken_h__
+#define INC_CommonToken_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/Token.hpp>
+#include <antlr/config.h>
+#include <antlr/Token.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -80,4 +80,4 @@ private:
 }
 #endif
 
-#endif //INC_CommonToken_hpp__
+#endif //INC_CommonToken_h__
diff --git a/lib/antlr/antlr/IOException.hpp b/lib/antlr/antlr/IOException.h
index 22566ecc..b616adf8 100644
--- a/lib/antlr/antlr/IOException.hpp
+++ b/lib/antlr/antlr/IOException.h
@@ -1,5 +1,5 @@
-#ifndef INC_IOException_hpp__
-#define INC_IOException_hpp__
+#ifndef INC_IOException_h__
+#define INC_IOException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/ANTLRException.hpp>
+#include <antlr/config.h>
+#include <antlr/ANTLRException.h>
 #include <exception>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -42,4 +42,4 @@ public:
 }
 #endif
 
-#endif //INC_IOException_hpp__
+#endif //INC_IOException_h__
diff --git a/lib/antlr/antlr/InputBuffer.hpp b/lib/antlr/antlr/InputBuffer.h
index b979ef8c..f71f73e8 100644
--- a/lib/antlr/antlr/InputBuffer.hpp
+++ b/lib/antlr/antlr/InputBuffer.h
@@ -1,5 +1,5 @@
-#ifndef INC_InputBuffer_hpp__
-#define INC_InputBuffer_hpp__
+#ifndef INC_InputBuffer_h__
+#define INC_InputBuffer_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/CircularQueue.hpp>
+#include <antlr/config.h>
+#include <antlr/CircularQueue.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -143,4 +143,4 @@ inline void InputBuffer::syncConsume() {
 }
 #endif
 
-#endif //INC_InputBuffer_hpp__
+#endif //INC_InputBuffer_h__
diff --git a/lib/antlr/antlr/LLkParser.hpp b/lib/antlr/antlr/LLkParser.h
index 32acd3dd..d9d2d9fd 100644
--- a/lib/antlr/antlr/LLkParser.hpp
+++ b/lib/antlr/antlr/LLkParser.h
@@ -1,5 +1,5 @@
-#ifndef INC_LLkParser_hpp__
-#define INC_LLkParser_hpp__
+#ifndef INC_LLkParser_h__
+#define INC_LLkParser_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/Parser.hpp>
+#include <antlr/config.h>
+#include <antlr/Parser.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -64,4 +64,4 @@ public:
 }
 #endif
 
-#endif //INC_LLkParser_hpp__
+#endif //INC_LLkParser_h__
diff --git a/lib/antlr/antlr/LexerSharedInputState.hpp b/lib/antlr/antlr/LexerSharedInputState.h
index 2571bda3..3f5c26e5 100644
--- a/lib/antlr/antlr/LexerSharedInputState.hpp
+++ b/lib/antlr/antlr/LexerSharedInputState.h
@@ -1,5 +1,5 @@
-#ifndef INC_LexerSharedInputState_hpp__
-#define INC_LexerSharedInputState_hpp__
+#ifndef INC_LexerSharedInputState_h__
+#define INC_LexerSharedInputState_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,10 +8,10 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/RefCount.hpp>
-#include <antlr/CharBuffer.hpp>
+#include <antlr/config.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/RefCount.h>
+#include <antlr/CharBuffer.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -153,4 +153,4 @@ typedef RefCount<LexerInputState> LexerSharedInputState;
 }
 #endif
 
-#endif //INC_LexerSharedInputState_hpp__
+#endif //INC_LexerSharedInputState_h__
diff --git a/lib/antlr/antlr/Makefile.am b/lib/antlr/antlr/Makefile.am
index 717c43c0..b866634c 100644
--- a/lib/antlr/antlr/Makefile.am
+++ b/lib/antlr/antlr/Makefile.am
@@ -1,2 +1,2 @@
 
-noinst_HEADERS = ANTLRException.hpp 	ANTLRUtil.hpp 	AST.hpp 	ASTArray.hpp 	ASTFactory.hpp 	ASTNULLType.hpp 	ASTPair.hpp 	ASTRefCount.hpp 	BaseAST.hpp 	BitSet.hpp 	CharBuffer.hpp 	CharInputBuffer.hpp 	CharScanner.hpp 	CharStreamException.hpp 	CharStreamIOException.hpp 	CircularQueue.hpp 	CommonAST.hpp 	CommonASTWithHiddenTokens.hpp 	CommonHiddenStreamToken.hpp 	CommonToken.hpp 	InputBuffer.hpp 	IOException.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
+noinst_HEADERS = ANTLRException.h 	ANTLRUtil.h 	AST.h 	ASTArray.h 	ASTFactory.h 	ASTNULLType.h 	ASTPair.h 	ASTRefCount.h 	BaseAST.h 	BitSet.h 	CharBuffer.h 	CharInputBuffer.h 	CharScanner.h 	CharStreamException.h 	CharStreamIOException.h 	CircularQueue.h 	CommonAST.h 	CommonASTWithHiddenTokens.h 	CommonHiddenStreamToken.h 	CommonToken.h 	InputBuffer.h 	IOException.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/lib/antlr/antlr/MismatchedCharException.hpp b/lib/antlr/antlr/MismatchedCharException.h
index cc77f9e4..2f0b9be4 100644
--- a/lib/antlr/antlr/MismatchedCharException.hpp
+++ b/lib/antlr/antlr/MismatchedCharException.h
@@ -1,5 +1,5 @@
-#ifndef INC_MismatchedCharException_hpp__
-#define INC_MismatchedCharException_hpp__
+#ifndef INC_MismatchedCharException_h__
+#define INC_MismatchedCharException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/RecognitionException.hpp>
-#include <antlr/BitSet.hpp>
+#include <antlr/config.h>
+#include <antlr/RecognitionException.h>
+#include <antlr/BitSet.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -99,4 +99,4 @@ public:
 }
 #endif
 
-#endif //INC_MismatchedCharException_hpp__
+#endif //INC_MismatchedCharException_h__
diff --git a/lib/antlr/antlr/MismatchedTokenException.hpp b/lib/antlr/antlr/MismatchedTokenException.h
index 47fb44e6..af3bdb8c 100644
--- a/lib/antlr/antlr/MismatchedTokenException.hpp
+++ b/lib/antlr/antlr/MismatchedTokenException.h
@@ -1,5 +1,5 @@
-#ifndef INC_MismatchedTokenException_hpp__
-#define INC_MismatchedTokenException_hpp__
+#ifndef INC_MismatchedTokenException_h__
+#define INC_MismatchedTokenException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,11 +8,11 @@
  * $Id$
  */
 
-#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>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -141,4 +141,4 @@ private:
 }
 #endif
 
-#endif //INC_MismatchedTokenException_hpp__
+#endif //INC_MismatchedTokenException_h__
diff --git a/lib/antlr/antlr/NoViableAltException.hpp b/lib/antlr/antlr/NoViableAltException.h
index 22236c90..492c7b06 100644
--- a/lib/antlr/antlr/NoViableAltException.hpp
+++ b/lib/antlr/antlr/NoViableAltException.h
@@ -1,5 +1,5 @@
-#ifndef INC_NoViableAltException_hpp__
-#define INC_NoViableAltException_hpp__
+#ifndef INC_NoViableAltException_h__
+#define INC_NoViableAltException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,10 +8,10 @@
  * $Id$
  */
 
-#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>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -37,4 +37,4 @@ public:
 }
 #endif
 
-#endif //INC_NoViableAltException_hpp__
+#endif //INC_NoViableAltException_h__
diff --git a/lib/antlr/antlr/NoViableAltForCharException.hpp b/lib/antlr/antlr/NoViableAltForCharException.h
index 0b16a0ea..9c592544 100644
--- a/lib/antlr/antlr/NoViableAltForCharException.hpp
+++ b/lib/antlr/antlr/NoViableAltForCharException.h
@@ -1,5 +1,5 @@
-#ifndef INC_NoViableAltForCharException_hpp__
-# define INC_NoViableAltForCharException_hpp__
+#ifndef INC_NoViableAltForCharException_h__
+# define INC_NoViableAltForCharException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-# include <antlr/config.hpp>
-# include <antlr/RecognitionException.hpp>
-# include <antlr/CharScanner.hpp>
+# include <antlr/config.h>
+# include <antlr/RecognitionException.h>
+# include <antlr/CharScanner.h>
 
 # ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr
@@ -38,4 +38,4 @@ protected:
 }
 # endif
 
-#endif //INC_NoViableAltForCharException_hpp__
+#endif //INC_NoViableAltForCharException_h__
diff --git a/lib/antlr/antlr/Parser.hpp b/lib/antlr/antlr/Parser.h
index f74be2a8..4c53c433 100644
--- a/lib/antlr/antlr/Parser.hpp
+++ b/lib/antlr/antlr/Parser.h
@@ -1,5 +1,5 @@
-#ifndef INC_Parser_hpp__
-#define INC_Parser_hpp__
+#ifndef INC_Parser_h__
+#define INC_Parser_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,17 +8,17 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
 #include <iostream>
 #include <exception>
 
-#include <antlr/BitSet.hpp>
-#include <antlr/TokenBuffer.hpp>
-#include <antlr/RecognitionException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/ASTFactory.hpp>
-#include <antlr/ParserSharedInputState.hpp>
+#include <antlr/BitSet.h>
+#include <antlr/TokenBuffer.h>
+#include <antlr/RecognitionException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/ASTFactory.h>
+#include <antlr/ParserSharedInputState.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -316,4 +316,4 @@ private:
 }
 #endif
 
-#endif //INC_Parser_hpp__
+#endif //INC_Parser_h__
diff --git a/lib/antlr/antlr/ParserSharedInputState.hpp b/lib/antlr/antlr/ParserSharedInputState.h
index b011bc15..1c0a8152 100644
--- a/lib/antlr/antlr/ParserSharedInputState.hpp
+++ b/lib/antlr/antlr/ParserSharedInputState.h
@@ -1,5 +1,5 @@
-#ifndef INC_ParserSharedInputState_hpp__
-#define INC_ParserSharedInputState_hpp__
+#ifndef INC_ParserSharedInputState_h__
+#define INC_ParserSharedInputState_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-#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>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -89,4 +89,4 @@ typedef RefCount<ParserInputState> ParserSharedInputState;
 }
 #endif
 
-#endif //INC_ParserSharedInputState_hpp__
+#endif //INC_ParserSharedInputState_h__
diff --git a/lib/antlr/antlr/RecognitionException.hpp b/lib/antlr/antlr/RecognitionException.h
index e61bc620..3d7604ee 100644
--- a/lib/antlr/antlr/RecognitionException.hpp
+++ b/lib/antlr/antlr/RecognitionException.h
@@ -1,5 +1,5 @@
-#ifndef INC_RecognitionException_hpp__
-# define INC_RecognitionException_hpp__
+#ifndef INC_RecognitionException_h__
+# define INC_RecognitionException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-# include <antlr/config.hpp>
-# include <antlr/ANTLRException.hpp>
+# include <antlr/config.h>
+# include <antlr/ANTLRException.h>
 
 # ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr
@@ -63,4 +63,4 @@ namespace antlr
 }
 # endif
 
-#endif //INC_RecognitionException_hpp__
+#endif //INC_RecognitionException_h__
diff --git a/lib/antlr/antlr/RefCount.hpp b/lib/antlr/antlr/RefCount.h
index 8546a049..93df952e 100644
--- a/lib/antlr/antlr/RefCount.hpp
+++ b/lib/antlr/antlr/RefCount.h
@@ -1,5 +1,5 @@
-#ifndef INC_RefCount_hpp__
-#define INC_RefCount_hpp__
+#ifndef INC_RefCount_h__
+#define INC_RefCount_h__
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
  * Software rights: http://www.antlr.org/license.html
@@ -7,7 +7,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -77,4 +77,4 @@ public:
 }
 #endif
 
-#endif //INC_RefCount_hpp__
+#endif //INC_RefCount_h__
diff --git a/lib/antlr/antlr/SemanticException.hpp b/lib/antlr/antlr/SemanticException.h
index dc68d5a9..05c5c5fe 100644
--- a/lib/antlr/antlr/SemanticException.hpp
+++ b/lib/antlr/antlr/SemanticException.h
@@ -1,5 +1,5 @@
-#ifndef INC_SemanticException_hpp__
-#define INC_SemanticException_hpp__
+#ifndef INC_SemanticException_h__
+#define INC_SemanticException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/RecognitionException.hpp>
+#include <antlr/config.h>
+#include <antlr/RecognitionException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -37,4 +37,4 @@ public:
 }
 #endif
 
-#endif //INC_SemanticException_hpp__
+#endif //INC_SemanticException_h__
diff --git a/lib/antlr/antlr/String.hpp b/lib/antlr/antlr/String.h
index 7e6dde5a..7e406c1a 100644
--- a/lib/antlr/antlr/String.hpp
+++ b/lib/antlr/antlr/String.h
@@ -1,5 +1,5 @@
-#ifndef INC_String_hpp__
-#define INC_String_hpp__
+#ifndef INC_String_h__
+#define INC_String_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -24,4 +24,4 @@ ANTLR_API ANTLR_USE_NAMESPACE(std)string charName( int ch );
 }
 #endif
 
-#endif //INC_String_hpp__
+#endif //INC_String_h__
diff --git a/lib/antlr/antlr/Token.hpp b/lib/antlr/antlr/Token.h
index cd56fc3c..88f747ba 100644
--- a/lib/antlr/antlr/Token.hpp
+++ b/lib/antlr/antlr/Token.h
@@ -1,5 +1,5 @@
-#ifndef INC_Token_hpp__
-#define INC_Token_hpp__
+#ifndef INC_Token_h__
+#define INC_Token_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenRefCount.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenRefCount.h>
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
@@ -105,4 +105,4 @@ inline bool operator<( RefToken l, RefToken r )
 }
 #endif
 
-#endif //INC_Token_hpp__
+#endif //INC_Token_h__
diff --git a/lib/antlr/antlr/TokenBuffer.hpp b/lib/antlr/antlr/TokenBuffer.h
index 3077eead..5832ef6e 100644
--- a/lib/antlr/antlr/TokenBuffer.hpp
+++ b/lib/antlr/antlr/TokenBuffer.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenBuffer_hpp__
-#define INC_TokenBuffer_hpp__
+#ifndef INC_TokenBuffer_h__
+#define INC_TokenBuffer_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStream.hpp>
-#include <antlr/CircularQueue.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStream.h>
+#include <antlr/CircularQueue.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -118,4 +118,4 @@ inline void TokenBuffer::syncConsume()
 }
 #endif
 
-#endif //INC_TokenBuffer_hpp__
+#endif //INC_TokenBuffer_h__
diff --git a/lib/antlr/antlr/TokenRefCount.hpp b/lib/antlr/antlr/TokenRefCount.h
index 9ccbb98c..6b2042b7 100644
--- a/lib/antlr/antlr/TokenRefCount.hpp
+++ b/lib/antlr/antlr/TokenRefCount.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenRefCount_hpp__
-# define INC_TokenRefCount_hpp__
+#ifndef INC_TokenRefCount_h__
+# define INC_TokenRefCount_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,7 +8,7 @@
  * $Id:$
  */
 
-# include <antlr/config.hpp>
+# include <antlr/config.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -95,4 +95,4 @@ typedef TokenRefCount<Token> RefToken;
 }
 #endif
 
-#endif //INC_TokenRefCount_hpp__
+#endif //INC_TokenRefCount_h__
diff --git a/lib/antlr/antlr/TokenStream.hpp b/lib/antlr/antlr/TokenStream.h
index dbf83a8c..d7fc688b 100644
--- a/lib/antlr/antlr/TokenStream.hpp
+++ b/lib/antlr/antlr/TokenStream.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStream_hpp__
-#define INC_TokenStream_hpp__
+#ifndef INC_TokenStream_h__
+#define INC_TokenStream_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/Token.hpp>
+#include <antlr/config.h>
+#include <antlr/Token.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -31,4 +31,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStream_hpp__
+#endif //INC_TokenStream_h__
diff --git a/lib/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.h
index bcdb131c..51862169 100644
--- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp
+++ b/lib/antlr/antlr/TokenStreamBasicFilter.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamBasicFilter_hpp__
-#define INC_TokenStreamBasicFilter_hpp__
+#ifndef INC_TokenStreamBasicFilter_h__
+#define INC_TokenStreamBasicFilter_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/BitSet.hpp>
-#include <antlr/TokenStream.hpp>
+#include <antlr/config.h>
+#include <antlr/BitSet.h>
+#include <antlr/TokenStream.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -43,4 +43,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStreamBasicFilter_hpp__
+#endif //INC_TokenStreamBasicFilter_h__
diff --git a/lib/antlr/antlr/TokenStreamException.hpp b/lib/antlr/antlr/TokenStreamException.h
index dbddb442..7bffddca 100644
--- a/lib/antlr/antlr/TokenStreamException.hpp
+++ b/lib/antlr/antlr/TokenStreamException.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamException_hpp__
-#define INC_TokenStreamException_hpp__
+#ifndef INC_TokenStreamException_h__
+#define INC_TokenStreamException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/ANTLRException.hpp>
+#include <antlr/config.h>
+#include <antlr/ANTLRException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -38,4 +38,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStreamException_hpp__
+#endif //INC_TokenStreamException_h__
diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.h
index ed007a7a..2597ce58 100644
--- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
+++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamHiddenTokenFilter_hpp__
-#define INC_TokenStreamHiddenTokenFilter_hpp__
+#ifndef INC_TokenStreamHiddenTokenFilter_h__
+#define INC_TokenStreamHiddenTokenFilter_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStreamBasicFilter.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStreamBasicFilter.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -92,4 +92,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStreamHiddenTokenFilter_hpp__
+#endif //INC_TokenStreamHiddenTokenFilter_h__
diff --git a/lib/antlr/antlr/TokenStreamIOException.hpp b/lib/antlr/antlr/TokenStreamIOException.h
index fff72ced..db2d8677 100644
--- a/lib/antlr/antlr/TokenStreamIOException.hpp
+++ b/lib/antlr/antlr/TokenStreamIOException.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamIOException_hpp__
-#define INC_TokenStreamIOException_hpp__
+#ifndef INC_TokenStreamIOException_h__
+#define INC_TokenStreamIOException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStreamException.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStreamException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -37,4 +37,4 @@ private:
 }
 #endif
 
-#endif //INC_TokenStreamIOException_hpp__
+#endif //INC_TokenStreamIOException_h__
diff --git a/lib/antlr/antlr/TokenStreamRecognitionException.hpp b/lib/antlr/antlr/TokenStreamRecognitionException.h
index 687d7814..2c4b9548 100644
--- a/lib/antlr/antlr/TokenStreamRecognitionException.hpp
+++ b/lib/antlr/antlr/TokenStreamRecognitionException.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamRecognitionException_hpp__
-#define INC_TokenStreamRecognitionException_hpp__
+#ifndef INC_TokenStreamRecognitionException_h__
+#define INC_TokenStreamRecognitionException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStreamException.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStreamException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -54,4 +54,4 @@ private:
 }
 #endif
 
-#endif //INC_TokenStreamRecognitionException_hpp__
+#endif //INC_TokenStreamRecognitionException_h__
diff --git a/lib/antlr/antlr/TokenStreamRetryException.hpp b/lib/antlr/antlr/TokenStreamRetryException.h
index 5af21cde..bb3dcf2d 100644
--- a/lib/antlr/antlr/TokenStreamRetryException.hpp
+++ b/lib/antlr/antlr/TokenStreamRetryException.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamRetryException_hpp__
-#define INC_TokenStreamRetryException_hpp__
+#ifndef INC_TokenStreamRetryException_h__
+#define INC_TokenStreamRetryException_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStreamException.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStreamException.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -25,4 +25,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStreamRetryException_hpp__
+#endif //INC_TokenStreamRetryException_h__
diff --git a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp b/lib/antlr/antlr/TokenStreamRewriteEngine.h
index 9fab08c2..20f3e8f4 100644
--- a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp
+++ b/lib/antlr/antlr/TokenStreamRewriteEngine.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamRewriteEngine_hpp__
-#define INC_TokenStreamRewriteEngine_hpp__
+#ifndef INC_TokenStreamRewriteEngine_h__
+#define INC_TokenStreamRewriteEngine_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -16,11 +16,11 @@
 #include <cassert>
 #include <algorithm>
 
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenWithIndex.hpp>
-#include <antlr/BitSet.hpp>
+#include <antlr/TokenStream.h>
+#include <antlr/TokenWithIndex.h>
+#include <antlr/BitSet.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/antlr/TokenStreamSelector.hpp b/lib/antlr/antlr/TokenStreamSelector.h
index 1dab8797..2ed91d72 100644
--- a/lib/antlr/antlr/TokenStreamSelector.hpp
+++ b/lib/antlr/antlr/TokenStreamSelector.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenStreamSelector_hpp__
-#define INC_TokenStreamSelector_hpp__
+#ifndef INC_TokenStreamSelector_h__
+#define INC_TokenStreamSelector_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/TokenStream.hpp>
+#include <antlr/config.h>
+#include <antlr/TokenStream.h>
 #include <map>
 #include <stack>
 
@@ -84,4 +84,4 @@ public:
 }
 #endif
 
-#endif //INC_TokenStreamSelector_hpp__
+#endif //INC_TokenStreamSelector_h__
diff --git a/lib/antlr/antlr/TokenWithIndex.hpp b/lib/antlr/antlr/TokenWithIndex.h
index e4a3e37e..d7511996 100644
--- a/lib/antlr/antlr/TokenWithIndex.hpp
+++ b/lib/antlr/antlr/TokenWithIndex.h
@@ -1,5 +1,5 @@
-#ifndef INC_TokenWithIndex_hpp__
-#define INC_TokenWithIndex_hpp__
+#ifndef INC_TokenWithIndex_h__
+#define INC_TokenWithIndex_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,9 +8,9 @@
  * $Id:$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/CommonToken.hpp>
-#include <antlr/String.hpp>
+#include <antlr/config.h>
+#include <antlr/CommonToken.h>
+#include <antlr/String.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -81,4 +81,4 @@ typedef TokenRefCount<TokenWithIndex> RefTokenWithIndex;
 }
 #endif
 
-#endif //INC_CommonToken_hpp__
+#endif //INC_CommonToken_h__
diff --git a/lib/antlr/antlr/TreeParser.hpp b/lib/antlr/antlr/TreeParser.h
index aeee3f9d..ab293d49 100644
--- a/lib/antlr/antlr/TreeParser.hpp
+++ b/lib/antlr/antlr/TreeParser.h
@@ -1,5 +1,5 @@
-#ifndef INC_TreeParser_hpp__
-#define INC_TreeParser_hpp__
+#ifndef INC_TreeParser_h__
+#define INC_TreeParser_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,13 +8,13 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/ASTFactory.hpp>
-#include <antlr/BitSet.hpp>
-#include <antlr/RecognitionException.hpp>
-#include <antlr/MismatchedTokenException.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/MismatchedTokenException.h>
+#include <antlr/TreeParserSharedInputState.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -152,4 +152,4 @@ private:
 }
 #endif
 
-#endif //INC_TreeParser_hpp__
+#endif //INC_TreeParser_h__
diff --git a/lib/antlr/antlr/TreeParserSharedInputState.hpp b/lib/antlr/antlr/TreeParserSharedInputState.h
index 76ec6840..3eb95641 100644
--- a/lib/antlr/antlr/TreeParserSharedInputState.hpp
+++ b/lib/antlr/antlr/TreeParserSharedInputState.h
@@ -1,5 +1,5 @@
-#ifndef INC_TreeParserSharedInputState_hpp__
-#define INC_TreeParserSharedInputState_hpp__
+#ifndef INC_TreeParserSharedInputState_h__
+#define INC_TreeParserSharedInputState_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -8,8 +8,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/RefCount.hpp>
+#include <antlr/config.h>
+#include <antlr/RefCount.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
@@ -42,4 +42,4 @@ typedef RefCount<TreeParserInputState> TreeParserSharedInputState;
 }
 #endif
 
-#endif //INC_TreeParserSharedInputState_hpp__
+#endif //INC_TreeParserSharedInputState_h__
diff --git a/lib/antlr/antlr/config.hpp b/lib/antlr/antlr/config.h
index db8fb28a..4d3456ec 100644
--- a/lib/antlr/antlr/config.hpp
+++ b/lib/antlr/antlr/config.h
@@ -1,5 +1,5 @@
-#ifndef INC_config_hpp__
-#define INC_config_hpp__
+#ifndef INC_config_h__
+#define INC_config_h__
 
 /* ANTLR Translator Generator
  * Project led by Terence Parr at http://www.jGuru.com
@@ -287,4 +287,4 @@
 # define ANTLR_END_NAMESPACE
 #endif
 
-#endif //INC_config_hpp__
+#endif //INC_config_h__
diff --git a/lib/antlr/src/ANTLRUtil.cpp b/lib/antlr/src/ANTLRUtil.cpp
index 30e7ba21..5df8db6d 100644
--- a/lib/antlr/src/ANTLRUtil.cpp
+++ b/lib/antlr/src/ANTLRUtil.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include <antlr/config.hpp>
-#include <antlr/IOException.hpp>
+#include <antlr/config.h>
+#include <antlr/IOException.h>
 
 #include <iostream>
 #include <cctype>
diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp
index 98ce6b7a..55f1ce19 100644
--- a/lib/antlr/src/ASTFactory.cpp
+++ b/lib/antlr/src/ASTFactory.cpp
@@ -5,11 +5,11 @@
  * $Id$
  */
 
-#include "antlr/CommonAST.hpp"
-#include "antlr/ANTLRException.hpp"
-#include "antlr/IOException.hpp"
-#include "antlr/ASTFactory.hpp"
-#include "antlr/ANTLRUtil.hpp"
+#include "antlr/CommonAST.h"
+#include "antlr/ANTLRException.h"
+#include "antlr/IOException.h"
+#include "antlr/ASTFactory.h"
+#include "antlr/ANTLRUtil.h"
 
 #include <iostream>
 #include <istream>
diff --git a/lib/antlr/src/ASTNULLType.cpp b/lib/antlr/src/ASTNULLType.cpp
index 7dd62724..cc3d839d 100644
--- a/lib/antlr/src/ASTNULLType.cpp
+++ b/lib/antlr/src/ASTNULLType.cpp
@@ -5,9 +5,9 @@
  * $Id$
  */
 
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/ASTNULLType.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
+#include "antlr/ASTNULLType.h"
 
 #include <iostream>
 
diff --git a/lib/antlr/src/ASTRefCount.cpp b/lib/antlr/src/ASTRefCount.cpp
index 0ca54df0..13294fb8 100644
--- a/lib/antlr/src/ASTRefCount.cpp
+++ b/lib/antlr/src/ASTRefCount.cpp
@@ -4,8 +4,8 @@
  *
  * $Id$
  */
-#include "antlr/ASTRefCount.hpp"
-#include "antlr/AST.hpp"
+#include "antlr/ASTRefCount.h"
+#include "antlr/AST.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp
index f10f1e16..b5d1814f 100644
--- a/lib/antlr/src/BaseAST.cpp
+++ b/lib/antlr/src/BaseAST.cpp
@@ -5,12 +5,12 @@
  * $Id$
  */
 
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 
 #include <iostream>
 
-#include "antlr/AST.hpp"
-#include "antlr/BaseAST.hpp"
+#include "antlr/AST.h"
+#include "antlr/BaseAST.h"
 
 ANTLR_USING_NAMESPACE(std)
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
diff --git a/lib/antlr/src/BitSet.cpp b/lib/antlr/src/BitSet.cpp
index 2a32404a..c04b96c5 100644
--- a/lib/antlr/src/BitSet.cpp
+++ b/lib/antlr/src/BitSet.cpp
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-#include "antlr/BitSet.hpp"
+#include "antlr/BitSet.h"
 #include <string>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
diff --git a/lib/antlr/src/CharBuffer.cpp b/lib/antlr/src/CharBuffer.cpp
index a0e11eae..b5895e9f 100644
--- a/lib/antlr/src/CharBuffer.cpp
+++ b/lib/antlr/src/CharBuffer.cpp
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-#include "antlr/CharBuffer.hpp"
+#include "antlr/CharBuffer.h"
 #include <iostream>
 
 //#include <ios>
diff --git a/lib/antlr/src/CharScanner.cpp b/lib/antlr/src/CharScanner.cpp
index d5b1f753..63545468 100644
--- a/lib/antlr/src/CharScanner.cpp
+++ b/lib/antlr/src/CharScanner.cpp
@@ -7,8 +7,8 @@
 
 #include <iostream>
 
-#include "antlr/CharScanner.hpp"
-#include "antlr/CommonToken.hpp"
+#include "antlr/CharScanner.h"
+#include "antlr/CommonToken.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/CommonAST.cpp b/lib/antlr/src/CommonAST.cpp
index e132c0aa..a44e222f 100644
--- a/lib/antlr/src/CommonAST.cpp
+++ b/lib/antlr/src/CommonAST.cpp
@@ -4,13 +4,13 @@
  *
  * $Id$
  */
-#include "antlr/config.hpp"
+#include "antlr/config.h"
 
 #include <cstdlib>
 #include <iostream>
 
-#include "antlr/CommonAST.hpp"
-#include "antlr/ANTLRUtil.hpp"
+#include "antlr/CommonAST.h"
+#include "antlr/ANTLRUtil.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/CommonASTWithHiddenTokens.cpp b/lib/antlr/src/CommonASTWithHiddenTokens.cpp
index b0e1a3dd..21a6be61 100644
--- a/lib/antlr/src/CommonASTWithHiddenTokens.cpp
+++ b/lib/antlr/src/CommonASTWithHiddenTokens.cpp
@@ -4,12 +4,12 @@
  *
  * $Id$
  */
-#include "antlr/config.hpp"
-#include "antlr/AST.hpp"
-#include "antlr/BaseAST.hpp"
-#include "antlr/CommonAST.hpp"
-#include "antlr/CommonASTWithHiddenTokens.hpp"
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/config.h"
+#include "antlr/AST.h"
+#include "antlr/BaseAST.h"
+#include "antlr/CommonAST.h"
+#include "antlr/CommonASTWithHiddenTokens.h"
+#include "antlr/CommonHiddenStreamToken.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/CommonHiddenStreamToken.cpp b/lib/antlr/src/CommonHiddenStreamToken.cpp
index 9396a43b..3ccb69bc 100644
--- a/lib/antlr/src/CommonHiddenStreamToken.cpp
+++ b/lib/antlr/src/CommonHiddenStreamToken.cpp
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/CommonHiddenStreamToken.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/CommonToken.cpp b/lib/antlr/src/CommonToken.cpp
index a223b239..db5f4716 100644
--- a/lib/antlr/src/CommonToken.cpp
+++ b/lib/antlr/src/CommonToken.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/CommonToken.hpp"
-#include "antlr/String.hpp"
+#include "antlr/CommonToken.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/InputBuffer.cpp b/lib/antlr/src/InputBuffer.cpp
index c9eced7d..a65755d7 100644
--- a/lib/antlr/src/InputBuffer.cpp
+++ b/lib/antlr/src/InputBuffer.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/config.hpp"
-#include "antlr/InputBuffer.hpp"
+#include "antlr/config.h"
+#include "antlr/InputBuffer.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/LLkParser.cpp b/lib/antlr/src/LLkParser.cpp
index ab0d672a..c45447f5 100644
--- a/lib/antlr/src/LLkParser.cpp
+++ b/lib/antlr/src/LLkParser.cpp
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-#include "antlr/LLkParser.hpp"
+#include "antlr/LLkParser.h"
 #include <iostream>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
diff --git a/lib/antlr/src/MismatchedCharException.cpp b/lib/antlr/src/MismatchedCharException.cpp
index e73dbf36..019743b0 100644
--- a/lib/antlr/src/MismatchedCharException.cpp
+++ b/lib/antlr/src/MismatchedCharException.cpp
@@ -5,9 +5,9 @@
  * $Id$
  */
 
-#include "antlr/CharScanner.hpp"
-#include "antlr/MismatchedCharException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/CharScanner.h"
+#include "antlr/MismatchedCharException.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/MismatchedTokenException.cpp b/lib/antlr/src/MismatchedTokenException.cpp
index 7fc349f7..52ceeec4 100644
--- a/lib/antlr/src/MismatchedTokenException.cpp
+++ b/lib/antlr/src/MismatchedTokenException.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/MismatchedTokenException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/MismatchedTokenException.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/NoViableAltException.cpp b/lib/antlr/src/NoViableAltException.cpp
index 94da2cc4..67406df7 100644
--- a/lib/antlr/src/NoViableAltException.cpp
+++ b/lib/antlr/src/NoViableAltException.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/NoViableAltException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/NoViableAltException.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/NoViableAltForCharException.cpp b/lib/antlr/src/NoViableAltForCharException.cpp
index 10d9447a..cee6afd9 100644
--- a/lib/antlr/src/NoViableAltForCharException.cpp
+++ b/lib/antlr/src/NoViableAltForCharException.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/NoViableAltForCharException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/NoViableAltForCharException.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/Parser.cpp b/lib/antlr/src/Parser.cpp
index 640da7b6..83b7aaa3 100644
--- a/lib/antlr/src/Parser.cpp
+++ b/lib/antlr/src/Parser.cpp
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-#include "antlr/Parser.hpp"
+#include "antlr/Parser.h"
 
 #include <iostream>
 
diff --git a/lib/antlr/src/RecognitionException.cpp b/lib/antlr/src/RecognitionException.cpp
index 9c185ccc..54d3df71 100644
--- a/lib/antlr/src/RecognitionException.cpp
+++ b/lib/antlr/src/RecognitionException.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/RecognitionException.hpp"
-#include "antlr/String.hpp"
+#include "antlr/RecognitionException.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp
index ae70f479..6d8b43cf 100644
--- a/lib/antlr/src/String.cpp
+++ b/lib/antlr/src/String.cpp
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-#include "antlr/String.hpp"
+#include "antlr/String.h"
 
 #include <cctype>
 
diff --git a/lib/antlr/src/Token.cpp b/lib/antlr/src/Token.cpp
index f8181634..44c1fcbe 100644
--- a/lib/antlr/src/Token.cpp
+++ b/lib/antlr/src/Token.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/Token.hpp"
-#include "antlr/String.hpp"
+#include "antlr/Token.h"
+#include "antlr/String.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenBuffer.cpp b/lib/antlr/src/TokenBuffer.cpp
index ed69d6e0..d329aa58 100644
--- a/lib/antlr/src/TokenBuffer.cpp
+++ b/lib/antlr/src/TokenBuffer.cpp
@@ -5,7 +5,7 @@
  * $Id$
  */
 
-#include "antlr/TokenBuffer.hpp"
+#include "antlr/TokenBuffer.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenRefCount.cpp b/lib/antlr/src/TokenRefCount.cpp
index 0afb0f84..4493c0d7 100644
--- a/lib/antlr/src/TokenRefCount.cpp
+++ b/lib/antlr/src/TokenRefCount.cpp
@@ -4,8 +4,8 @@
  *
  * $Id:$
  */
-#include "antlr/TokenRefCount.hpp"
-#include "antlr/Token.hpp"
+#include "antlr/TokenRefCount.h"
+#include "antlr/Token.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp
index 982e8645..479ba76a 100644
--- a/lib/antlr/src/TokenStreamBasicFilter.cpp
+++ b/lib/antlr/src/TokenStreamBasicFilter.cpp
@@ -4,7 +4,7 @@
  *
  * $Id$
  */
-#include "antlr/TokenStreamBasicFilter.hpp"
+#include "antlr/TokenStreamBasicFilter.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 431df0c3..f55c9fc5 100644
--- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -4,8 +4,8 @@
  *
  * $Id$
  */
-#include "antlr/TokenStreamHiddenTokenFilter.hpp"
-#include "antlr/CommonHiddenStreamToken.hpp"
+#include "antlr/TokenStreamHiddenTokenFilter.h"
+#include "antlr/CommonHiddenStreamToken.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenStreamRewriteEngine.cpp b/lib/antlr/src/TokenStreamRewriteEngine.cpp
index 2f171eb6..8b0e8f3f 100644
--- a/lib/antlr/src/TokenStreamRewriteEngine.cpp
+++ b/lib/antlr/src/TokenStreamRewriteEngine.cpp
@@ -1,4 +1,4 @@
-#include <antlr/config.hpp>
+#include <antlr/config.h>
 
 #include <string>
 #include <list>
@@ -10,10 +10,10 @@
 #include <sstream>
 #include <cassert>
 
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenWithIndex.hpp>
-#include <antlr/BitSet.hpp>
-#include <antlr/TokenStreamRewriteEngine.hpp>
+#include <antlr/TokenStream.h>
+#include <antlr/TokenWithIndex.h>
+#include <antlr/BitSet.h>
+#include <antlr/TokenStreamRewriteEngine.h>
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TokenStreamSelector.cpp b/lib/antlr/src/TokenStreamSelector.cpp
index 602e50dc..26d697bc 100644
--- a/lib/antlr/src/TokenStreamSelector.cpp
+++ b/lib/antlr/src/TokenStreamSelector.cpp
@@ -4,8 +4,8 @@
  *
  * $Id$
  */
-#include "antlr/TokenStreamSelector.hpp"
-#include "antlr/TokenStreamRetryException.hpp"
+#include "antlr/TokenStreamSelector.h"
+#include "antlr/TokenStreamRetryException.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {
diff --git a/lib/antlr/src/TreeParser.cpp b/lib/antlr/src/TreeParser.cpp
index 6b3f2ca1..dd48b37f 100644
--- a/lib/antlr/src/TreeParser.cpp
+++ b/lib/antlr/src/TreeParser.cpp
@@ -5,8 +5,8 @@
  * $Id$
  */
 
-#include "antlr/TreeParser.hpp"
-#include "antlr/ASTNULLType.hpp"
+#include "antlr/TreeParser.h"
+#include "antlr/ASTNULLType.h"
 
 #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
 namespace antlr {