143 files changed, 266 insertions, 266 deletions

diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 14e702aa8..f818043b7 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -384,7 +384,7 @@ void PageViewer::slotSetCaption(const TQString& cap)
 void PageViewer::slotPaletteOrFontChanged()
 {
     kdDebug() << "PageViewer::slotPaletteOrFontChanged()" << endl;
-    // taken from KonqView (tdebase/konqueror/konq_view.cc)
+    // taken from KonqView (tdebase/konqueror/konq_view.cpp)
     
     TQObject *obj = KParts::BrowserExtension::childObject(this);
     if ( !obj ) // not all views have a browser extension !
diff --git a/indexlib/bitio.h b/indexlib/bitio.h
index 913f44ea4..1ecc0cb22 100644
--- a/indexlib/bitio.h
+++ b/indexlib/bitio.h
@@ -32,7 +32,7 @@
  */
 
 #include <inttypes.h>
-#include "boost-compat/remove_cv.hpp"
+#include "boost-compat/remove_cv.h"
 
 /**
  * \namespace byte_io
diff --git a/indexlib/bitio.tcc b/indexlib/bitio.tcc
index f6dbdfc0b..f1c14c778 100644
--- a/indexlib/bitio.tcc
+++ b/indexlib/bitio.tcc
@@ -1,5 +1,5 @@
-#include "boost-compat/static_assert.hpp"
-#include "boost-compat/remove_cv.hpp"
+#include "boost-compat/static_assert.h"
+#include "boost-compat/remove_cv.h"
 #ifdef HAVE_BOOST
 #include <boost/type_traits/is_same.hpp>
 #endif
diff --git a/indexlib/boost-compat/checked_delete.hpp b/indexlib/boost-compat/checked_delete.h
index 9bb84e8e1..db740fcb1 100644
--- a/indexlib/boost-compat/checked_delete.hpp
+++ b/indexlib/boost-compat/checked_delete.h
@@ -1,5 +1,5 @@
-#ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
-#define BOOST_CHECKED_DELETE_HPP_INCLUDED
+#ifndef BOOST_CHECKED_DELETE_H_INCLUDED
+#define BOOST_CHECKED_DELETE_H_INCLUDED
 
 // MS compatible compilers support #pragma once
 
@@ -66,4 +66,4 @@ template<class T> struct checked_array_deleter
 
 } // namespace boost
 
-#endif  // #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
+#endif  // #ifndef BOOST_CHECKED_DELETE_H_INCLUDED
diff --git a/indexlib/boost-compat/config.hpp b/indexlib/boost-compat/config.h
index 055a27855..86f12b817 100644
--- a/indexlib/boost-compat/config.hpp
+++ b/indexlib/boost-compat/config.h
@@ -1,4 +1,4 @@
-//  Boost config.hpp configuration header file  ------------------------------//
+//  Boost config.h configuration header file  ------------------------------//
 
 //  (C) Copyright John Maddock 2002. 
 //  Use, modification and distribution are subject to the 
@@ -7,15 +7,15 @@
 
 //  See http://www.boost.org/libs/config for most recent version.
 
-//  Boost config.hpp policy and rationale documentation has been moved to
+//  Boost config.h policy and rationale documentation has been moved to
 //  http://www.boost.org/libs/config
 //
 //  CAUTION: This file is intended to be completely stable -
 //           DO NOT MODIFY THIS FILE!
 //
 
-#ifndef BOOST_CONFIG_HPP
-#define BOOST_CONFIG_HPP
+#ifndef BOOST_CONFIG_H
+#define BOOST_CONFIG_H
 
 // if we don't have a user config, then use the default location:
 #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
@@ -56,7 +56,7 @@
 // get config suffix code:
 #include <boost/config/suffix.hpp>
 
-#endif  // BOOST_CONFIG_HPP
+#endif  // BOOST_CONFIG_H
 
 
 
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.h
index 49f424949..49f424949 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.h
diff --git a/indexlib/boost-compat/config/abi/borland_suffix.hpp b/indexlib/boost-compat/config/abi/borland_suffix.h
index 940535f38..940535f38 100644
--- a/indexlib/boost-compat/config/abi/borland_suffix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_suffix.h
diff --git a/indexlib/boost-compat/config/abi/msvc_prefix.hpp b/indexlib/boost-compat/config/abi/msvc_prefix.h
index 3d3905c21..3d3905c21 100644
--- a/indexlib/boost-compat/config/abi/msvc_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/msvc_prefix.h
diff --git a/indexlib/boost-compat/config/abi/msvc_suffix.hpp b/indexlib/boost-compat/config/abi/msvc_suffix.h
index a64d783eb..a64d783eb 100644
--- a/indexlib/boost-compat/config/abi/msvc_suffix.hpp
+++ b/indexlib/boost-compat/config/abi/msvc_suffix.h
diff --git a/indexlib/boost-compat/config/abi_prefix.hpp b/indexlib/boost-compat/config/abi_prefix.h
index 1733dc036..d4ddd29b5 100644
--- a/indexlib/boost-compat/config/abi_prefix.hpp
+++ b/indexlib/boost-compat/config/abi_prefix.h
@@ -6,8 +6,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_CONFIG_ABI_PREFIX_HPP
-# define BOOST_CONFIG_ABI_PREFIX_HPP
+#ifndef BOOST_CONFIG_ABI_PREFIX_H
+# define BOOST_CONFIG_ABI_PREFIX_H
 #else
 # error double inclusion of header boost/config/abi_prefix.hpp is an error
 #endif
diff --git a/indexlib/boost-compat/config/abi_suffix.hpp b/indexlib/boost-compat/config/abi_suffix.h
index 6339da631..4876507e6 100644
--- a/indexlib/boost-compat/config/abi_suffix.hpp
+++ b/indexlib/boost-compat/config/abi_suffix.h
@@ -9,10 +9,10 @@
 // This header should be #included AFTER code that was preceded by a #include
 // <boost/config/abi_prefix.hpp>.
 
-#ifndef BOOST_CONFIG_ABI_PREFIX_HPP
+#ifndef BOOST_CONFIG_ABI_PREFIX_H
 # error Header boost/config/abi_prefix.hpp must only be used after boost/config/abi_prefix.hpp
 #else
-# undef BOOST_CONFIG_ABI_PREFIX_HPP
+# undef BOOST_CONFIG_ABI_PREFIX_H
 #endif
 
 // the suffix header occurs after all of our code:
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.h
index b4e580ffa..c6d9bc909 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.h
@@ -5,7 +5,7 @@
 
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE         auto_link.hpp
+  *   FILE         auto_link.h
   *   VERSION      see <boost/version.hpp>
   *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
   */
@@ -67,7 +67,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 ***************************************************************************/
 
 #ifdef __cplusplus
-#  ifndef BOOST_CONFIG_HPP
+#  ifndef BOOST_CONFIG_H
 #     include <boost/config.hpp>
 #  endif
 #elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__)
@@ -86,7 +86,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
     || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
     || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
 
-#ifndef BOOST_VERSION_HPP
+#ifndef BOOST_VERSION_H
 #  include <boost/version.hpp>
 #endif
 
diff --git a/indexlib/boost-compat/config/compiler/borland.hpp b/indexlib/boost-compat/config/compiler/borland.h
index 531691eff..531691eff 100644
--- a/indexlib/boost-compat/config/compiler/borland.hpp
+++ b/indexlib/boost-compat/config/compiler/borland.h
diff --git a/indexlib/boost-compat/config/compiler/comeau.hpp b/indexlib/boost-compat/config/compiler/comeau.h
index 16a1b93cb..16a1b93cb 100644
--- a/indexlib/boost-compat/config/compiler/comeau.hpp
+++ b/indexlib/boost-compat/config/compiler/comeau.h
diff --git a/indexlib/boost-compat/config/compiler/common_edg.hpp b/indexlib/boost-compat/config/compiler/common_edg.h
index c7c0b56ee..28b164a81 100644
--- a/indexlib/boost-compat/config/compiler/common_edg.hpp
+++ b/indexlib/boost-compat/config/compiler/common_edg.h
@@ -34,7 +34,7 @@
 #   define BOOST_NO_TEMPLATE_TEMPLATES
 #endif 
 
-// See also kai.hpp which checks a Kai-specific symbol for EH
+// See also kai.h which checks a Kai-specific symbol for EH
 # if !defined(__KCC) && !defined(__EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
diff --git a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp b/indexlib/boost-compat/config/compiler/compaq_cxx.h
index 3c0c6b7ff..3c0c6b7ff 100644
--- a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp
+++ b/indexlib/boost-compat/config/compiler/compaq_cxx.h
diff --git a/indexlib/boost-compat/config/compiler/digitalmars.hpp b/indexlib/boost-compat/config/compiler/digitalmars.h
index 32fc71faf..32fc71faf 100644
--- a/indexlib/boost-compat/config/compiler/digitalmars.hpp
+++ b/indexlib/boost-compat/config/compiler/digitalmars.h
diff --git a/indexlib/boost-compat/config/compiler/gcc.hpp b/indexlib/boost-compat/config/compiler/gcc.h
index 4dc3f608b..2c5ad1981 100644
--- a/indexlib/boost-compat/config/compiler/gcc.hpp
+++ b/indexlib/boost-compat/config/compiler/gcc.h
@@ -14,7 +14,7 @@
 //  GNU C++ compiler setup:
 
 #   if __GNUC__ == 2 && __GNUC_MINOR__ == 91
-       // egcs 1.1 won't parse shared_ptr.hpp without this:
+       // egcs 1.1 won't parse shared_ptr.h without this:
 #      define BOOST_NO_AUTO_PTR
 #   endif
 #   if __GNUC__ == 2 && __GNUC_MINOR__ < 95
diff --git a/indexlib/boost-compat/config/compiler/greenhills.hpp b/indexlib/boost-compat/config/compiler/greenhills.h
index 038b6b2b5..038b6b2b5 100644
--- a/indexlib/boost-compat/config/compiler/greenhills.hpp
+++ b/indexlib/boost-compat/config/compiler/greenhills.h
diff --git a/indexlib/boost-compat/config/compiler/hp_acc.hpp b/indexlib/boost-compat/config/compiler/hp_acc.h
index b5c587ab7..b5c587ab7 100644
--- a/indexlib/boost-compat/config/compiler/hp_acc.hpp
+++ b/indexlib/boost-compat/config/compiler/hp_acc.h
diff --git a/indexlib/boost-compat/config/compiler/intel.hpp b/indexlib/boost-compat/config/compiler/intel.h
index 060338bcf..060338bcf 100644
--- a/indexlib/boost-compat/config/compiler/intel.hpp
+++ b/indexlib/boost-compat/config/compiler/intel.h
diff --git a/indexlib/boost-compat/config/compiler/kai.hpp b/indexlib/boost-compat/config/compiler/kai.h
index de16f1a67..fefda9ce0 100644
--- a/indexlib/boost-compat/config/compiler/kai.hpp
+++ b/indexlib/boost-compat/config/compiler/kai.h
@@ -16,7 +16,7 @@
 #     define BOOST_NO_STDC_NAMESPACE
 #   endif
 
-// see also common_edg.hpp which needs a special check for __KCC
+// see also common_edg.h which needs a special check for __KCC
 # if !defined(_EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
diff --git a/indexlib/boost-compat/config/compiler/metrowerks.hpp b/indexlib/boost-compat/config/compiler/metrowerks.h
index a74cadef1..a74cadef1 100644
--- a/indexlib/boost-compat/config/compiler/metrowerks.hpp
+++ b/indexlib/boost-compat/config/compiler/metrowerks.h
diff --git a/indexlib/boost-compat/config/compiler/mpw.hpp b/indexlib/boost-compat/config/compiler/mpw.h
index 8ab2aacb6..8ab2aacb6 100644
--- a/indexlib/boost-compat/config/compiler/mpw.hpp
+++ b/indexlib/boost-compat/config/compiler/mpw.h
diff --git a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp b/indexlib/boost-compat/config/compiler/sgi_mipspro.h
index 689b67eeb..689b67eeb 100644
--- a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp
+++ b/indexlib/boost-compat/config/compiler/sgi_mipspro.h
diff --git a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp b/indexlib/boost-compat/config/compiler/sunpro_cc.h
index 8a61199f8..80dc39131 100644
--- a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp
+++ b/indexlib/boost-compat/config/compiler/sunpro_cc.h
@@ -38,7 +38,7 @@
        // Requesting debug info (-g) with Boost.Python results
        // in an internal compiler error for "static const"
        // initialized in-class.
-       //    >> Assertion:   (../links/dbg_cstabs.cc, line 611)
+       //    >> Assertion:   (../links/dbg_cstabs.cpp, line 611)
        //         while processing ../test.cpp at line 0.
        // (Jens Maurer according to Gottfried Ganßauge 04 Mar 2002)
 #      define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
diff --git a/indexlib/boost-compat/config/compiler/vacpp.hpp b/indexlib/boost-compat/config/compiler/vacpp.h
index 4cf0de7c1..4cf0de7c1 100644
--- a/indexlib/boost-compat/config/compiler/vacpp.hpp
+++ b/indexlib/boost-compat/config/compiler/vacpp.h
diff --git a/indexlib/boost-compat/config/compiler/visualc.hpp b/indexlib/boost-compat/config/compiler/visualc.h
index 323532603..323532603 100644
--- a/indexlib/boost-compat/config/compiler/visualc.hpp
+++ b/indexlib/boost-compat/config/compiler/visualc.h
diff --git a/indexlib/boost-compat/config/platform/aix.hpp b/indexlib/boost-compat/config/platform/aix.h
index 894ef42ce..894ef42ce 100644
--- a/indexlib/boost-compat/config/platform/aix.hpp
+++ b/indexlib/boost-compat/config/platform/aix.h
diff --git a/indexlib/boost-compat/config/platform/amigaos.hpp b/indexlib/boost-compat/config/platform/amigaos.h
index 34bcf4128..34bcf4128 100644
--- a/indexlib/boost-compat/config/platform/amigaos.hpp
+++ b/indexlib/boost-compat/config/platform/amigaos.h
diff --git a/indexlib/boost-compat/config/platform/beos.hpp b/indexlib/boost-compat/config/platform/beos.h
index 48c3d8dc5..48c3d8dc5 100644
--- a/indexlib/boost-compat/config/platform/beos.hpp
+++ b/indexlib/boost-compat/config/platform/beos.h
diff --git a/indexlib/boost-compat/config/platform/bsd.hpp b/indexlib/boost-compat/config/platform/bsd.h
index 4f04ed2a0..4f04ed2a0 100644
--- a/indexlib/boost-compat/config/platform/bsd.hpp
+++ b/indexlib/boost-compat/config/platform/bsd.h
diff --git a/indexlib/boost-compat/config/platform/cygwin.hpp b/indexlib/boost-compat/config/platform/cygwin.h
index 0fd2ebe2d..0fd2ebe2d 100644
--- a/indexlib/boost-compat/config/platform/cygwin.hpp
+++ b/indexlib/boost-compat/config/platform/cygwin.h
diff --git a/indexlib/boost-compat/config/platform/hpux.hpp b/indexlib/boost-compat/config/platform/hpux.h
index 21049059e..21049059e 100644
--- a/indexlib/boost-compat/config/platform/hpux.hpp
+++ b/indexlib/boost-compat/config/platform/hpux.h
diff --git a/indexlib/boost-compat/config/platform/irix.hpp b/indexlib/boost-compat/config/platform/irix.h
index aeae49c8b..aeae49c8b 100644
--- a/indexlib/boost-compat/config/platform/irix.hpp
+++ b/indexlib/boost-compat/config/platform/irix.h
diff --git a/indexlib/boost-compat/config/platform/linux.hpp b/indexlib/boost-compat/config/platform/linux.h
index 51ae13347..51ae13347 100644
--- a/indexlib/boost-compat/config/platform/linux.hpp
+++ b/indexlib/boost-compat/config/platform/linux.h
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.h
index 3a5f41303..3a5f41303 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.h
diff --git a/indexlib/boost-compat/config/platform/solaris.hpp b/indexlib/boost-compat/config/platform/solaris.h
index 700dc3ce6..700dc3ce6 100644
--- a/indexlib/boost-compat/config/platform/solaris.hpp
+++ b/indexlib/boost-compat/config/platform/solaris.h
diff --git a/indexlib/boost-compat/config/platform/win32.hpp b/indexlib/boost-compat/config/platform/win32.h
index 548bff280..548bff280 100644
--- a/indexlib/boost-compat/config/platform/win32.hpp
+++ b/indexlib/boost-compat/config/platform/win32.h
diff --git a/indexlib/boost-compat/config/posix_features.hpp b/indexlib/boost-compat/config/posix_features.h
index 4afb476b7..4afb476b7 100644
--- a/indexlib/boost-compat/config/posix_features.hpp
+++ b/indexlib/boost-compat/config/posix_features.h
diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.h
index cfaff2302..03259ae93 100644
--- a/indexlib/boost-compat/config/requires_threads.hpp
+++ b/indexlib/boost-compat/config/requires_threads.h
@@ -4,10 +4,10 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP
-#define BOOST_CONFIG_REQUIRES_THREADS_HPP
+#ifndef BOOST_CONFIG_REQUIRES_THREADS_H
+#define BOOST_CONFIG_REQUIRES_THREADS_H
 
-#ifndef BOOST_CONFIG_HPP
+#ifndef BOOST_CONFIG_H
 #  include <boost/config.hpp>
 #endif
 
@@ -89,4 +89,4 @@
 
 #endif // BOOST_HAS_THREADS
 
-#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP
+#endif // BOOST_CONFIG_REQUIRES_THREADS_H
diff --git a/indexlib/boost-compat/config/select_compiler_config.hpp b/indexlib/boost-compat/config/select_compiler_config.h
index 3453f1a35..3453f1a35 100644
--- a/indexlib/boost-compat/config/select_compiler_config.hpp
+++ b/indexlib/boost-compat/config/select_compiler_config.h
diff --git a/indexlib/boost-compat/config/select_platform_config.hpp b/indexlib/boost-compat/config/select_platform_config.h
index 5699b2a2a..5699b2a2a 100644
--- a/indexlib/boost-compat/config/select_platform_config.hpp
+++ b/indexlib/boost-compat/config/select_platform_config.h
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.h
index b7bf59143..b7bf59143 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.h
diff --git a/indexlib/boost-compat/config/stdlib/dinkumware.hpp b/indexlib/boost-compat/config/stdlib/dinkumware.h
index aa214fc1b..aa214fc1b 100644
--- a/indexlib/boost-compat/config/stdlib/dinkumware.hpp
+++ b/indexlib/boost-compat/config/stdlib/dinkumware.h
diff --git a/indexlib/boost-compat/config/stdlib/libcomo.hpp b/indexlib/boost-compat/config/stdlib/libcomo.h
index b2c8e4400..b2c8e4400 100644
--- a/indexlib/boost-compat/config/stdlib/libcomo.hpp
+++ b/indexlib/boost-compat/config/stdlib/libcomo.h
diff --git a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
index 9774e8761..99e711ce4 100644
--- a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp
+++ b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
@@ -45,7 +45,7 @@
 #if !defined(_GLIBCPP_USE_LONG_LONG) \
     && !defined(_GLIBCXX_USE_LONG_LONG)\
     && defined(BOOST_HAS_LONG_LONG)
-// May have been set by compiler/*.hpp, but "long long" without library
+// May have been set by compiler/*.h, but "long long" without library
 // support is useless.
 #  undef BOOST_HAS_LONG_LONG
 #endif
diff --git a/indexlib/boost-compat/config/stdlib/modena.hpp b/indexlib/boost-compat/config/stdlib/modena.h
index 61e31b7d1..61e31b7d1 100644
--- a/indexlib/boost-compat/config/stdlib/modena.hpp
+++ b/indexlib/boost-compat/config/stdlib/modena.h
diff --git a/indexlib/boost-compat/config/stdlib/msl.hpp b/indexlib/boost-compat/config/stdlib/msl.h
index f8ad3d9ad..f8ad3d9ad 100644
--- a/indexlib/boost-compat/config/stdlib/msl.hpp
+++ b/indexlib/boost-compat/config/stdlib/msl.h
diff --git a/indexlib/boost-compat/config/stdlib/roguewave.hpp b/indexlib/boost-compat/config/stdlib/roguewave.h
index ec3d881b5..ec3d881b5 100644
--- a/indexlib/boost-compat/config/stdlib/roguewave.hpp
+++ b/indexlib/boost-compat/config/stdlib/roguewave.h
diff --git a/indexlib/boost-compat/config/stdlib/sgi.hpp b/indexlib/boost-compat/config/stdlib/sgi.h
index 67f7a0a4b..67f7a0a4b 100644
--- a/indexlib/boost-compat/config/stdlib/sgi.hpp
+++ b/indexlib/boost-compat/config/stdlib/sgi.h
diff --git a/indexlib/boost-compat/config/stdlib/stlport.hpp b/indexlib/boost-compat/config/stdlib/stlport.h
index 4843ea59b..4843ea59b 100644
--- a/indexlib/boost-compat/config/stdlib/stlport.hpp
+++ b/indexlib/boost-compat/config/stdlib/stlport.h
diff --git a/indexlib/boost-compat/config/stdlib/vacpp.hpp b/indexlib/boost-compat/config/stdlib/vacpp.h
index 8321ee0cc..8321ee0cc 100644
--- a/indexlib/boost-compat/config/stdlib/vacpp.hpp
+++ b/indexlib/boost-compat/config/stdlib/vacpp.h
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.h
index 77d9decac..313faea9b 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.h
@@ -1,4 +1,4 @@
-//  Boost config.hpp configuration header file  ------------------------------//
+//  Boost config.h configuration header file  ------------------------------//
 
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Darin Adler 2001. 
@@ -14,15 +14,15 @@
 
 //  See http://www.boost.org for most recent version.
 
-//  Boost config.hpp policy and rationale documentation has been moved to
+//  Boost config.h policy and rationale documentation has been moved to
 //  http://www.boost.org/libs/config
 //
 //  This file is intended to be stable, and relatively unchanging.
 //  It should contain boilerplate code only - no compiler specific
 //  code unless it is unavoidable - no changes unless unavoidable.
 
-#ifndef BOOST_CONFIG_SUFFIX_HPP
-#define BOOST_CONFIG_SUFFIX_HPP
+#ifndef BOOST_CONFIG_SUFFIX_H
+#define BOOST_CONFIG_SUFFIX_H
 
 //
 // look for long long by looking for the appropriate macros in <limits.h>.
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.h
index 5a4a9d477..14b02c670 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.h
@@ -1,4 +1,4 @@
-//  boost/config/user.hpp  ---------------------------------------------------//
+//  boost/config/user.h  ---------------------------------------------------//
 
 //  (C) Copyright John Maddock 2001. 
 //  Use, modification and distribution are subject to the 
diff --git a/indexlib/boost-compat/intrusive_ptr.hpp b/indexlib/boost-compat/intrusive_ptr.h
index 7efbadeea..39b4b7b24 100644
--- a/indexlib/boost-compat/intrusive_ptr.hpp
+++ b/indexlib/boost-compat/intrusive_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED
-#define BOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED
+#define BOOST_INTRUSIVE_PTR_H_INCLUDED
 
 //
-//  intrusive_ptr.hpp
+//  intrusive_ptr.h
 //
 //  Copyright (c) 2001, 2002 Peter Dimov
 //
@@ -269,4 +269,4 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
 # pragma warning(pop)
 #endif    
 
-#endif  // #ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/next_prior.hpp b/indexlib/boost-compat/next_prior.h
index e1d2e4289..cdacf29c7 100644
--- a/indexlib/boost-compat/next_prior.hpp
+++ b/indexlib/boost-compat/next_prior.h
@@ -1,4 +1,4 @@
-//  Boost next_prior.hpp header file  ---------------------------------------//
+//  Boost next_prior.h header file  ---------------------------------------//
 
 //  (C) Copyright Dave Abrahams and Daniel Walker 1999-2003. Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
@@ -9,8 +9,8 @@
 //  Revision History
 //  13 Dec 2003  Added next(x, n) and prior(x, n) (Daniel Walker)
 
-#ifndef BOOST_NEXT_PRIOR_HPP_INCLUDED
-#define BOOST_NEXT_PRIOR_HPP_INCLUDED
+#ifndef BOOST_NEXT_PRIOR_H_INCLUDED
+#define BOOST_NEXT_PRIOR_H_INCLUDED
 
 #include <iterator>
 
@@ -48,4 +48,4 @@ inline T prior(T x, Distance n)
 
 } // namespace boost
 
