diff --git a/kicker-applets/ktimemon/CMakeLists.txt b/kicker-applets/ktimemon/CMakeLists.txt
index 7d827d7..4419e45 100644
--- a/kicker-applets/ktimemon/CMakeLists.txt
+++ b/kicker-applets/ktimemon/CMakeLists.txt
@@ -16,7 +16,7 @@ link_directories(
 ##### ktimemon_panelapplet (kpart) ##############
 
 tde_add_kpart( ktimemon_panelapplet AUTOMOC
-  SOURCES confdlg.cc sample.cc timemon.cc
+  SOURCES confdlg.cpp sample.cpp timemon.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker-applets/ktimemon/Makefile.am b/kicker-applets/ktimemon/Makefile.am
index 6874509..d562a27 100644
--- a/kicker-applets/ktimemon/Makefile.am
+++ b/kicker-applets/ktimemon/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = ktimemon_panelapplet.la
 
-ktimemon_panelapplet_la_SOURCES = confdlg.cc sample.cc timemon.cc
+ktimemon_panelapplet_la_SOURCES = confdlg.cpp sample.cpp timemon.cpp
 METASOURCES = AUTO
 
 noinst_HEADERS = confdlg.h sample.h timemon.h
@@ -18,5 +18,5 @@ lnkdir   = $(kde_datadir)/kicker/applets
 EXTRA_DIST = $(lnk_DATA)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/ktimemon.pot
+	$(XGETTEXT) *.cpp -o $(podir)/ktimemon.pot
 
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cpp
similarity index 100%
rename from kicker-applets/ktimemon/confdlg.cc
rename to kicker-applets/ktimemon/confdlg.cpp
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cpp
similarity index 99%
rename from kicker-applets/ktimemon/sample.cc
rename to kicker-applets/ktimemon/sample.cpp
index ce2bdae..5864583 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cpp
@@ -4,7 +4,7 @@
 /**********************************************************************/
 
 /*
- * sample.cc
+ * sample.cpp
  *
  * Definitions for the system dependent sampling class.
  */
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cpp
similarity index 100%
rename from kicker-applets/ktimemon/timemon.cc
rename to kicker-applets/ktimemon/timemon.cpp
diff --git a/konq-plugins/autorefresh/Makefile.am b/konq-plugins/autorefresh/Makefile.am
index c4691e4..25ac1b8 100644
--- a/konq-plugins/autorefresh/Makefile.am
+++ b/konq-plugins/autorefresh/Makefile.am
@@ -14,7 +14,7 @@ autorefreshdir = $(kde_datadir)/tdehtml/kpartplugins
 autorefresh_DATA = autorefresh.rc autorefresh.desktop
 
 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)/autorefresh.pot; \
 	fi
diff --git a/tdefile-plugins/lnk/lnkforward.cpp b/tdefile-plugins/lnk/lnkforward.cpp
index 0dab038..5cf72df 100644
--- a/tdefile-plugins/lnk/lnkforward.cpp
+++ b/tdefile-plugins/lnk/lnkforward.cpp
@@ -116,7 +116,7 @@ int LNKForwarder::run(TDECmdLineArgs *args)
 }
 
 //--------------------------------------------------------------------------------
-// copied from kfmclient.cc
+// copied from kfmclient.cpp
 
 void LNKForwarder::delayedQuit()
 {