163 files changed, 695 insertions, 704 deletions

diff --git a/Makefile.am b/Makefile.am
index 10a75db6..791e596c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,6 @@ messages:
 	done
 	dirs=`cat dirs` ;\
 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
-	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	$(EXTRACTRC) `find $$dirs -maxdepth 1 -name "*.rc"` > rc.cpp	;\
 	$(EXTRACTRC) `find $$dirs -maxdepth 1 -name "*.ui"` >> rc.cpp    ;\
diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am
index 340d0e38..950d6571 100644
--- a/buildtools/lib/parsers/autotools/Makefile.am
+++ b/buildtools/lib/parsers/autotools/Makefile.am
@@ -13,7 +13,7 @@ libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotoo
 parser:
 	cd $(srcdir) ; \
 	bison -d autotools.yy -o autotools_yacc.cpp ; \
-	mv -f autotools_yacc.hpp autotools_yacc.h ; \
+	mv -f autotools_yacc.h autotools_yacc.h ; \
 	flex -oautotools_lex.cpp autotools.ll
 
 EXTRA_DIST = autotools.yy autotools.ll
diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.h
index d6247645..f97af783 100644
--- a/buildtools/lib/parsers/qmake/location.hh
+++ b/buildtools/lib/parsers/qmake/location.h
@@ -33,16 +33,16 @@
    version 2.2 of Bison.  */
 
 /**
- ** \file location.hh
+ ** \file location.h
  ** Define the TQMake::location class.
  */
 
-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+#ifndef BISON_LOCATION_H
+# define BISON_LOCATION_H
 
 # include <iostream>
 # include <string>
-# include "position.hh"
+# include "position.h"
 
 namespace TQMake
 {
@@ -142,4 +142,4 @@ namespace TQMake
 
 }
 
-#endif // not BISON_LOCATION_HH
+#endif // not BISON_LOCATION_H
diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.h
index 6e95eb95..9f5951f0 100644
--- a/buildtools/lib/parsers/qmake/position.hh
+++ b/buildtools/lib/parsers/qmake/position.h
@@ -33,12 +33,12 @@
    version 2.2 of Bison.  */
 
 /**
- ** \file position.hh
+ ** \file position.h
  ** Define the TQMake::position class.
  */
 
-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+#ifndef BISON_POSITION_H
+# define BISON_POSITION_H
 
 # include <iostream>
 # include <string>
@@ -139,4 +139,4 @@ namespace TQMake
   }
 
 }
-#endif // not BISON_POSITION_HH
+#endif // not BISON_POSITION_H
diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy
index 3cc0b79d..2c3e866d 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -109,7 +109,7 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
 */
 %}
 
-%skeleton "lalr1.cc"
+%skeleton "lalr1.cpp"
 %define "parser_class_name" "Parser"
 %name-prefix="QMake"
 %parse-param { QMake::Lexer* lexer }
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index 25aa402d..4bed35dd 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.h
+++ b/buildtools/lib/parsers/qmake/qmake_lex.h
@@ -20,7 +20,7 @@
 #ifndef TQMAKE_LEX_H
 #define TQMAKE_LEX_H
 
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 #include <iostream>
 
 #ifndef DONT_INCLUDE_FLEXLEXER
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index f9dea804..25ae0e85 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -35,12 +35,12 @@
 // Take the name prefix into account.
 #define yylex   TQMakelex
 
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 
 /* User implementation prologue.  */
 
 
-/* Line 317 of lalr1.cc.  */
+/* Line 317 of lalr1.cpp.  */
 #line 45 "tqmake_yacc.cpp"
 
 #ifndef YY_
@@ -751,7 +751,7 @@ namespace TQMake
     break;
 
 
-    /* Line 675 of lalr1.cc.  */
+    /* Line 675 of lalr1.cpp.  */
 #line 756 "tqmake_yacc.cpp"
 	default: break;
       }
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.h
index fd130e65..4c4e3042 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.h
@@ -39,7 +39,7 @@
 
 #include <string>
 #include <iostream>
-#include "stack.hh"
+#include "stack.h"
 
 namespace TQMake
 {
@@ -160,10 +160,10 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
 */
 
 
-/* Line 35 of lalr1.cc.  */
-#line 165 "qmake_yacc.hpp"
+/* Line 35 of lalr1.cpp.  */
+#line 165 "qmake_yacc.h"
 
-#include "location.hh"
+#include "location.h"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index 40fd9bd9..8b9b722a 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 
 #include "qmake_lex.h"
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
 
 namespace TQMake {
 
diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.h
index dfc6c67e..1c18d4d0 100644
--- a/buildtools/lib/parsers/qmake/stack.hh
+++ b/buildtools/lib/parsers/qmake/stack.h
@@ -32,8 +32,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
+#ifndef BISON_STACK_H
+# define BISON_STACK_H
 
 #include <deque>
 
@@ -126,4 +126,4 @@ namespace TQMake
   };
 }
 
-#endif // not BISON_STACK_HH
+#endif // not BISON_STACK_H
diff --git a/languages/ada/AdaAST.hpp b/languages/ada/AdaAST.h
index 1bb2bd07..35b734b4 100644
--- a/languages/ada/AdaAST.hpp
+++ b/languages/ada/AdaAST.h
@@ -1,7 +1,7 @@
 #ifndef ADAAST_HPP
 #define ADAAST_HPP
 
-#include <antlr/CommonAST.hpp>
+#include <antlr/CommonAST.h>
 
 class AdaAST;
 typedef antlr::ASTRefCount<AdaAST> RefAdaAST;
diff --git a/languages/ada/AdaLexer.cpp b/languages/ada/AdaLexer.cpp
index 2ac19416..07e0cdd0 100644
--- a/languages/ada/AdaLexer.cpp
+++ b/languages/ada/AdaLexer.cpp
@@ -1,12 +1,12 @@
 /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.cpp"$ */
-#include "AdaLexer.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 "AdaLexer.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 1531 "ada.g"
 
diff --git a/languages/ada/AdaLexer.hpp b/languages/ada/AdaLexer.h
index 795c7bba..f004b971 100644
--- a/languages/ada/AdaLexer.hpp
+++ b/languages/ada/AdaLexer.h
@@ -1,20 +1,20 @@
-#ifndef INC_AdaLexer_hpp_
-#define INC_AdaLexer_hpp_
+#ifndef INC_AdaLexer_h_
+#define INC_AdaLexer_h_
 
 #line 29 "ada.g"
 
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 
-#line 11 "AdaLexer.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.hpp"$ */
-#include <antlr/CommonToken.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/BitSet.hpp>
-#include "AdaTokenTypes.hpp"
-#include <antlr/CharScanner.hpp>
+#line 11 "AdaLexer.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.h"$ */
+#include <antlr/CommonToken.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/BitSet.h>
+#include "AdaTokenTypes.h"
+#include <antlr/CharScanner.h>
 class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public AdaTokenTypes
 {
 #line 1879 "ada.g"
@@ -22,7 +22,7 @@ class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public
   ANTLR_LEXER_PREAMBLE
   private:
     bool lastTokenWasTicCompatible;
-#line 22 "AdaLexer.hpp"
+#line 22 "AdaLexer.h"
 private:
 	void initLiterals();
 public:
@@ -83,4 +83,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3;
 };
 