-#endif  // BOOST_NEXT_PRIOR_HPP_INCLUDED
+#endif  // BOOST_NEXT_PRIOR_H_INCLUDED
diff --git a/indexlib/boost-compat/noncopyable.hpp b/indexlib/boost-compat/noncopyable.h
index 7770bdbd3..0d94ea6af 100644
--- a/indexlib/boost-compat/noncopyable.hpp
+++ b/indexlib/boost-compat/noncopyable.h
@@ -1,4 +1,4 @@
-//  Boost noncopyable.hpp header file  --------------------------------------//
+//  Boost noncopyable.h header file  --------------------------------------//
 
 //  (C) Copyright Beman Dawes 1999-2003. Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
@@ -6,8 +6,8 @@
 
 //  See http://www.boost.org/libs/utility for documentation.
 
-#ifndef BOOST_NONCOPYABLE_HPP_INCLUDED
-#define BOOST_NONCOPYABLE_HPP_INCLUDED
+#ifndef BOOST_NONCOPYABLE_H_INCLUDED
+#define BOOST_NONCOPYABLE_H_INCLUDED
 
 namespace boost {
 
@@ -33,4 +33,4 @@ typedef noncopyable_::noncopyable noncopyable;
 
 } // namespace boost
 
-#endif  // BOOST_NONCOPYABLE_HPP_INCLUDED
+#endif  // BOOST_NONCOPYABLE_H_INCLUDED
diff --git a/indexlib/boost-compat/remove_cv.hpp b/indexlib/boost-compat/remove_cv.h
index ec7c1a956..c59970a81 100644
--- a/indexlib/boost-compat/remove_cv.hpp
+++ b/indexlib/boost-compat/remove_cv.h
@@ -1,7 +1,7 @@
-#ifndef BOOST_TT_REMOVE_CV_HPP_INCLUDED
-#define BOOST_TT_REMOVE_CV_HPP_INCLUDED
-#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
-#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
+#ifndef BOOST_TT_REMOVE_CV_H_INCLUDED
+#define BOOST_TT_REMOVE_CV_H_INCLUDED
+#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED
+#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED
 // ADAPTED (TAKEN) FROM BOOST
 //
 //  (C) Copyright Dave Abrahams, Steve Cleary, Beman Dawes, Howard
