70 files changed, 328 insertions, 336 deletions
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;