-#endif /*INC_AdaLexer_hpp_*/
+#endif /*INC_AdaLexer_h_*/
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp
index e783595e..fed95180 100644
--- a/languages/ada/AdaParser.cpp
+++ b/languages/ada/AdaParser.cpp
@@ -1,8 +1,8 @@
 /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.cpp"$ */
-#include "AdaParser.hpp"
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/ASTFactory.hpp>
+#include "AdaParser.h"
+#include <antlr/NoViableAltException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/ASTFactory.h>
 #line 1 "ada.g"
 #line 8 "AdaParser.cpp"
 AdaParser::AdaParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k)
diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.h
index 0074c820..9ceb8811 100644
--- a/languages/ada/AdaParser.hpp
+++ b/languages/ada/AdaParser.h
@@ -1,19 +1,19 @@
-#ifndef INC_AdaParser_hpp_
-#define INC_AdaParser_hpp_
+#ifndef INC_AdaParser_h_
+#define INC_AdaParser_h_
 
 #line 29 "ada.g"
 
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 
-#line 11 "AdaParser.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.hpp"$ */
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenBuffer.hpp>
-#include "AdaTokenTypes.hpp"
-#include <antlr/LLkParser.hpp>
+#line 11 "AdaParser.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.h"$ */
+#include <antlr/TokenStream.h>
+#include <antlr/TokenBuffer.h>
+#include "AdaTokenTypes.h"
+#include <antlr/LLkParser.h>
 
 class CUSTOM_API AdaParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public AdaTokenTypes
 {
@@ -28,7 +28,7 @@ public:
   bool end_id_matches_def_id (const RefAdaAST& endid);
   bool definable_operator (const char *string);  // operator_symbol sans "/="
   bool is_operator_symbol (const char *string);
-#line 22 "AdaParser.hpp"
+#line 22 "AdaParser.h"
 public:
 	void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
 protected:
@@ -386,4 +386,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_30;
 };
 
-#endif /*INC_AdaParser_hpp_*/
+#endif /*INC_AdaParser_h_*/
diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp
index 167d671c..51cd0067 100644
--- a/languages/ada/AdaStoreWalker.cpp
+++ b/languages/ada/AdaStoreWalker.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.cpp"$ */
-#include "AdaStoreWalker.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "AdaStoreWalker.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "expandedada.store.g"
 #line 11 "AdaStoreWalker.cpp"
 AdaStoreWalker::AdaStoreWalker()
diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.h
index c18f5dcd..79b0ce76 100644
--- a/languages/ada/AdaStoreWalker.hpp
+++ b/languages/ada/AdaStoreWalker.h
@@ -1,5 +1,5 @@
-#ifndef INC_AdaStoreWalker_hpp_
-#define INC_AdaStoreWalker_hpp_
+#ifndef INC_AdaStoreWalker_h_
+#define INC_AdaStoreWalker_h_
 
 #line 1 "expandedada.store.g"
 
@@ -8,21 +8,21 @@
 #include <tqfileinfo.h>
 
 #include <codemodel.h>
-#include "AdaAST.hpp"
-#include "ada_utils.hpp"
+#include "AdaAST.h"
+#include "ada_utils.h"
 
-#line 15 "AdaStoreWalker.hpp"
-#include <antlr/config.hpp>
-#include "AdaStoreWalkerTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#line 15 "AdaStoreWalker.h"
+#include <antlr/config.h>
+#include "AdaStoreWalkerTokenTypes.h"
+/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.h"$ */
+#include <antlr/TreeParser.h>
 
 #line 10 "expandedada.store.g"
 
 #include <codemodel.h>
 #include <kdebug.h>
 
-#line 26 "AdaStoreWalker.hpp"
+#line 26 "AdaStoreWalker.h"
 class CUSTOM_API AdaStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaStoreWalkerTokenTypes
 {
 #line 25 "expandedada.store.g"
@@ -116,7 +116,7 @@ public:
 //        kdDebug() << "defineScope return" << endl;
        return psc;
     }
-#line 30 "AdaStoreWalker.hpp"
+#line 30 "AdaStoreWalker.h"
 public:
 	AdaStoreWalker();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -347,4 +347,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
 };
 
-#endif /*INC_AdaStoreWalker_hpp_*/
+#endif /*INC_AdaStoreWalker_h_*/
diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.h
index daaa4b21..be52bae2 100644
--- a/languages/ada/AdaStoreWalkerTokenTypes.hpp
+++ b/languages/ada/AdaStoreWalkerTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaStoreWalkerTokenTypes_hpp_
-#define INC_AdaStoreWalkerTokenTypes_hpp_
+#ifndef INC_AdaStoreWalkerTokenTypes_h_
+#define INC_AdaStoreWalkerTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -304,4 +304,4 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaStoreWalkerTokenTypes_hpp_*/
+#endif /*INC_AdaStoreWalkerTokenTypes_h_*/
diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.h
index 918b1cfd..becbd205 100644
--- a/languages/ada/AdaTokenTypes.hpp
+++ b/languages/ada/AdaTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaTokenTypes_hpp_
-#define INC_AdaTokenTypes_hpp_
+#ifndef INC_AdaTokenTypes_h_
+#define INC_AdaTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -303,4 +303,4 @@ struct CUSTOM_API AdaTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaTokenTypes_hpp_*/
+#endif /*INC_AdaTokenTypes_h_*/
diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp
index be5f0623..16e95182 100644
--- a/languages/ada/AdaTreeParserSuper.cpp
+++ b/languages/ada/AdaTreeParserSuper.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.cpp"$ */
-#include "AdaTreeParserSuper.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "AdaTreeParserSuper.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "ada.tree.g"
 #line 11 "AdaTreeParserSuper.cpp"
 AdaTreeParserSuper::AdaTreeParserSuper()
diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.h
index a4d164f0..cb35ac25 100644
--- a/languages/ada/AdaTreeParserSuper.hpp
+++ b/languages/ada/AdaTreeParserSuper.h
@@ -1,15 +1,15 @@
-#ifndef INC_AdaTreeParserSuper_hpp_
-#define INC_AdaTreeParserSuper_hpp_
+#ifndef INC_AdaTreeParserSuper_h_
+#define INC_AdaTreeParserSuper_h_
 
-#include <antlr/config.hpp>
-#include "AdaTreeParserSuperTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#include <antlr/config.h>
+#include "AdaTreeParserSuperTokenTypes.h"
+/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.h"$ */
+#include <antlr/TreeParser.h>
 
 class CUSTOM_API AdaTreeParserSuper : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaTreeParserSuperTokenTypes
 {
 #line 1 "ada.tree.g"
-#line 13 "AdaTreeParserSuper.hpp"
+#line 13 "AdaTreeParserSuper.h"
 public:
 	AdaTreeParserSuper();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -238,4 +238,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
 };
 