diff --git a/indexlib/boost-compat/scoped_ptr.hpp b/indexlib/boost-compat/scoped_ptr.h
index 1260066ad..60078bf1a 100644
--- a/indexlib/boost-compat/scoped_ptr.hpp
+++ b/indexlib/boost-compat/scoped_ptr.h
@@ -1,5 +1,5 @@
-#ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
-#define BOOST_SCOPED_PTR_HPP_INCLUDED
+#ifndef BOOST_SCOPED_PTR_H_INCLUDED
+#define BOOST_SCOPED_PTR_H_INCLUDED
 
 // ADAPTED FOR indexlib
 
@@ -13,7 +13,7 @@
 //  http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
 //
 
-#include "checked_delete.hpp"
+#include "checked_delete.h"
 
 #include <memory>          // for std::auto_ptr
 #include <assert.h>
@@ -115,4 +115,4 @@ template<class T> inline T * get_pointer(scoped_ptr<T> const & p)
 
 } // namespace boost
 
-#endif // #ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
+#endif // #ifndef BOOST_SCOPED_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.h
index 0a3bf6d86..c236e3bd7 100644
--- a/indexlib/boost-compat/shared_ptr.hpp
+++ b/indexlib/boost-compat/shared_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#define BOOST_SHARED_PTR_HPP_INCLUDED
+#ifndef BOOST_SHARED_PTR_H_INCLUDED
+#define BOOST_SHARED_PTR_H_INCLUDED
 
 //
