diff --git a/deco/CMakeLists.txt b/deco/CMakeLists.txt
index b04b68e..e4d516a 100644
--- a/deco/CMakeLists.txt
+++ b/deco/CMakeLists.txt
@@ -57,14 +57,14 @@ add_custom_command(
 ##### twin3_baghira (kpart)
 
 set_source_files_properties(
-    baghiraclient.cc
+    baghiraclient.cpp
     PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header}
 )
 
 tde_add_kpart( twin3_baghira AUTOMOC
 
   SOURCES
-        baghiraclient.cc
+        baghiraclient.cpp
   LINK
      tdecore-shared
      tdeui-shared
diff --git a/deco/Makefile.am b/deco/Makefile.am
index 84944ad..9931018 100644
--- a/deco/Makefile.am
+++ b/deco/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = $(twin_DATA) images
 noinst_HEADERS = baghiraclient.h pixmaps.h masks.h
 
 kde_module_LTLIBRARIES = twin3_baghira.la
-twin3_baghira_la_SOURCES = baghiraclient.cc
+twin3_baghira_la_SOURCES = baghiraclient.cpp
 twin3_baghira_la_LIBADD = $(kde_libraries)/libtdecorations.la
 twin3_baghira_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -module
 twin3_baghira_la_METASOURCES = AUTO
diff --git a/deco/baghiraclient.cc b/deco/baghiraclient.cpp
similarity index 100%
rename from deco/baghiraclient.cc
rename to deco/baghiraclient.cpp
diff --git a/deco/config/CMakeLists.txt b/deco/config/CMakeLists.txt
index 5a4a344..dbd3adb 100644
--- a/deco/config/CMakeLists.txt
+++ b/deco/config/CMakeLists.txt
@@ -32,7 +32,7 @@ add_custom_command(
 ##### twin_baghira_config (kpart)
 
 set_source_files_properties(
-    baghiraconfig.cc
+    baghiraconfig.cpp
     PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header}
 )
 
@@ -40,9 +40,9 @@ tde_add_kpart( twin_baghira_config AUTOMOC
 
   SOURCES
         configdialog.ui
-        baghiraconfig.cc
-        aquariusbutton.cc
-        colorpicker.cc
+        baghiraconfig.cpp
+        aquariusbutton.cpp
+        colorpicker.cpp
   LINK
      tdecore-shared
      tdeui-shared
diff --git a/deco/config/Makefile.am b/deco/config/Makefile.am
index d741389..534e239 100644
--- a/deco/config/Makefile.am
+++ b/deco/config/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = $(all_includes) -I$(srcdir)/../../config
 noinst_HEADERS = baghiraconfig.h aquariusbutton.h colorpicker.h pixmaps.h
 
 kde_module_LTLIBRARIES = twin_baghira_config.la
-twin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
+twin_baghira_config_la_SOURCES = baghiraconfig.cpp aquariusbutton.cpp colorpicker.cpp configdialog.ui
 twin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 twin_baghira_config_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 twin_baghira_config_la_METASOURCES = AUTO
diff --git a/deco/config/aquariusbutton.cc b/deco/config/aquariusbutton.cpp
similarity index 100%
rename from deco/config/aquariusbutton.cc
rename to deco/config/aquariusbutton.cpp
diff --git a/deco/config/baghiraconfig.cc b/deco/config/baghiraconfig.cpp
similarity index 99%
rename from deco/config/baghiraconfig.cc
rename to deco/config/baghiraconfig.cpp
index 7c5996c..5d1c14d 100644
--- a/deco/config/baghiraconfig.cc
+++ b/deco/config/baghiraconfig.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// baghiraconfig.cc
+// baghiraconfig.cpp
 // -------------------
 // Config module for Baghira window decoration
 // -------------------
diff --git a/deco/config/baghiraconfig.cc.new b/deco/config/baghiraconfig.cpp.new
similarity index 99%
rename from deco/config/baghiraconfig.cc.new
rename to deco/config/baghiraconfig.cpp.new
index b0f507b..5f2a29f 100644
--- a/deco/config/baghiraconfig.cc.new
+++ b/deco/config/baghiraconfig.cpp.new
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// baghiraconfig.cc
+// baghiraconfig.cpp
 // -------------------
 // Config module for Baghira window decoration
 // -------------------
diff --git a/deco/config/colorpicker.cc b/deco/config/colorpicker.cpp
similarity index 100%
rename from deco/config/colorpicker.cc
rename to deco/config/colorpicker.cpp