-#endif /*INC_AdaTreeParserSuper_hpp_*/
+#endif /*INC_AdaTreeParserSuper_h_*/
diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.h
index 924b7415..f6f75893 100644
--- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp
+++ b/languages/ada/AdaTreeParserSuperTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_AdaTreeParserSuperTokenTypes_hpp_
-#define INC_AdaTreeParserSuperTokenTypes_hpp_
+#ifndef INC_AdaTreeParserSuperTokenTypes_h_
+#define INC_AdaTreeParserSuperTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -304,4 +304,4 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_AdaTreeParserSuperTokenTypes_hpp_*/
+#endif /*INC_AdaTreeParserSuperTokenTypes_h_*/
diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am
index d45a2add..26fe8c2c 100644
--- a/languages/ada/Makefile.am
+++ b/languages/ada/Makefile.am
@@ -20,13 +20,13 @@ EXTRA_DIST = ada.g ada.tree.g ada.store.g
 ## The following three rules assume that you have Java installed,
 ## ANTLR installed, and you have the antlr jar in your CLASSPATH.
 
-#AdaLexer.hpp AdaLexer.cpp AdaParser.hpp AdaParser.cpp: ada.g
+#AdaLexer.h AdaLexer.cpp AdaParser.h AdaParser.cpp: ada.g
 #	antlr   ada.g
 
-#AdaTreeParserSuper.hpp AdaTreeParserSuper.cpp: ada.tree.g
+#AdaTreeParserSuper.h AdaTreeParserSuper.cpp: ada.tree.g
 #	antlr   ada.tree.g
 
-#AdaStoreWalker.hpp AdaStoreWalker.cpp: ada.store.g
+#AdaStoreWalker.h AdaStoreWalker.cpp: ada.store.g
 #	antlr -glib ada.tree.g  ada.store.g
 
 genparser:
diff --git a/languages/ada/README.dox b/languages/ada/README.dox
index e71e6d45..017b3aed 100644
--- a/languages/ada/README.dox
+++ b/languages/ada/README.dox
@@ -2,10 +2,10 @@
 Ada Language Support
 
 The ANTLR Ada core support files are:
-  - ada.g             -- contains AdaLexer and AdaParser, requires AdaAST.hpp and adasupport.cpp
+  - ada.g             -- contains AdaLexer and AdaParser, requires AdaAST.h and adasupport.cpp
   - ada.tree.g        -- contains the AdaTreeParserSuper
-  - AdaAST.hpp        -- definition of the AST node used by ada.g
-  - adasupport.hpp    -- general purpose utilities
+  - AdaAST.h        -- definition of the AST node used by ada.g
+  - adasupport.h    -- general purpose utilities
   - adasupport.cpp    -- implementation of general purpose utilities and implementation of AdaParser class methods from ada.g
 
 These are ANTLR master files.
diff --git a/languages/ada/ada.g b/languages/ada/ada.g
index 5f97952b..164c2187 100644
--- a/languages/ada/ada.g
+++ b/languages/ada/ada.g
@@ -27,8 +27,8 @@
 
 
 header "pre_include_hpp" {
-#include <antlr/SemanticException.hpp>  // antlr wants this
-#include "AdaAST.hpp"
+#include <antlr/SemanticException.h>  // antlr wants this
+#include "AdaAST.h"
 #include "preambles.h"
 }
 
diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g
index 31dccf99..658bfcfa 100644
--- a/languages/ada/ada.store.g
+++ b/languages/ada/ada.store.g
@@ -9,8 +9,8 @@ header "pre_include_hpp" {
 #include <qfileinfo.h>
 
 #include <codemodel.h>
-#include "AdaAST.hpp"
-#include "ada_utils.hpp"
+#include "AdaAST.h"
+#include "ada_utils.h"
 }
 
 header "post_include_hpp" {
diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp
index d7b8bbf7..e12306ea 100644
--- a/languages/ada/ada_utils.cpp
+++ b/languages/ada/ada_utils.cpp
@@ -11,8 +11,8 @@
 
 #include <kdebug.h>
 
-#include "ada_utils.hpp"
-#include "adasupport.hpp"
+#include "ada_utils.h"
+#include "adasupport.h"
 
 TQString qtext (const RefAdaAST& n)
 {
diff --git a/languages/ada/ada_utils.hpp b/languages/ada/ada_utils.h
index 25c9fabd..ae4f9011 100644
--- a/languages/ada/ada_utils.hpp
+++ b/languages/ada/ada_utils.h
@@ -4,7 +4,7 @@
 #define ADA_UTILS_H
 
 #include <tqstring.h>
-#include "AdaAST.hpp"
+#include "AdaAST.h"
 
 TQString qtext (const RefAdaAST& n);
 TQStringList qnamelist (const RefAdaAST& n);
diff --git a/languages/ada/adasupport.cpp b/languages/ada/adasupport.cpp
index 6b877b7b..69baa66d 100644
--- a/languages/ada/adasupport.cpp
+++ b/languages/ada/adasupport.cpp
@@ -4,10 +4,10 @@
 #include <stdlib.h>
 #include <stack>
 #include <string>
-#include <antlr/AST.hpp>
-#include "AdaParser.hpp"
-#include "AdaTokenTypes.hpp"
-#include "adasupport.hpp"
+#include <antlr/AST.h>
+#include "AdaParser.h"
+#include "AdaTokenTypes.h"
+#include "adasupport.h"
 
 #define eq !strcmp
 
diff --git a/languages/ada/adasupport.hpp b/languages/ada/adasupport.h
index 9d65e0e5..f6bfddee 100644
--- a/languages/ada/adasupport.hpp
+++ b/languages/ada/adasupport.h
@@ -4,7 +4,7 @@
 #define ADASUPPORT_H
 
 #include <string>
-#include "AdaAST.hpp"
+#include "AdaAST.h"
 
 std::string text (const RefAdaAST& n);
 int txteq (RefAdaAST n1, RefAdaAST n2);
diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index e08ef9a3..0d87f0a7 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -28,10 +28,10 @@
 #include "problemreporter.h"
 #include "backgroundparser.h"
 
-#include "AdaLexer.hpp"
-#include "AdaParser.hpp"
-#include "AdaStoreWalker.hpp"
-#include "AdaAST.hpp"
+#include "AdaLexer.h"
+#include "AdaParser.h"
+#include "AdaStoreWalker.h"
+#include "AdaAST.h"
 
 #include <kdevplugininfo.h>
 
diff --git a/languages/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp
index 68607851..4b77abcd 100644
--- a/languages/ada/backgroundparser.cpp
+++ b/languages/ada/backgroundparser.cpp
@@ -11,9 +11,9 @@
 
 #include "backgroundparser.h"
 #include "problemreporter.h"
-#include "AdaLexer.hpp"
-#include "AdaParser.hpp"
-#include "AdaAST.hpp"
+#include "AdaLexer.h"
+#include "AdaParser.h"
+#include "AdaAST.h"
 #include <kdebug.h>
 #include <tqfile.h>
 
diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
index f86ae76c..bca35481 100644
--- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am
@@ -1,7 +1,7 @@
-dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \
-	main_window_glade.hh Makefile.am app-Makefile.am \
-	configure.in gnome2mm.gladep main_window.hh \
-	app.kdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\
+dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cpp \
+	main_window_glade.h Makefile.am app-Makefile.am \
+	configure.in gnome2mm.gladep main_window.h \
+	app.kdevelop gnome2mm.cpp gnome2mmapp main_window_glade.cpp\
 	src-Makefile.am config.h gnome2mmapp.png
 
 templateName = gnome2mmapp
@@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles}
 archivedir = ${appwizarddatadir}
 archive_DATA = $(templateName).tar.gz ${templateName}.png
 
-CLEANFILES = *.tar.gz
\ No newline at end of file
+CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp
index 8a33b9ff..be1ab196 100644
--- a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc
+++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp
@@ -4,7 +4,7 @@
 #include <gnome--/main.h>
 #include <libgnome/gnome-i18n.h>
 
-#include "main_window.hh"
+#include "main_window.h"
 
 int main(int argc, char **argv)
 {  
diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
index 3b13385f..21dbd814 100644
--- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate
@@ -75,28 +75,28 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE10]
 Type=install
-Source=%{src}/gnome2mm.cc
-Dest=%{dest}/src/%{APPNAMELC}.cc
+Source=%{src}/gnome2mm.cpp
+Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [FILE11]
 Type=install
-Source=%{src}/main_window.hh
-Dest=%{dest}/src/main_window.hh
+Source=%{src}/main_window.h
+Dest=%{dest}/src/main_window.h
 
 [FILE12]
 Type=install
-Source=%{src}/main_window.cc
-Dest=%{dest}/src/main_window.cc
+Source=%{src}/main_window.cpp
+Dest=%{dest}/src/main_window.cpp
 
 [FILE13]
 Type=install
-Source=%{src}/main_window_glade.hh
-Dest=%{dest}/src/main_window_glade.hh
+Source=%{src}/main_window_glade.h
+Dest=%{dest}/src/main_window_glade.h
 
 [FILE14]
 Type=install
-Source=%{src}/main_window_glade.cc
-Dest=%{dest}/src/main_window_glade.cc
+Source=%{src}/main_window_glade.cpp
+Dest=%{dest}/src/main_window_glade.cpp
 
 [MSG]
 Type=message
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.cc b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp
index 4c73911b..152a660c 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window.cc
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp
@@ -1,11 +1,9 @@
 %{CC_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.cc_new
-
 // This file is for your program, I won't touch it again!
 
 #include "config.h"
-#include "main_window.hh"
+#include "main_window.h"
 
 #include <gtk--/main.h>
 
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.h
index ae93336b..80ac8c70 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window.h
@@ -1,16 +1,14 @@
 %{HH_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.hh_new
-
 // you might replace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
 // if you didn't make any modifications to the widget
 
-#ifndef _MAIN_WINDOW_HH
-#  include "main_window_glade.hh"
-#  define _MAIN_WINDOW_HH
+#ifndef _MAIN_WINDOW_H
+#  include "main_window_glade.h"
+#  define _MAIN_WINDOW_H
 class main_window : public main_window_glade
 {  
 protected:
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp
index bea6c857..577d3576 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp
@@ -4,11 +4,11 @@
 // glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade
 // for gtk 2.2.4 and gtkmm 1.2.10
 //
-// Please modify the corresponding derived classes in ./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.cpp
 
 #include "config.h"
 #include <libgnome/libgnome.h>
-#include "main_window_glade.hh"
+#include "main_window_glade.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk--/accelgroup.h>
 
diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h
index 97a9302f..1793dbdc 100644
--- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh
+++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h
@@ -4,10 +4,10 @@
 // glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade
 // for gtk 2.2.4 and gtkmm 1.2.10
 //
-// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp
 
-#ifndef _MAIN_WINDOW_GLADE_HH
-#  define _MAIN_WINDOW_GLADE_HH
+#ifndef _MAIN_WINDOW_GLADE_H
+#  define _MAIN_WINDOW_GLADE_H
 
 
 #if !defined(GLADEMM_DATA)
diff --git a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am
index fe5ec32c..81df1152 100644
--- a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am
+++ b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am
@@ -1,13 +1,13 @@
 bin_PROGRAMS = %{APPNAMELC}
 
 %{APPNAMELC}_SOURCES = \
-	%{APPNAMELC}.cc\
-	main_window_glade.cc \
-	main_window.cc 
+	%{APPNAMELC}.cpp\
+	main_window_glade.cpp \
+	main_window.cpp 
 
 noinst_HEADERS = \
-	main_window_glade.hh \
-	main_window.hh 
+	main_window_glade.h \
+	main_window.h
 
 AM_CXXFLAGS = @CXXFLAGS@ @GNOMEMM_CFLAGS@ 
 
diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
index 0a78898d..f152b532 100644
--- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
@@ -10,10 +10,10 @@
 #################################################
 
 set( _tarball_content
-    acconfig.h autogen.sh gtk2mm.glade main_window.cc
-    main_window_glade.hh Makefile.am app-Makefile.am
-    configure.in gtk2mm.gladep main_window.hh app.kdevelop
-    gtk2mm.cc main_window_glade.cc src-Makefile.am config.h
+    acconfig.h autogen.sh gtk2mm.glade main_window.cpp
+    main_window_glade.h Makefile.am app-Makefile.am
+    configure.in gtk2mm.gladep main_window.h app.kdevelop
+    gtk2mm.cpp main_window_glade.cpp src-Makefile.am config.h
     gtk2mmapp.png
 )
 list( SORT _tarball_content )
diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
index 2069ade7..16978c39 100644
--- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
@@ -1,7 +1,7 @@
-dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \
-	main_window_glade.hh Makefile.am app-Makefile.am \
-	configure.in gtk2mm.gladep main_window.hh \
-	app.kdevelop gtk2mm.cc main_window_glade.cc\
+dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cpp \
+	main_window_glade.h Makefile.am app-Makefile.am \
+	configure.in gtk2mm.gladep main_window.h \
+	app.kdevelop gtk2mm.cpp main_window_glade.cpp\
 	src-Makefile.am config.h gtk2mmapp.png
 
 templateName = gtk2mmapp
@@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles}
 archivedir = ${appwizarddatadir}
 archive_DATA = $(templateName).tar.gz ${templateName}.png
 
-CLEANFILES = *.tar.gz
\ No newline at end of file
+CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp
index 9845fede..30f39adf 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp
@@ -2,7 +2,7 @@
 
 #include <gtkmm/main.h>
 
-#include "main_window.hh"
+#include "main_window.h"
 
 int main(int argc, char **argv)
 {  
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
index 35b51993..68b119a2 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
@@ -71,28 +71,28 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE10]
 Type=install
-Source=%{src}/gtk2mm.cc
-Dest=%{dest}/src/%{APPNAMELC}.cc
+Source=%{src}/gtk2mm.cpp
+Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [FILE11]
 Type=install
-Source=%{src}/main_window.hh
-Dest=%{dest}/src/main_window.hh
+Source=%{src}/main_window.h
+Dest=%{dest}/src/main_window.h
 
 [FILE12]
 Type=install
-Source=%{src}/main_window.cc
-Dest=%{dest}/src/main_window.cc
+Source=%{src}/main_window.cpp
+Dest=%{dest}/src/main_window.cpp
 
 [FILE13]
 Type=install
-Source=%{src}/main_window_glade.hh
-Dest=%{dest}/src/main_window_glade.hh
+Source=%{src}/main_window_glade.h
+Dest=%{dest}/src/main_window_glade.h
 
 [FILE14]
 Type=install
-Source=%{src}/main_window_glade.cc
-Dest=%{dest}/src/main_window_glade.cc
+Source=%{src}/main_window_glade.cpp
+Dest=%{dest}/src/main_window_glade.cpp
 
 [MSG]
 Type=message
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.cc b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp
index ad36b327..3a7df9cf 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp
@@ -1,11 +1,9 @@
 %{CC_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.cc_new
-
 // This file is for your program, I won't touch it again!
 
 #include "config.h"
-#include "main_window.hh"
+#include "main_window.h"
 
 bool main_window::quit(GdkEventAny *ev)
 {  return 0;
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.h
index 640e1461..85daad4b 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.h
@@ -1,16 +1,14 @@
 %{HH_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.hh_new
-
 // you might replace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
 // if you didn't make any modifications to the widget
 
-#ifndef _MAIN_WINDOW_HH
-#  include "main_window_glade.hh"
-#  define _MAIN_WINDOW_HH
+#ifndef _MAIN_WINDOW_H
+#  include "main_window_glade.h"
+#  define _MAIN_WINDOW_H
 class main_window : public main_window_glade
 {
 
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp
index 829855a8..5bed4679 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp
@@ -3,7 +3,7 @@
 // DO NOT EDIT THIS FILE ! It was created using glade-- 
 // for gtk 2.8.3 and gtkmm 2.8.0
 //
-// Please modify the corresponding derived classes in ./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.cpp
 
 
 #if defined __GNUC__ && __GNUC__ < 3
@@ -18,7 +18,7 @@
 #else //gtkmm 2.2
 #define GMM_GTKMM_22_24(a,b) a
 #endif //
-#include "main_window_glade.hh"
+#include "main_window_glade.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtkmm/accelgroup.h>
 
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h
index 3c0cc27a..726409b4 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h
@@ -3,10 +3,10 @@
 // DO NOT EDIT THIS FILE ! It was created using glade--
 // for gtk 2.8.3 and gtkmm 2.8.0
 //
-// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp
 
-#ifndef _MAIN_WINDOW_GLADE_HH
-#  define _MAIN_WINDOW_GLADE_HH
+#ifndef _MAIN_WINDOW_GLADE_H
+#  define _MAIN_WINDOW_GLADE_H
 
 
 #if !defined(GLADEMM_DATA)
diff --git a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
index a8c856e9..e61b92f5 100644
--- a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
@@ -1,13 +1,13 @@
 bin_PROGRAMS = %{APPNAMELC}
 
 %{APPNAMELC}_SOURCES = \
-	%{APPNAMELC}.cc\
-	main_window_glade.cc \
-	main_window.cc 
+	%{APPNAMELC}.cpp\
+	main_window_glade.cpp \
+	main_window.cpp 
 
 noinst_HEADERS = \
-	main_window_glade.hh \
-	main_window.hh 
+	main_window_glade.h \
+	main_window.h 
 
 AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ 
 
diff --git a/languages/java/JavaAST.hpp b/languages/java/JavaAST.h
index 7108fca1..4d89452e 100644
--- a/languages/java/JavaAST.hpp
+++ b/languages/java/JavaAST.h
@@ -1,8 +1,8 @@
 #ifndef JAVAAST_HPP
 #define JAVAAST_HPP
 
-#include <antlr/CommonAST.hpp>
-#include <antlr/ASTFactory.hpp>
+#include <antlr/CommonAST.h>
+#include <antlr/ASTFactory.h>
 
 class JavaAST;
 typedef ANTLR_USE_NAMESPACE(antlr)ASTRefCount<JavaAST> RefJavaAST;
diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp
index 623e816f..4230b156 100644
--- a/languages/java/JavaLexer.cpp
+++ b/languages/java/JavaLexer.cpp
@@ -1,12 +1,12 @@
 /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.cpp"$ */
-#include "JavaLexer.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 "JavaLexer.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 1041 "java.g"
 
diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.h
index 9d185686..e5b6fb1d 100644
--- a/languages/java/JavaLexer.hpp
+++ b/languages/java/JavaLexer.h
@@ -1,10 +1,10 @@
-#ifndef INC_JavaLexer_hpp_
-#define INC_JavaLexer_hpp_
+#ifndef INC_JavaLexer_h_
+#define INC_JavaLexer_h_
 
 #line 2 "java.g"
 
 	#include "driver.h"
-	#include "JavaAST.hpp"
+	#include "JavaAST.h"
 
 	#include <tqlistview.h>
 	#include <kdebug.h>
@@ -15,14 +15,14 @@
 		RefJavaAST(ast)->setColumn( t->getColumn() ); \
 	}
 
-#line 19 "JavaLexer.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.hpp"$ */
-#include <antlr/CommonToken.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/BitSet.hpp>
-#include "JavaTokenTypes.hpp"
-#include <antlr/CharScanner.hpp>
+#line 19 "JavaLexer.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.h"$ */
+#include <antlr/CommonToken.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/BitSet.h>
+#include "JavaTokenTypes.h"
+#include <antlr/CharScanner.h>
 class CUSTOM_API JavaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public JavaTokenTypes
 {
 #line 1058 "java.g"
@@ -45,7 +45,7 @@ public:
         virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){
 		m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) );
 	}
-#line 30 "JavaLexer.hpp"
+#line 30 "JavaLexer.h"
 private:
 	void initLiterals();
 public:
@@ -129,4 +129,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
 };
 
-#endif /*INC_JavaLexer_hpp_*/
+#endif /*INC_JavaLexer_h_*/
diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp
index 1021c6a0..7d010b49 100644
--- a/languages/java/JavaRecognizer.cpp
+++ b/languages/java/JavaRecognizer.cpp
@@ -1,8 +1,8 @@
 /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.cpp"$ */
-#include "JavaRecognizer.hpp"
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/ASTFactory.hpp>
+#include "JavaRecognizer.h"
+#include <antlr/NoViableAltException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/ASTFactory.h>
 #line 1 "java.g"
 #line 8 "JavaRecognizer.cpp"
 JavaRecognizer::JavaRecognizer(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k)
diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.h
index fab59972..32311a3d 100644
--- a/languages/java/JavaRecognizer.hpp
+++ b/languages/java/JavaRecognizer.h
@@ -1,10 +1,10 @@
-#ifndef INC_JavaRecognizer_hpp_
-#define INC_JavaRecognizer_hpp_
+#ifndef INC_JavaRecognizer_h_
+#define INC_JavaRecognizer_h_
 
 #line 2 "java.g"
 
 	#include "driver.h"
-	#include "JavaAST.hpp"
+	#include "JavaAST.h"
 
 	#include <tqlistview.h>
 	#include <kdebug.h>
@@ -15,13 +15,13 @@
 		RefJavaAST(ast)->setColumn( t->getColumn() ); \
 	}
 
-#line 19 "JavaRecognizer.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.hpp"$ */
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenBuffer.hpp>
-#include "JavaTokenTypes.hpp"
-#include <antlr/LLkParser.hpp>
+#line 19 "JavaRecognizer.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.h"$ */
+#include <antlr/TokenStream.h>
+#include <antlr/TokenBuffer.h>
+#include "JavaTokenTypes.h"
+#include <antlr/LLkParser.h>
 
 /** Java 1.3 Recognizer
  *
@@ -157,7 +157,7 @@ public:
 	void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){
 		m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) );
 	}
-#line 142 "JavaRecognizer.hpp"
+#line 142 "JavaRecognizer.h"
 public:
 	void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
 protected:
@@ -420,4 +420,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_66;
 };
 
-#endif /*INC_JavaRecognizer_hpp_*/
+#endif /*INC_JavaRecognizer_h_*/
diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp
index 1bdb9522..763f95e7 100644
--- a/languages/java/JavaStoreWalker.cpp
+++ b/languages/java/JavaStoreWalker.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.cpp"$ */
-#include "JavaStoreWalker.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "JavaStoreWalker.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "java.store.g"
 #line 11 "JavaStoreWalker.cpp"
 JavaStoreWalker::JavaStoreWalker()
diff --git a/languages/java/JavaStoreWalker.hpp b/languages/java/JavaStoreWalker.h
index 676163ad..244c0978 100644
--- a/languages/java/JavaStoreWalker.hpp
+++ b/languages/java/JavaStoreWalker.h
@@ -1,21 +1,21 @@
-#ifndef INC_JavaStoreWalker_hpp_
-#define INC_JavaStoreWalker_hpp_
+#ifndef INC_JavaStoreWalker_h_
+#define INC_JavaStoreWalker_h_
 
 #line 3 "java.store.g"
 
 	#include <codemodel.h>
-	#include "JavaAST.hpp"
+	#include "JavaAST.h"
 
 	#include <tqstring.h>
 	#include <tqstringlist.h>
 	#include <tqvaluestack.h>
         #include <tqfileinfo.h>
 
-#line 15 "JavaStoreWalker.hpp"
-#include <antlr/config.hpp>
-#include "JavaStoreWalkerTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#line 15 "JavaStoreWalker.h"
+#include <antlr/config.h>
+#include "JavaStoreWalkerTokenTypes.h"
+/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.h"$ */
+#include <antlr/TreeParser.h>
 
 #line 13 "java.store.g"
 
@@ -23,7 +23,7 @@
 
 	#include <kdebug.h>
 
-#line 27 "JavaStoreWalker.hpp"
+#line 27 "JavaStoreWalker.h"
 /** Java 1.2 AST Recognizer Grammar
  *
  * Author:
@@ -70,7 +70,7 @@ public:
         	initializeASTFactory (ast_factory);
         	setASTFactory (&ast_factory);
 	}
-#line 44 "JavaStoreWalker.hpp"
+#line 44 "JavaStoreWalker.h"
 public:
 	JavaStoreWalker();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -161,4 +161,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1;
 };
 
-#endif /*INC_JavaStoreWalker_hpp_*/
+#endif /*INC_JavaStoreWalker_h_*/
diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.h
index 44322944..d8a07893 100644
--- a/languages/java/JavaStoreWalkerTokenTypes.hpp
+++ b/languages/java/JavaStoreWalkerTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_JavaStoreWalkerTokenTypes_hpp_
-#define INC_JavaStoreWalkerTokenTypes_hpp_
+#ifndef INC_JavaStoreWalkerTokenTypes_h_
+#define INC_JavaStoreWalkerTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -166,4 +166,4 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_JavaStoreWalkerTokenTypes_hpp_*/
+#endif /*INC_JavaStoreWalkerTokenTypes_h_*/
diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.h
index e36fa54c..8689c5ef 100644
--- a/languages/java/JavaTokenTypes.hpp
+++ b/languages/java/JavaTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_JavaTokenTypes_hpp_
-#define INC_JavaTokenTypes_hpp_
+#ifndef INC_JavaTokenTypes_h_
+#define INC_JavaTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -165,4 +165,4 @@ struct CUSTOM_API JavaTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_JavaTokenTypes_hpp_*/
+#endif /*INC_JavaTokenTypes_h_*/
diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am
index a1a1e812..f4a05f62 100644
--- a/languages/java/Makefile.am
+++ b/languages/java/Makefile.am
@@ -22,10 +22,10 @@ JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdri
 EXTRA_DIST = java.g java.tree.g java.store.g
 
 
-#JavaLexer.hpp JavaLexer.cpp JavaRecognizer.hpp JavaRecognizer.cpp: # java.g
+#JavaLexer.h JavaLexer.cpp JavaRecognizer.h JavaRecognizer.cpp: # java.g
 #       antlr java.g
 
-#JavaStoreWalker.hpp JavaStoreWalker.cpp: # java.store.g
+#JavaStoreWalker.h JavaStoreWalker.cpp: # java.store.g
 #       antlr java.store.g
 
 METASOURCES = AUTO
diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h
index fee2bc78..4823cf43 100644
--- a/languages/java/backgroundparser.h
+++ b/languages/java/backgroundparser.h
@@ -13,7 +13,7 @@
 #define BACKGROUNDPARSER_H
 
 #include "driver.h"
-#include "JavaAST.hpp"
+#include "JavaAST.h"
 
 #include <tqthread.h>
 #include <tqwaitcondition.h>
diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp
index c22bc9ce..3fbcd07b 100644
--- a/languages/java/driver.cpp
+++ b/languages/java/driver.cpp
@@ -17,9 +17,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "JavaAST.hpp"
-#include "JavaLexer.hpp"
-#include "JavaRecognizer.hpp"
+#include "JavaAST.h"
+#include "JavaLexer.h"
+#include "JavaRecognizer.h"
 
 #include <kdebug.h>
 #include <stdlib.h>
diff --git a/languages/java/driver.h b/languages/java/driver.h
index def7e400..3575ccfb 100644
--- a/languages/java/driver.h
+++ b/languages/java/driver.h
@@ -20,7 +20,7 @@
 #ifndef DRIVER_H
 #define DRIVER_H
 
-#include "JavaAST.hpp"
+#include "JavaAST.h"
 
 #include <tqpair.h>
 #include <tqvaluestack.h>
diff --git a/languages/java/java.g b/languages/java/java.g
index 1f825ec5..4228a573 100644
--- a/languages/java/java.g
+++ b/languages/java/java.g
@@ -1,7 +1,7 @@
 
 header "pre_include_hpp" {
 	#include "driver.h"
-	#include "JavaAST.hpp"
+	#include "JavaAST.h"
 
 	#include <qlistview.h>
 	#include <kdebug.h>
diff --git a/languages/java/java.store.g b/languages/java/java.store.g
index b69b7323..cc545c64 100644
--- a/languages/java/java.store.g
+++ b/languages/java/java.store.g
@@ -2,7 +2,7 @@
 
 header "pre_include_hpp" {
 	#include <codemodel.h>
-	#include "JavaAST.hpp"
+	#include "JavaAST.h"
 
 	#include <qstring.h>
 	#include <qstringlist.h>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index f9bbbd88..50571ba6 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -23,8 +23,8 @@
 #include "kdevdriver.h"
 #include "javasupport_utils.h"
 
-#include "JavaStoreWalker.hpp"
-#include "JavaAST.hpp"
+#include "JavaStoreWalker.h"
+#include "JavaAST.h"
 
 #include <tqheader.h>
 #include <tqdir.h>
diff --git a/languages/java/kdevdriver.cpp b/languages/java/kdevdriver.cpp
index d19a20c3..d3cffb68 100644
--- a/languages/java/kdevdriver.cpp
+++ b/languages/java/kdevdriver.cpp
@@ -1,6 +1,6 @@
 
 #include "kdevdriver.h"
-#include "JavaLexer.hpp"
+#include "JavaLexer.h"
 #include <unistd.h>
 #include <tqfileinfo.h>
 
diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am
index 9d168734..5d4b3513 100644
--- a/languages/pascal/Makefile.am
+++ b/languages/pascal/Makefile.am
@@ -23,10 +23,10 @@ genparser:
 	antlr   pascal.g && antlr pascal.tree.g
 
 ## The following rules assume that you have Java and ANTLR installed,
-#PascalLexer.hpp PascalLexer.cpp PascalParser.hpp PascalParser.cpp: pascal.g
+#PascalLexer.h PascalLexer.cpp PascalParser.h PascalParser.cpp: pascal.g
 #	antlr pascal.g
 
-#PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g
+#PascalStoreWalker.h PascalStoreWalker.cpp: pascal.tree.g
 #	antlr pascal.tree.g
 
 templatedir = ${kde_datadir}/kdevabbrev/templates
diff --git a/languages/pascal/PascalAST.hpp b/languages/pascal/PascalAST.h
index 3df4ea50..1e3df014 100644
--- a/languages/pascal/PascalAST.hpp
+++ b/languages/pascal/PascalAST.h
@@ -1,7 +1,7 @@
 #ifndef PASCALAST_HPP
 #define PASCALAST_HPP
 
-#include <antlr/CommonAST.hpp>
+#include <antlr/CommonAST.h>
 
 class PascalAST;
 typedef antlr::ASTRefCount<PascalAST> RefPascalAST;
diff --git a/languages/pascal/PascalLexer.cpp b/languages/pascal/PascalLexer.cpp
index 28f532f8..c140ee51 100644
--- a/languages/pascal/PascalLexer.cpp
+++ b/languages/pascal/PascalLexer.cpp
@@ -1,12 +1,12 @@
 /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.cpp"$ */
-#include "PascalLexer.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 "PascalLexer.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 "pascal.g"
 #line 13 "PascalLexer.cpp"
diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.h
index 99a14959..e2043c2f 100644
--- a/languages/pascal/PascalLexer.hpp
+++ b/languages/pascal/PascalLexer.h
@@ -1,10 +1,10 @@
-#ifndef INC_PascalLexer_hpp_
-#define INC_PascalLexer_hpp_
+#ifndef INC_PascalLexer_h_
+#define INC_PascalLexer_h_
 
 #line 29 "pascal.g"
 
         #include "problemreporter.h"
-        #include "PascalAST.hpp"
+        #include "PascalAST.h"
 
         #include <tqlistview.h>
         #include <kdebug.h>
@@ -15,14 +15,14 @@
                 RefPascalAST(ast)->setColumn( t->getColumn() ); \
         }
 
-#line 19 "PascalLexer.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.hpp"$ */
-#include <antlr/CommonToken.hpp>
-#include <antlr/InputBuffer.hpp>
-#include <antlr/BitSet.hpp>
-#include "PascalTokenTypes.hpp"
-#include <antlr/CharScanner.hpp>
+#line 19 "PascalLexer.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.h"$ */
+#include <antlr/CommonToken.h>
+#include <antlr/InputBuffer.h>
+#include <antlr/BitSet.h>
+#include "PascalTokenTypes.h"
+#include <antlr/CharScanner.h>
 class CUSTOM_API PascalLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public PascalTokenTypes
 {
 #line 1067 "pascal.g"
@@ -56,7 +56,7 @@ public:
                                                 getFilename().c_str(),
                                                 getLine(), getColumn() );
         }
-#line 30 "PascalLexer.hpp"
+#line 30 "PascalLexer.h"
 private:
 	void initLiterals();
 public:
@@ -118,4 +118,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3;
 };
 
-#endif /*INC_PascalLexer_hpp_*/
+#endif /*INC_PascalLexer_h_*/
diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp
index 51d620ff..e45cdb4e 100644
--- a/languages/pascal/PascalParser.cpp
+++ b/languages/pascal/PascalParser.cpp
@@ -1,8 +1,8 @@
 /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.cpp"$ */
-#include "PascalParser.hpp"
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/ASTFactory.hpp>
+#include "PascalParser.h"
+#include <antlr/NoViableAltException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/ASTFactory.h>
 #line 1 "pascal.g"
 #line 8 "PascalParser.cpp"
 PascalParser::PascalParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k)