-//  shared_ptr.hpp
+//  shared_ptr.h
 //
 //  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
 //  Copyright (c) 2001, 2002, 2003 Peter Dimov
@@ -470,4 +470,4 @@ template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
 
 #endif  // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
 
-#endif  // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_SHARED_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/smart_ptr.hpp b/indexlib/boost-compat/smart_ptr.h
index c10de4572..578a48e4b 100644
--- a/indexlib/boost-compat/smart_ptr.hpp
+++ b/indexlib/boost-compat/smart_ptr.h
@@ -1,8 +1,8 @@
-#ifndef LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_
-#define LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_
+#ifndef LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_
+#define LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_
 
 //
-//  smart_ptr.hpp
+//  smart_ptr.h
 //
 //  For convenience, this header includes the rest of the smart
 //  pointer library headers.
@@ -28,4 +28,4 @@
 #endif
 
 
-#endif /* LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_ */
+#endif /* LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/static_assert.h b/indexlib/boost-compat/static_assert.h
new file mode 100644
index 000000000..1d020c9fd
--- /dev/null
+++ b/indexlib/boost-compat/static_assert.h
@@ -0,0 +1,11 @@
+#ifndef LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_
+#define LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_
+
+#ifdef HAVE_BOOST
+#include <boost/static_assert.hpp>
+#elif !defined( BOOST_STATIC_ASSERT )
+#define BOOST_STATIC_ASSERT( x )
+#endif
+
+
+#endif /* LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/static_assert.hpp b/indexlib/boost-compat/static_assert.hpp
deleted file mode 100644
index 76de9c49b..000000000
--- a/indexlib/boost-compat/static_assert.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_
-#define LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_
-
-#ifdef HAVE_BOOST
-#include <boost/static_assert.hpp>
-#elif !defined( BOOST_STATIC_ASSERT )
-#define BOOST_STATIC_ASSERT( x )
-#endif
-
-
-#endif /* LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.h
index c23850079..338e52213 100644
--- a/indexlib/boost-compat/weak_ptr.hpp
+++ b/indexlib/boost-compat/weak_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_WEAK_PTR_HPP_INCLUDED
-#define BOOST_WEAK_PTR_HPP_INCLUDED
+#ifndef BOOST_WEAK_PTR_H_INCLUDED
+#define BOOST_WEAK_PTR_H_INCLUDED
 
 //
-//  weak_ptr.hpp
+//  weak_ptr.h
 //
 //  Copyright (c) 2001, 2002, 2003 Peter Dimov
 //
@@ -189,4 +189,4 @@ template<class T> shared_ptr<T> make_shared(weak_ptr<T> const & r)
 # pragma warning(pop)
 #endif    
 
-#endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_WEAK_PTR_H_INCLUDED
diff --git a/indexlib/configure.in.in b/indexlib/configure.in.in
index 1f1a806a4..b66b049c3 100644
--- a/indexlib/configure.in.in
+++ b/indexlib/configure.in.in
@@ -19,4 +19,4 @@ if test "x$have_boost" = "xyes"; then
 	CXXFLAGS="-DHAVE_BOOST $CXXFLAGS"
 fi
 
-								
\ No newline at end of file
+								
diff --git a/indexlib/ifile.cpp b/indexlib/ifile.cpp
index b71297a0d..5709bb418 100644
--- a/indexlib/ifile.cpp
+++ b/indexlib/ifile.cpp
@@ -39,7 +39,7 @@
 #include <functional>
 #include <string.h>
 #include "format.h"
-#include "boost-compat/next_prior.hpp"
+#include "boost-compat/next_prior.h"
 
 
 ifile::ifile( std::string name ):
diff --git a/indexlib/index_slow.h b/indexlib/index_slow.h
index bbb4f7b7c..6f1dccedc 100644
--- a/indexlib/index_slow.h
+++ b/indexlib/index_slow.h
@@ -34,7 +34,7 @@
 
 #include "index.h"
 #include "slow.h"