diff --git a/languages/pascal/PascalParser.hpp b/languages/pascal/PascalParser.h
index dfd4e5f2..19cbc397 100644
--- a/languages/pascal/PascalParser.hpp
+++ b/languages/pascal/PascalParser.h
@@ -1,10 +1,10 @@
-#ifndef INC_PascalParser_hpp_
-#define INC_PascalParser_hpp_
+#ifndef INC_PascalParser_h_
+#define INC_PascalParser_h_
 
 #line 29 "pascal.g"
 
         #include "problemreporter.h"
-        #include "PascalAST.hpp"
+        #include "PascalAST.h"
 
         #include <tqlistview.h>
         #include <kdebug.h>
@@ -15,13 +15,13 @@
                 RefPascalAST(ast)->setColumn( t->getColumn() ); \
         }
 
-#line 19 "PascalParser.hpp"
-#include <antlr/config.hpp>
-/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.hpp"$ */
-#include <antlr/TokenStream.hpp>
-#include <antlr/TokenBuffer.hpp>
-#include "PascalTokenTypes.hpp"
-#include <antlr/LLkParser.hpp>
+#line 19 "PascalParser.h"
+#include <antlr/config.h>
+/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.h"$ */
+#include <antlr/TokenStream.h>
+#include <antlr/TokenBuffer.h>
+#include "PascalTokenTypes.h"
+#include <antlr/LLkParser.h>
 
 class CUSTOM_API PascalParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public PascalTokenTypes
 {
@@ -58,7 +58,7 @@ public:
                                                 LT(1)->getLine(),
                                                 LT(1)->getColumn() );
         }
-#line 30 "PascalParser.hpp"
+#line 30 "PascalParser.h"
 public:
 	void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
 protected:
@@ -419,4 +419,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_76;
 };
 
-#endif /*INC_PascalParser_hpp_*/
+#endif /*INC_PascalParser_h_*/
diff --git a/languages/pascal/PascalStoreWalker.cpp b/languages/pascal/PascalStoreWalker.cpp
index 96c69fe4..b56897df 100644
--- a/languages/pascal/PascalStoreWalker.cpp
+++ b/languages/pascal/PascalStoreWalker.cpp
@@ -1,11 +1,11 @@
 /* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.cpp"$ */
-#include "PascalStoreWalker.hpp"
-#include <antlr/Token.hpp>
-#include <antlr/AST.hpp>
-#include <antlr/NoViableAltException.hpp>
-#include <antlr/MismatchedTokenException.hpp>
-#include <antlr/SemanticException.hpp>
-#include <antlr/BitSet.hpp>
+#include "PascalStoreWalker.h"
+#include <antlr/Token.h>
+#include <antlr/AST.h>
+#include <antlr/NoViableAltException.h>
+#include <antlr/MismatchedTokenException.h>
+#include <antlr/SemanticException.h>
+#include <antlr/BitSet.h>
 #line 1 "pascal.tree.g"
 #line 11 "PascalStoreWalker.cpp"
 PascalStoreWalker::PascalStoreWalker()