-#include "boost-compat/noncopyable.hpp"
+#include "boost-compat/noncopyable.h"
 
 /**
  * \see class slow which should be merged into this one.
diff --git a/indexlib/leafdata.cpp b/indexlib/leafdata.cpp
index db61119af..c88821569 100644
--- a/indexlib/leafdata.cpp
+++ b/indexlib/leafdata.cpp
@@ -33,7 +33,7 @@
 #include "logfile.h"
 #include <iostream>
 #include <algorithm>
-#include "boost-compat/next_prior.hpp"
+#include "boost-compat/next_prior.h"
 #include "format.h"
 
 namespace {
diff --git a/indexlib/memvector.h b/indexlib/memvector.h
index 446fddf92..feb96268c 100644
--- a/indexlib/memvector.h
+++ b/indexlib/memvector.h
@@ -35,8 +35,8 @@
 #include "bitio.h"
 #include "compat.h"
 #include "manager.h"
-#include "boost-compat/static_assert.hpp"
-#include "boost-compat/scoped_ptr.hpp"
+#include "boost-compat/static_assert.h"
+#include "boost-compat/scoped_ptr.h"
 #ifdef HAVE_BOOST
 #include <boost/type_traits/is_convertible.hpp>
 #endif
diff --git a/indexlib/pointer.h b/indexlib/pointer.h
index 707219184..336ede764 100644
--- a/indexlib/pointer.h
+++ b/indexlib/pointer.h
@@ -34,7 +34,7 @@
 
 #include <inttypes.h>
 #include <iostream>
-#include "boost-compat/static_assert.hpp"
+#include "boost-compat/static_assert.h"
 #ifdef HAVE_BOOST
 #include <boost/type_traits.hpp>
 #endif
diff --git a/indexlib/stringarray.h b/indexlib/stringarray.h
index a928db311..6202036ce 100644
--- a/indexlib/stringarray.h
+++ b/indexlib/stringarray.h
@@ -34,7 +34,7 @@
 
 #include <iostream>
 #include <string>
-#include "boost-compat/scoped_ptr.hpp"
+#include "boost-compat/scoped_ptr.h"
 #include "manager.h"
 #include "memvector.h"
 
diff --git a/kaddressbook/xxport/pab_pablib.cpp b/kaddressbook/xxport/pab_pablib.cpp
index 344647f6f..bae854c29 100644
--- a/kaddressbook/xxport/pab_pablib.cpp
+++ b/kaddressbook/xxport/pab_pablib.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          pablib.cxx  -  description
+                          pablib.cpp  -  description
                              -------------------
     begin                : Tue Jul 4 2000
     copyright            : (C) 2000 by Hans Dijkema
diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h
index 910688cc5..f7cf7645e 100644
--- a/kaddressbook/xxport/pab_pablib.h
+++ b/kaddressbook/xxport/pab_pablib.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          pablib.hxx  -  description
+                          pablib.h  -  description
                              -------------------
     begin                : Tue Jul 4 2000
     copyright            : (C) 2000 by Hans Dijkema
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 
-#ifndef PAB_LIB_HXX
-#define PAB_LIB_HXX
+#ifndef PAB_LIB_H
+#define PAB_LIB_H
 
 #include <tdelocale.h>
 #include <tqfile.h>
diff --git a/karm/karm.tdevelop b/karm/karm.tdevelop
index e0436fba1..963fa7c43 100644
--- a/karm/karm.tdevelop
+++ b/karm/karm.tdevelop
@@ -17,7 +17,7 @@
   </general>
   <kdevfileview>
     <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.cpp;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
       <group pattern="*.png" name="Icons" />
       <group pattern="*.po;*.ts" name="Translations" />
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 35b72784b..43d15a51f 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -255,7 +255,7 @@ void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissi
 void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry )
 {
   // Don't allow spaces in userids. If you need this, fix the slave->app communication,
-  // since it uses space as a separator (imap4.cc, look for GETACL)
+  // since it uses space as a separator (imap4.cpp, look for GETACL)
   // It's ok in distribution list names though, that's why this check is only done here
   // and also why there's no validator on the lineedit.
   if ( entry.userId.contains( ' ' ) )
diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt
index 9a566690c..ac96928a8 100644
--- a/kmailcvt/CMakeLists.txt
+++ b/kmailcvt/CMakeLists.txt
@@ -38,12 +38,12 @@ install(
 tde_add_executable( kmailcvt AUTOMOC
   SOURCES
     kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui
-    kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp main.cpp
-    filter_pmail.cxx filter_plain.cxx filter_outlook.cxx filter_mbox.cxx
-    filter_evolution.cxx filter_mailapp.cxx filter_evolution_v2.cxx
-    filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx
-    filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx
-    filter_kmail_archive.cxx
+    kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp main.cpp
+    filter_pmail.cpp filter_plain.cpp filter_outlook.cpp filter_mbox.cpp
+    filter_evolution.cpp filter_mailapp.cpp filter_evolution_v2.cpp
+    filter_opera.cpp filter_thunderbird.cpp filter_kmail_maildir.cpp
+    filter_sylpheed.cpp filter_thebat.cpp filter_lnotes.cpp
+    filter_kmail_archive.cpp
   LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am
index 84777d75b..af5a8feb6 100644
--- a/kmailcvt/Makefile.am
+++ b/kmailcvt/Makefile.am
@@ -1,32 +1,32 @@
 
 bin_PROGRAMS = kmailcvt
 kmailcvt_SOURCES = kimportpagedlg.ui kimportpage.cpp kselfilterpagedlg.ui \
-                   kselfilterpage.cpp filters.cxx filter_oe.cxx kmailcvt.cpp \
-                   main.cpp filter_pmail.cxx filter_plain.cxx filter_outlook.cxx \
-                   filter_mbox.cxx filter_evolution.cxx filter_mailapp.cxx \
-                   filter_evolution_v2.cxx filter_opera.cxx filter_thunderbird.cxx \
-                   filter_kmail_maildir.cxx filter_sylpheed.cxx filter_thebat.cxx \
-                   filter_lnotes.cxx filter_kmail_archive.cxx
+                   kselfilterpage.cpp filters.cpp filter_oe.cpp kmailcvt.cpp \
+                   main.cpp filter_pmail.cpp filter_plain.cpp filter_outlook.cpp \
+                   filter_mbox.cpp filter_evolution.cpp filter_mailapp.cpp \
+                   filter_evolution_v2.cpp filter_opera.cpp filter_thunderbird.cpp \
+                   filter_kmail_maildir.cpp filter_sylpheed.cpp filter_thebat.cpp \
+                   filter_lnotes.cpp filter_kmail_archive.cpp
                 
 kmailcvt_LDADD   = $(LIB_TDEFILE)
 
 EXTRA_DIST = main.cpp kmailcvt.cpp kimportpage.cpp kimportpage.h \
              kselfilterpage.cpp kselfilterpage.h kmailcvt.h \
-             kmailcvt.desktop filter_oe.cxx filter_oe.hxx \
-             filters.cxx filters.hxx \
+             kmailcvt.desktop filter_oe.cpp filter_oe.h \
+             filters.cpp filters.h \
              PAB_format.html sv9429424.gif \
-             filter_pmail.cxx filter_pmail.hxx \
-             filter_plain.cxx filter_plain.hxx \
-             filter_mbox.cxx filter_mbox.hxx \
-             filter_evolution.cxx filter_evolution.hxx \
-             filter_mailapp.hxx filter_mailapp.cxx \
-             filter_opera.hxx filter_opera.cxx \
-             filter_evolution_v2.hxx filter_evolution_v2.cxx \
-             filter_thunderbird.hxx filter_thunderbird.cxx \
-             filter_kmail_maildir.hxx filter_kmail_maildir.cxx \
-             filter_sylpheed.hxx filter_sylpheed.cxx \
-             filter_thebat.hxx filter_thebat.cxx filter_lnotes.hxx filter_lnotes.cxx \
-             filter_kmail_archive.cxx fitler_kmail_archive.hxx
+             filter_pmail.cpp filter_pmail.h \
+             filter_plain.cpp filter_plain.h \
+             filter_mbox.cpp filter_mbox.h \
+             filter_evolution.cpp filter_evolution.h \
+             filter_mailapp.h filter_mailapp.cpp \
+             filter_opera.h filter_opera.cpp \
+             filter_evolution_v2.h filter_evolution_v2.cpp \
+             filter_thunderbird.h filter_thunderbird.cpp \
+             filter_kmail_maildir.h filter_kmail_maildir.cpp \
+             filter_sylpheed.h filter_sylpheed.cpp \
+             filter_thebat.h filter_thebat.cpp filter_lnotes.h filter_lnotes.cpp \
+             filter_kmail_archive.cpp fitler_kmail_archive.h
 
 install-data-local: uninstall.desktop
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Utilities
@@ -45,7 +45,7 @@ kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE
 KDE_ICON=AUTO
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kmailcvt.pot; \
 	fi
diff --git a/kmailcvt/README b/kmailcvt/README
index d8322ed49..d1105fe45 100644
--- a/kmailcvt/README
+++ b/kmailcvt/README
@@ -7,9 +7,9 @@ with KMail via its DCOP interface to add messages.
 Writing a filter
 ----------------
 
-...is very easy. Create two files filter_myformat.cxx and filter_myformat.hxx
-and add "filter_myformat.cxx" to the end of the kmailcvt_SOURCES line in
-Makefile.am and "filter_myformat.cxx filter_myformat.hxx" to the end of the
+...is very easy. Create two files filter_myformat.cpp and filter_myformat.h
+and add "filter_myformat.cpp" to the end of the kmailcvt_SOURCES line in
+Makefile.am and "filter_myformat.cpp filter_myformat.h" to the end of the
 EXTRA_DIST line in Makefile.am. Now run "make -f Makefile.cvs; ./configure" in
 your tdepim source directory.
 
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cpp
index b4443d143..a372058e3 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cpp
@@ -1,5 +1,5 @@
 /*
- *  filter_evolution.cxx
+ *  filter_evolution.cpp
  *  Author : Simon MARTIN <simartin@users.sourceforge.net>
  *  Copyright (c) 2004 Simon MARTIN
  *
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "filter_evolution.hxx"
+#include "filter_evolution.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_evolution.hxx b/kmailcvt/filter_evolution.h
index 1aa5184f1..83fb41554 100644
--- a/kmailcvt/filter_evolution.hxx
+++ b/kmailcvt/filter_evolution.h
@@ -1,5 +1,5 @@
 /*
- *  filter_evolution.hxx
+ *  filter_evolution.h
  *  Author : Simon MARTIN <simartin@users.sourceforge.net>
  *  Copyright (c) 2004 Simon MARTIN
  *
@@ -18,10 +18,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef FILTER_EVOLUTION_HXX
-#define FILTER_EVOLUTION_HXX
+#ifndef FILTER_EVOLUTION_H
+#define FILTER_EVOLUTION_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Evolution mboxes recursively, keeping the folder structure.
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cpp
index b6ee8a577..a4c6203c9 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_evolution_v2.cxx  -  Evolution 2.0.x mail import
+            filter_evolution_v2.cpp  -  Evolution 2.0.x mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_evolution_v2.hxx"
+#include "filter_evolution_v2.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_evolution_v2.hxx b/kmailcvt/filter_evolution_v2.h
index da58b4fe2..2c93bba8e 100644
--- a/kmailcvt/filter_evolution_v2.hxx
+++ b/kmailcvt/filter_evolution_v2.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_evolution_v2.hxx  -  Evolution 2.0.x mail import
+            filter_evolution_v2.h  -  Evolution 2.0.x mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -16,10 +16,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_EVOLUTION_V2_HXX
-#define FILTER_EVOLUTION_V2_HXX
+#ifndef FILTER_EVOLUTION_V2_H
+#define FILTER_EVOLUTION_V2_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Evolution v2.x mail folder recursively, keeping the folder structure.
diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cpp
index 3c7c20d00..49325d2a8 100644
--- a/kmailcvt/filter_kmail_archive.cxx
+++ b/kmailcvt/filter_kmail_archive.cpp
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "filter_kmail_archive.hxx"
+#include "filter_kmail_archive.h"
 
 #include <tdelocale.h>
 
diff --git a/kmailcvt/filter_kmail_archive.hxx b/kmailcvt/filter_kmail_archive.h
index 755d3cc28..a1f749256 100644
--- a/kmailcvt/filter_kmail_archive.hxx
+++ b/kmailcvt/filter_kmail_archive.h
@@ -16,10 +16,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef FILTER_KMAIL_ARCHIVE_HXX
-#define FILTER_KMAIL_ARCHIVE_HXX
+#ifndef FILTER_KMAIL_ARCHIVE_H
+#define FILTER_KMAIL_ARCHIVE_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 class FilterKMailArchive : public Filter
 {
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cpp
index 9d642814d..f24ef7aff 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-           filter_kmail_maildir.cxx  -  Kmail maildir mail import
+           filter_kmail_maildir.cpp  -  Kmail maildir mail import
                             -------------------
    begin                : April 06 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_kmail_maildir.hxx"
+#include "filter_kmail_maildir.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_kmail_maildir.hxx b/kmailcvt/filter_kmail_maildir.h
index 66f444907..f0d8c6ac6 100644
--- a/kmailcvt/filter_kmail_maildir.hxx
+++ b/kmailcvt/filter_kmail_maildir.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_kmail_maildir.hxx  -  Kmail maildir mail import
+            filter_kmail_maildir.h  -  Kmail maildir mail import
                              -------------------
     begin                : April 06 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,10 +14,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_KMAIL_MAILDIR_HXX
-#define FILTER_KMAIL_MAILDIR_HXX
+#ifndef FILTER_KMAIL_MAILDIR_H
+#define FILTER_KMAIL_MAILDIR_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports KMail mail folder with maildir format recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cpp
index af92e1b41..7733c1c14 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-             filter_lnotes.cxx  -  Lotus Notes Structured Text mail import
+             filter_lnotes.cpp  -  Lotus Notes Structured Text mail import
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <tqfileinfo.h>
 
-#include "filter_lnotes.hxx"
+#include "filter_lnotes.h"
 
 /** Default constructor. */
 FilterLNotes::FilterLNotes() :