diff --git a/languages/pascal/PascalStoreWalker.hpp b/languages/pascal/PascalStoreWalker.h
index ada7c020..ceece541 100644
--- a/languages/pascal/PascalStoreWalker.hpp
+++ b/languages/pascal/PascalStoreWalker.h
@@ -1,27 +1,27 @@
-#ifndef INC_PascalStoreWalker_hpp_
-#define INC_PascalStoreWalker_hpp_
+#ifndef INC_PascalStoreWalker_h_
+#define INC_PascalStoreWalker_h_
 
 #line 20 "pascal.tree.g"
 
 	#include <codemodel.h>
-        #include "PascalAST.hpp"
+        #include "PascalAST.h"
 
         #include <tqstring.h>
         #include <tqstringlist.h>
         #include <tqfileinfo.h>
 
-#line 14 "PascalStoreWalker.hpp"
-#include <antlr/config.hpp>
-#include "PascalStoreWalkerTokenTypes.hpp"
-/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.hpp"$ */
-#include <antlr/TreeParser.hpp>
+#line 14 "PascalStoreWalker.h"
+#include <antlr/config.h>
+#include "PascalStoreWalkerTokenTypes.h"
+/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.h"$ */
+#include <antlr/TreeParser.h>
 
 #line 29 "pascal.tree.g"
 
 	#include <codemodel.h>
         #include <kdebug.h>
 
-#line 25 "PascalStoreWalker.hpp"
+#line 25 "PascalStoreWalker.h"
 class CUSTOM_API PascalStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public PascalStoreWalkerTokenTypes
 {
 #line 47 "pascal.tree.g"
@@ -48,7 +48,7 @@ public:
         }
 
         void wipeout()						{ m_model->wipeout(); }
-#line 29 "PascalStoreWalker.hpp"
+#line 29 "PascalStoreWalker.h"
 public:
 	PascalStoreWalker();
 	static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory );
@@ -169,4 +169,4 @@ private:
 	static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_6;
 };
 
-#endif /*INC_PascalStoreWalker_hpp_*/
+#endif /*INC_PascalStoreWalker_h_*/
diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.h
index cd9e0c81..4631429c 100644
--- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp
+++ b/languages/pascal/PascalStoreWalkerTokenTypes.h
@@ -1,7 +1,7 @@
-#ifndef INC_PascalStoreWalkerTokenTypes_hpp_
-#define INC_PascalStoreWalkerTokenTypes_hpp_
+#ifndef INC_PascalStoreWalkerTokenTypes_h_
+#define INC_PascalStoreWalkerTokenTypes_h_
 
-/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalkerTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalkerTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -203,4 +203,4 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_PascalStoreWalkerTokenTypes_hpp_*/
+#endif /*INC_PascalStoreWalkerTokenTypes_h_*/
diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.h
index 007269b0..42e97d53 100644
--- a/languages/pascal/PascalTokenTypes.hpp
+++ b/languages/pascal/PascalTokenTypes.h
@@ -1,10 +1,10 @@
-#ifndef INC_PascalTokenTypes_hpp_
-#define INC_PascalTokenTypes_hpp_
+#ifndef INC_PascalTokenTypes_h_
+#define INC_PascalTokenTypes_h_
 
 #undef TRUE
 #undef FALSE
 
-/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.hpp"$ */
+/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.h"$ */
 
 #ifndef CUSTOM_API
 # define CUSTOM_API
@@ -206,4 +206,4 @@ struct CUSTOM_API PascalTokenTypes {
 #ifdef __cplusplus
 };
 #endif
-#endif /*INC_PascalTokenTypes_hpp_*/
+#endif /*INC_PascalTokenTypes_h_*/
diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp
index ff202374..df9c85dc 100644
--- a/languages/pascal/backgroundparser.cpp
+++ b/languages/pascal/backgroundparser.cpp
@@ -13,12 +13,12 @@
 
 #include "backgroundparser.h"
 #include "problemreporter.h"
-#include "PascalLexer.hpp"
-#include "PascalParser.hpp"
-#include "PascalAST.hpp"
+#include "PascalLexer.h"
+#include "PascalParser.h"
+#include "PascalAST.h"
 #include <kdebug.h>
 #include <tqfile.h>
-#include <antlr/ASTFactory.hpp>
+#include <antlr/ASTFactory.h>
 
 BackgroundParser::BackgroundParser( ProblemReporter* reporter,
                                     const TQString& source,
diff --git a/languages/pascal/pascal.g b/languages/pascal/pascal.g
index fde5dcb8..59407423 100644
--- a/languages/pascal/pascal.g
+++ b/languages/pascal/pascal.g
@@ -28,7 +28,7 @@
 
 header "pre_include_hpp" {
         #include "problemreporter.h"
-        #include "PascalAST.hpp"
+        #include "PascalAST.h"
 
         #include <qlistview.h>
         #include <kdebug.h>
diff --git a/languages/pascal/pascal.tree.g b/languages/pascal/pascal.tree.g
index c597afb8..d90503c4 100644
--- a/languages/pascal/pascal.tree.g
+++ b/languages/pascal/pascal.tree.g
@@ -19,7 +19,7 @@
 
 header "pre_include_hpp" {
 	#include <codemodel.h>
-        #include "PascalAST.hpp"
+        #include "PascalAST.h"
 
         #include <qstring.h>
         #include <qstringlist.h>
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 69cbebf8..a61ab6a0 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <kstatusbar.h>
 
-#include <antlr/ASTFactory.hpp>
+#include <antlr/ASTFactory.h>
 
 #include "catalog.h"
 #include <kdevcore.h>
@@ -31,9 +31,9 @@
 
 #include "pascalsupport_part.h"
 #include "problemreporter.h"
-#include "PascalLexer.hpp"
-#include "PascalParser.hpp"
-#include "PascalStoreWalker.hpp"
+#include "PascalLexer.h"
+#include "PascalParser.h"
+#include "PascalStoreWalker.h"
 
 struct PascalSupportPartData{
     ProblemReporter* problemReporter;
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 {
diff --git a/parts/tipofday/Makefile.am b/parts/tipofday/Makefile.am
index 4ec54292..9b39f67a 100644
--- a/parts/tipofday/Makefile.am
+++ b/parts/tipofday/Makefile.am
@@ -19,6 +19,6 @@ rc_DATA = kdevpart_tipofday.rc
 rcdir = $(kde_datadir)/kdevtipofday
 
 messages: rc.cpp
-	$(PREPARETIPS) > tips.cc
-	$(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot
-	rm -f tips.cc
+	$(PREPARETIPS) > tips.cpp
+	$(XGETTEXT) *.cpp *.h tips.cpp -o $(podir)/kdevtipofday.pot
+	rm -f tips.cpp