@@ -57,7 +57,7 @@ void FilterLNotes::import(FilterInfo *info) {
     totalFiles = filenames.count();
     inf->setOverall(0);
 
-    // See filter_mbox.cxx for better reference.
+    // See filter_mbox.cpp for better reference.
     for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename ) {
 
         ++currentFile;
@@ -75,7 +75,7 @@ void FilterLNotes::import(FilterInfo *info) {
  */
 void FilterLNotes::ImportLNotes(const TQString& file) {
 
-    // See Filter_pmail.cxx for better reference
+    // See Filter_pmail.cpp for better reference
 
     // Format of a Lotus Notes 5 Structured Text Document w form feed
     // Each email begins with a custom Header Principal:
diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.h
index 430ae83e8..bf5cd91c4 100644
--- a/kmailcvt/filter_lnotes.hxx
+++ b/kmailcvt/filter_lnotes.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_lnotes.hxx  -  Lotus Notes Structured Text mail import
+                          filter_lnotes.h  -  Lotus Notes Structured Text mail import
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_LNOTES_HXX
-#define FILTER_LNOTES_HXX
+#ifndef FILTER_LNOTES_H
+#define FILTER_LNOTES_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**imports Lotus Notes Structured Text Archives and archvies messages into KMail
  *@author Robert Rockers
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cpp
index fded411da..1da632ec6 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mailapp.cxx  -  OS X Mail App import
+                          filter_mailapp.cpp  -  OS X Mail App import
                              -------------------
     copyright            : (C) 2004 by Chris Howells
     email                : howells@kde.org
@@ -26,7 +26,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_mailapp.hxx"
+#include "filter_mailapp.h"
 
 FilterMailApp::FilterMailApp() :
         Filter( i18n("Import From OS X Mail"),
diff --git a/kmailcvt/filter_mailapp.hxx b/kmailcvt/filter_mailapp.h
index 571f77ff0..e562dbf7b 100644
--- a/kmailcvt/filter_mailapp.hxx
+++ b/kmailcvt/filter_mailapp.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mailapp.hxx  -  OS X Mail App import
+                          filter_mailapp.h  -  OS X Mail App import
                              -------------------
     copyright            : (C) 2004 by Chris Howells
     email                : howells@kde.org
@@ -10,10 +10,10 @@
  
  ***************************************************************************/
 
-#ifndef FILTER_MAILAPP_HXX
-#define FILTER_MAILAPP_HXX
+#ifndef FILTER_MAILAPP_H
+#define FILTER_MAILAPP_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports mbox archives messages into KMail
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cpp
index 19afccf22..c5f87e515 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mbox.cxx  -  mbox mail import
+                          filter_mbox.cpp  -  mbox mail import
                              -------------------
     begin                : Sat Apr 5 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -21,7 +21,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_mbox.hxx"
+#include "filter_mbox.h"
 
 
 FilterMBox::FilterMBox() :
diff --git a/kmailcvt/filter_mbox.hxx b/kmailcvt/filter_mbox.h
index e1c5e9672..f1f376de3 100644
--- a/kmailcvt/filter_mbox.hxx
+++ b/kmailcvt/filter_mbox.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_mbox.hxx  -  mbox mail import
+                          filter_mbox.h  -  mbox mail import
                              -------------------
     begin                : Sat Apr 5 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_MBOX_HXX
-#define FILTER_MBOX_HXX
+#ifndef FILTER_MBOX_H
+#define FILTER_MBOX_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * imports mbox archives messages into KMail
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cpp
index afd96527b..47002d969 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_oe.cxx  -  Outlook Express mail import
+                          filter_oe.cpp  -  Outlook Express mail import
                              -------------------
     begin                : Sat Feb 1 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -25,7 +25,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_oe.hxx"
+#include "filter_oe.h"
 
 #define OE4_SIG_1 0x36464d4a
 #define OE4_SIG_2 0x00010003
diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.h
index 821aa5dfa..2a46854f2 100644
--- a/kmailcvt/filter_oe.hxx
+++ b/kmailcvt/filter_oe.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filter_oe.hxx  -  Outlook Express mail import
+                          filter_oe.h  -  Outlook Express mail import
                              -------------------
     begin                : Sat Feb 1 2003
     copyright            : (C) 2003 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OE_HXX
-#define FILTER_OE_HXX
+#ifndef FILTER_OE_H
+#define FILTER_OE_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports outlook text messages into KMail
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cpp
index 90aef3820..ff5376957 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.cxx  -  Opera mail import
+                  filter_opera.cpp  -  Opera mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -21,7 +21,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_opera.hxx"
+#include "filter_opera.h"
 
 
 FilterOpera::FilterOpera() :
diff --git a/kmailcvt/filter_opera.hxx b/kmailcvt/filter_opera.h
index 27ded4ccd..7da80afa9 100644
--- a/kmailcvt/filter_opera.hxx
+++ b/kmailcvt/filter_opera.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.hxx  -  Opera mail import
+                  filter_opera.h  -  Opera mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OPERA_HXX
-#define FILTER_OPERA_HXX
+#ifndef FILTER_OPERA_H
+#define FILTER_OPERA_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports opera account-archives into KMail
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cpp
index 10483d090..bb3959181 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.cxx  -  Outlook mail import
+                  filter_opera.cpp  -  Outlook mail import
                              -------------------
     begin                : February 01  2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -22,7 +22,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_outlook.hxx"
+#include "filter_outlook.h"
 
 FilterOutlook::FilterOutlook() :
         Filter( i18n("Import Outlook Emails"),
diff --git a/kmailcvt/filter_outlook.hxx b/kmailcvt/filter_outlook.h
index bad7d5ee1..ec7620663 100644
--- a/kmailcvt/filter_outlook.hxx
+++ b/kmailcvt/filter_outlook.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                  filter_opera.hxx  -  Outlook mail import
+                  filter_opera.h  -  Outlook mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_OUTLOOK_HXX
-#define FILTER_OUTLOOK_HXX
+#ifndef FILTER_OUTLOOK_H
+#define FILTER_OUTLOOK_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * imports mails from Outlook pst-files into KMail
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cpp
index 9f78b939c..01554c87f 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPlain.cxx  -  Plain mail import
+                          FilterPlain.cpp  -  Plain mail import
                              -------------------
     begin                : Fri Jun 14 2002
     copyright            : (C) 2002 by Laurence Anderson
@@ -20,7 +20,7 @@
 #include <tdefiledialog.h>
 #include <libgen.h>
 
-#include "filter_plain.hxx"
+#include "filter_plain.h"
 
 
 FilterPlain::FilterPlain() :
diff --git a/kmailcvt/filter_plain.hxx b/kmailcvt/filter_plain.h
index ddd9d494f..2319e8887 100644
--- a/kmailcvt/filter_plain.hxx
+++ b/kmailcvt/filter_plain.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPlain.hxx  -  Plain mail import
+                          FilterPlain.h  -  Plain mail import
                              -------------------
     begin                : Fri Jun 24 2002
     copyright            : (C) 2002 by Laurence Anderson
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_PLAIN_HXX
-#define FILTER_PLAIN_HXX
+#ifndef FILTER_PLAIN_H
+#define FILTER_PLAIN_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  *imports Plain text messages into KMail
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cpp
index e48e062de..b45a0be41 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPMail.cxx  -  Pegasus-Mail import
+                          FilterPMail.cpp  -  Pegasus-Mail import
                              -------------------
     begin                : Sat Jan 6 2001
     copyright            : (C) 2001 by Holger Schurig
@@ -24,7 +24,7 @@
 #include <tdetempfile.h>
 #include <kdebug.h>
 
-#include "filter_pmail.hxx"
+#include "filter_pmail.h"
 
 
 FilterPMail::FilterPMail() :
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.h
index 664fdcc1b..07f62a36b 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          FilterPMail.hxx  -  Pegasus-Mail import
+                          FilterPMail.h  -  Pegasus-Mail import
                              -------------------
     begin                : Sat Jan 6 2001
     copyright            : (C) 2001 by Holger Schurig
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_PMAIL_HXX
-#define FILTER_PMAIL_HXX
+#ifndef FILTER_PMAIL_H
+#define FILTER_PMAIL_H
 
 #include <tqdir.h>
 #include <tqvaluelist.h>
 
-#include "filters.hxx"
+#include "filters.h"
 
 class FilterPMail : public Filter
 {
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cpp
index 1fc008d42..e8f4a66a7 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_sylpheed.hxx  -  Sylpheed maildir mail import
+            filter_sylpheed.h  -  Sylpheed maildir mail import
                              -------------------
     begin                : April 07 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_sylpheed.hxx"
+#include "filter_sylpheed.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_sylpheed.hxx b/kmailcvt/filter_sylpheed.h
index fcc3af851..1d92adf01 100644
--- a/kmailcvt/filter_sylpheed.hxx
+++ b/kmailcvt/filter_sylpheed.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_sylpheed.hxx  -  Sylpheed maildir mail import
+            filter_sylpheed.h  -  Sylpheed maildir mail import
                              -------------------
     begin                : April 07 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,12 +14,12 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_SYLPHEED_HXX
-#define FILTER_SYLPHEED_HXX
+#ifndef FILTER_SYLPHEED_H
+#define FILTER_SYLPHEED_H
 
 #include <tqdict.h>
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Sylpheed mail folder with maildir format recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cpp
index eaf16461a..a255f352c 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thebat.hxx  -  TheBat! mail import
+            filter_thebat.h  -  TheBat! mail import
                              -------------------
     begin                : April 07 2005
    copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_thebat.hxx"
+#include "filter_thebat.h"
 
 #include <config.h>
 
diff --git a/kmailcvt/filter_thebat.hxx b/kmailcvt/filter_thebat.h
index 7d62018d4..ef69c2314 100644
--- a/kmailcvt/filter_thebat.hxx
+++ b/kmailcvt/filter_thebat.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thebat.hxx  -  TheBat! mail import
+            filter_thebat.h  -  TheBat! mail import
                              -------------------
     begin                : April 07 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -14,10 +14,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#ifndef FILTER_THEBAT_HXX
-#define FILTER_THEBAT_HXX
+#ifndef FILTER_THEBAT_H
+#define FILTER_THEBAT_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports The Bat! mail folder recursively, recreating the folder structure.
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cpp
index 50f6355f3..e5f21d148 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thunderbird.cxx  -  Thunderbird mail import
+            filter_thunderbird.cpp  -  Thunderbird mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "filter_thunderbird.hxx"
+#include "filter_thunderbird.h"
 
 #include <config.h>
 #include <tdelocale.h>
diff --git a/kmailcvt/filter_thunderbird.hxx b/kmailcvt/filter_thunderbird.h
index d3bcd7f96..333e2380f 100644
--- a/kmailcvt/filter_thunderbird.hxx
+++ b/kmailcvt/filter_thunderbird.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-            filter_thunderbird.hxx  -  Thunderbird mail import
+            filter_thunderbird.h  -  Thunderbird mail import
                              -------------------
     begin                : Januar 26 2005
     copyright            : (C) 2005 by Danny Kukawka
@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTER_THUNDERBIRD_HXX
-#define FILTER_THUNDERBIRD_HXX
+#ifndef FILTER_THUNDERBIRD_H
+#define FILTER_THUNDERBIRD_H
 
-#include "filters.hxx"
+#include "filters.h"
 
 /**
  * Imports Thinderbird mail folder recursively, keeping the folder structure.
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cpp
index 6aeb4fdea..2c43ff435 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filters.cxx  -  description
+                          filters.cpp  -  description
                              -------------------
     begin                : Fri Jun 30 2000
     copyright            : (C) 2000 by Hans Dijkema
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include "filters.hxx"
+#include "filters.h"
 #include "kmailcvt.h"
 
 
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.h
index d6c33f422..f9261bcb8 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filters.hxx  -  description
+                          filters.h  -  description
                              -------------------
     begin                : Fri Jun 30 2000
     copyright            : (C) 2000 by Hans Dijkema
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef FILTERS_HXX
-#define FILTERS_HXX
+#ifndef FILTERS_H
+#define FILTERS_H
 
 #ifndef MAX_LINE
 #define MAX_LINE 4096
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index d34e0641d..39ba423e9 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -20,7 +20,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
-#include "filters.hxx"
+#include "filters.h"
 
 KMailCVT::KMailCVT(TQWidget *parent, const char *name)
 	: KWizard(parent, name, true) {
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index 7d97fcfd9..118124f77 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -19,23 +19,23 @@
 #include <tqtextedit.h>
 #include <tqcheckbox.h> 
 #include <tdelocale.h>
-#include "filters.hxx"
+#include "filters.h"
 
-#include "filter_mbox.hxx"
-#include "filter_oe.hxx"
-#include "filter_outlook.hxx"
-#include "filter_pmail.hxx"
-#include "filter_plain.hxx"
-#include "filter_evolution.hxx"
-#include "filter_mailapp.hxx"
-#include "filter_evolution_v2.hxx"
-#include "filter_opera.hxx"
-#include "filter_thunderbird.hxx"
-#include "filter_kmail_maildir.hxx"
-#include "filter_kmail_archive.hxx"
-#include "filter_sylpheed.hxx"
-#include "filter_thebat.hxx"
-#include "filter_lnotes.hxx"
+#include "filter_mbox.h"
+#include "filter_oe.h"
+#include "filter_outlook.h"
+#include "filter_pmail.h"
+#include "filter_plain.h"
+#include "filter_evolution.h"
+#include "filter_mailapp.h"
+#include "filter_evolution_v2.h"
+#include "filter_opera.h"
+#include "filter_thunderbird.h"
+#include "filter_kmail_maildir.h"
+#include "filter_kmail_archive.h"
+#include "filter_sylpheed.h"
+#include "filter_thebat.h"
+#include "filter_lnotes.h"
 
 #include "kselfilterpage.h"
 
diff --git a/kode/kwsdl/creator.cpp b/kode/kwsdl/creator.cpp
index e31808ad0..4564c365e 100644
--- a/kode/kwsdl/creator.cpp
+++ b/kode/kwsdl/creator.cpp
@@ -58,7 +58,7 @@ void Creator::create( const KODE::Class::List &list )
   }
 
   KODE::AutoMakefile::Target libTarget( "bin_PROGRAMS", "kwsdl" );
-  libTarget.setSources( "main.cc " + cppFiles.join( " " ) );
+  libTarget.setSources( "main.cpp " + cppFiles.join( " " ) );
   libTarget.setLdFlags( "$(all_libraries) $(KDE_RPATH)" );
   libTarget.setLdAdd( "-ltdecore -ltdeio" );
 
diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am
index 9dd839c54..66da11c36 100644
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = googletest
 
-googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
+googletest_SOURCES = main.cpp googlesearch.cpp transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
 googletest_LDADD = -ltdecore -ltdeio
 googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/kode/kwsdl/tests/google/README b/kode/kwsdl/tests/google/README
index cfe831598..46ef2ff09 100644
--- a/kode/kwsdl/tests/google/README
+++ b/kode/kwsdl/tests/google/README
@@ -1,7 +1,7 @@
 This application shows how easy it is to use a web service with
 code, generated by kwsdl_compiler.
 
-Only the files main.cc, googlesearch.cc and googlesearch.hh are
+Only the files main.cpp, googlesearch.cpp and googlesearch.h are
 written manually, all other files were created by
 
   kwsdl_compiler -d kwsdl/tests/google/ GoogleSearch.wsdl
diff --git a/kode/kwsdl/tests/google/googlesearch.cc b/kode/kwsdl/tests/google/googlesearch.cpp
index 690b9a11d..fcea9d75e 100644
--- a/kode/kwsdl/tests/google/googlesearch.cc
+++ b/kode/kwsdl/tests/google/googlesearch.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include "googlesearch.hh"
+#include "googlesearch.h"
 #include "resultelement.h"
 #include "resultelementarray.h"
 
diff --git a/kode/kwsdl/tests/google/googlesearch.hh b/kode/kwsdl/tests/google/googlesearch.h
index b64006161..b64006161 100644
--- a/kode/kwsdl/tests/google/googlesearch.hh
+++ b/kode/kwsdl/tests/google/googlesearch.h
diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cpp
index 38c645940..130a9cc6a 100644
--- a/kode/kwsdl/tests/google/main.cc
+++ b/kode/kwsdl/tests/google/main.cpp
@@ -3,7 +3,7 @@
 #include <tdecmdlineargs.h>
 #include <kmdcodec.h>
 
-#include "googlesearch.hh"
+#include "googlesearch.h"
 
 int main( int argc, char **argv )
 {
diff --git a/mimelib/Changes b/mimelib/Changes
index ce961cce5..4f1d7467c 100644
--- a/mimelib/Changes
+++ b/mimelib/Changes
@@ -97,7 +97,7 @@ o Added utility functions for doing end-of-line marker conversions:
 
 Jan 25, 1997
 
-o Parsers for entities (entity.cc) and bodies (body.cc) changed to handle
+o Parsers for entities (entity.cpp) and bodies (body.cpp) changed to handle
   CR LF end-of-line (DOS and MIME) in addition to LF end-of-line (UNIX
   and C).
 
@@ -169,7 +169,7 @@ o Added member function CreateFieldBody() to DwField.
 
 o Improvements to the wrapper classes used in the examples.
 
-o New wrapper class MessageWithAttachments, used in Example 5 (exampl05.cc).
+o New wrapper class MessageWithAttachments, used in Example 5 (exampl05.cpp).
 
 o The documentation now includes a tutorial.
 
diff --git a/tdefile-plugins/palm-databases/tdefile_palm.cpp b/tdefile-plugins/palm-databases/tdefile_palm.cpp
index e995b1368..e0a4db029 100644
--- a/tdefile-plugins/palm-databases/tdefile_palm.cpp
+++ b/tdefile-plugins/palm-databases/tdefile_palm.cpp
@@ -115,7 +115,7 @@ bool KPalmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
 {
 //    int pi_file_set_info((struct pi_file * pf, struct DBInfo * infop));
 //info["tuteTextTechnical"].value("An integer").toInt()
-//  Do the stuff with low-level functions. See lines 1119-1142 of pi-file.cc for writing, 244-273 for reading.
+//  Do the stuff with low-level functions. See lines 1119-1142 of pi-file.cpp for writing, 244-273 for reading.
 }*/
 
 #include "tdefile_palm.moc"
diff --git a/tdeioslave/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt
index 6316fe32f..041aeffca 100644
--- a/tdeioslave/imap4/CMakeLists.txt
+++ b/tdeioslave/imap4/CMakeLists.txt
@@ -38,9 +38,9 @@ tde_create_translated_desktop(
 
 tde_add_kpart( tdeio_imap4
   SOURCES
-    imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc
-    rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc
-    mailheader.cc mimehdrline.cc  mimeio.cc
+    imapcommand.cpp imaplist.cpp mailaddress.cpp mimeheader.cpp
+    rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp
+    mailheader.cpp mimehdrline.cpp  mimeio.cpp
   LINK emailfunctions-static kmime-shared tdeio-shared ${SASL_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/imap4/Makefile.am b/tdeioslave/imap4/Makefile.am
index f52af2c62..34497bf66 100644
--- a/tdeioslave/imap4/Makefile.am
+++ b/tdeioslave/imap4/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(top_srcdir)/libkmime \
 
 kde_module_LTLIBRARIES = tdeio_imap4.la
 
-tdeio_imap4_la_SOURCES = 	imapcommand.cc imaplist.cc mailaddress.cc \
-  mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \
-  mimehdrline.cc  mimeio.cc
+tdeio_imap4_la_SOURCES = 	imapcommand.cpp imaplist.cpp mailaddress.cpp \
+  mimeheader.cpp rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp mailheader.cpp \
+  mimehdrline.cpp  mimeio.cpp
 tdeio_imap4_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \
   ../../libemailfunctions/libemailfunctions.la
 tdeio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
@@ -21,6 +21,6 @@ kdelnk_DATA = imap4.protocol imaps.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_imap4.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_imap4.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeioslave/imap4/imap4.cc b/tdeioslave/imap4/imap4.cpp
index 7dea2c5de..280cbde70 100644
--- a/tdeioslave/imap4/imap4.cc
+++ b/tdeioslave/imap4/imap4.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imap4.cc  - IMAP4rev1 KIOSlave
+ *   imap4.cpp  - IMAP4rev1 KIOSlave
  *   Copyright (C) 2001-2002  Michael Haeckel <haeckel@kde.org>
  *   Copyright (C) 1999  John Corey <jcorey@fruity.ath.cx>
  *
diff --git a/tdeioslave/imap4/imapcommand.cc b/tdeioslave/imap4/imapcommand.cpp
index e3e68fa8b..97d0a91c6 100644
--- a/tdeioslave/imap4/imapcommand.cc
+++ b/tdeioslave/imap4/imapcommand.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapcommand.cc  - IMAP4rev1 command handler
+ *   imapcommand.cpp  - IMAP4rev1 command handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/imapinfo.cc b/tdeioslave/imap4/imapinfo.cpp
index 3e21ee772..453808e71 100644
--- a/tdeioslave/imap4/imapinfo.cc
+++ b/tdeioslave/imap4/imapinfo.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapinfo.cc  - IMAP4rev1 SELECT / EXAMINE handler
+ *   imapinfo.cpp  - IMAP4rev1 SELECT / EXAMINE handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/imaplist.cc b/tdeioslave/imap4/imaplist.cpp
index f9113bdab..51062c474 100644
--- a/tdeioslave/imap4/imaplist.cc
+++ b/tdeioslave/imap4/imaplist.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapinfo.cc  - IMAP4rev1 EXAMINE / SELECT handler
+ *   imapinfo.cpp  - IMAP4rev1 EXAMINE / SELECT handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/imapparser.cc b/tdeioslave/imap4/imapparser.cpp
index eb154cc5d..d833b639e 100644
--- a/tdeioslave/imap4/imapparser.cc
+++ b/tdeioslave/imap4/imapparser.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapparser.cc  - IMAP4rev1 Parser
+ *   imapparser.cpp  - IMAP4rev1 Parser
  *   Copyright (C) 2001-2002 Michael Haeckel <haeckel@kde.org>
  *   Copyright (C) 2000 s.carstens@gmx.de
  *
diff --git a/tdeioslave/imap4/mailaddress.cc b/tdeioslave/imap4/mailaddress.cpp
index 38a1a330a..8bb5831ec 100644
--- a/tdeioslave/imap4/mailaddress.cc
+++ b/tdeioslave/imap4/mailaddress.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   mailaddress.cc  - mail address parser
+ *   mailaddress.cpp  - mail address parser
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/mailheader.cc b/tdeioslave/imap4/mailheader.cpp
index c520b9094..28eec1f02 100644
--- a/tdeioslave/imap4/mailheader.cc
+++ b/tdeioslave/imap4/mailheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mailheader.cc  -  description
+                          mailheader.cpp  -  description
                              -------------------
     begin                : Tue Oct 24 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/mimehdrline.cc b/tdeioslave/imap4/mimehdrline.cpp
index 9646ed26f..591d33863 100644
--- a/tdeioslave/imap4/mimehdrline.cc
+++ b/tdeioslave/imap4/mimehdrline.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimehdrline.cc  -  description
+                          mimehdrline.cpp  -  description
                              -------------------
     begin                : Wed Oct 11 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/mimeheader.cc b/tdeioslave/imap4/mimeheader.cpp
index d0916ba50..d9d2c7d24 100644
--- a/tdeioslave/imap4/mimeheader.cc
+++ b/tdeioslave/imap4/mimeheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimeheader.cc  -  description
+                          mimeheader.cpp  -  description
                              -------------------
     begin                : Fri Oct 20 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/mimeio.cc b/tdeioslave/imap4/mimeio.cpp
index 757c11a47..a3315c268 100644
--- a/tdeioslave/imap4/mimeio.cc
+++ b/tdeioslave/imap4/mimeio.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimeio.cc  -  description
+                          mimeio.cpp  -  description
                              -------------------
     begin                : Wed Oct 25 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/rfcdecoder.cc b/tdeioslave/imap4/rfcdecoder.cpp
index 41a50ec10..36111bf1f 100644
--- a/tdeioslave/imap4/rfcdecoder.cc
+++ b/tdeioslave/imap4/rfcdecoder.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   rfcdecoder.cc  - handler for various rfc/mime encodings
+ *   rfcdecoder.cpp  - handler for various rfc/mime encodings
  *   Copyright (C) 2000 s.carstens@gmx.de
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt
index 70da626f9..27e51538a 100644
--- a/tdeioslave/mbox/CMakeLists.txt
+++ b/tdeioslave/mbox/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 
 tde_add_kpart( tdeio_mbox
   SOURCES
-    mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc
+    mbox.cpp mboxfile.cpp readmbox.cpp stat.cpp urlinfo.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am
index b95ae1b5e..b890ebf34 100644
--- a/tdeioslave/mbox/Makefile.am
+++ b/tdeioslave/mbox/Makefile.am
@@ -7,11 +7,11 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdeio_mbox.la
 
 tdeio_mbox_la_SOURCES = \
-	mbox.cc \
-	mboxfile.cc \
-	readmbox.cc \
-	stat.cc \
-	urlinfo.cc
+	mbox.cpp \
+	mboxfile.cpp \
+	readmbox.cpp \
+	stat.cpp \
+	urlinfo.cpp
 tdeio_mbox_la_LIBADD  = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
 tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
diff --git a/tdeioslave/mbox/mbox.cc b/tdeioslave/mbox/mbox.cpp
index 5742baffd..5742baffd 100644
--- a/tdeioslave/mbox/mbox.cc
+++ b/tdeioslave/mbox/mbox.cpp
diff --git a/tdeioslave/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cpp
index 7297457ef..7297457ef 100644
--- a/tdeioslave/mbox/mboxfile.cc
+++ b/tdeioslave/mbox/mboxfile.cpp
diff --git a/tdeioslave/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cpp
index 942f369e5..942f369e5 100644
--- a/tdeioslave/mbox/readmbox.cc
+++ b/tdeioslave/mbox/readmbox.cpp
diff --git a/tdeioslave/mbox/stat.cc b/tdeioslave/mbox/stat.cpp
index 99267ca7d..99267ca7d 100644
--- a/tdeioslave/mbox/stat.cc
+++ b/tdeioslave/mbox/stat.cpp
diff --git a/tdeioslave/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cpp
index 4b359e403..4b359e403 100644
--- a/tdeioslave/mbox/urlinfo.cc
+++ b/tdeioslave/mbox/urlinfo.cpp
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 6bf74da55..2f085cf2b 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -161,7 +161,7 @@ TQString KSSLSocket::metaData( const TQString &key )
 }
 
 /*
-I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting.
+I basically copied the below from tcpTDEIO::SlaveBase.h, with some modificaions and formatting.
 
  * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net
  * Copyright (C) 2001-2003 George Staikos <staikos@kde.org>
diff --git a/tderesources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop
index 4359032fb..479d2f508 100644
--- a/tderesources/tvanytime/tvanytime.tdevelop
+++ b/tderesources/tvanytime/tvanytime.tdevelop
@@ -67,7 +67,7 @@
   </kdevautoproject>
   <kdevfileview>
     <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.cpp;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
       <group pattern="*.png" name="Icons" />
       <group pattern="*.po;*.ts" name="Translations" />