117 files changed, 132 insertions, 132 deletions
diff --git a/arts/Makefile.am b/arts/Makefile.am
index f98d9c01..43f056d7 100644
--- a/arts/Makefile.am
+++ b/arts/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS = runtime midi gui modules examples $(ARTS_BUILD_KDE)
 DIST_SUBDIRS = runtime midi gui modules examples builder tools
 
 messages:
-	$(XGETTEXT) modules/*/*.cpp modules/*/*.cc gui/*/*.cpp gui/*/*.cc -o $(podir)/artsmodules.pot
+	$(XGETTEXT) modules/*/*.cpp gui/*/*.cpp -o $(podir)/artsmodules.pot
diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt
index 6fa63e44..030e3c65 100644
--- a/arts/gui/common/CMakeLists.txt
+++ b/arts/gui/common/CMakeLists.txt
@@ -27,14 +27,14 @@ link_directories(
 ##### artsgui (library) #########################
 
 tde_add_library( artsgui_idl SHARED
-  SOURCES artsgui.cc
+  SOURCES artsgui.cpp
   VERSION 0.0.0
   LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 tde_add_library( artsgui SHARED
-  SOURCES genericguifactory_impl.cc
+  SOURCES genericguifactory_impl.cpp
   VERSION 0.0.0
   LINK artsgui_idl-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -42,7 +42,7 @@ tde_add_library( artsgui SHARED
 
 add_custom_command(
   OUTPUT
-    artsgui.cc artsgui.h
+    artsgui.cpp artsgui.h
     artsgui.mcoptype artsgui.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsgui.idl
diff --git a/arts/gui/common/Makefile.am b/arts/gui/common/Makefile.am
index 9d82449f..3368a235 100644
--- a/arts/gui/common/Makefile.am
+++ b/arts/gui/common/Makefile.am
@@ -2,23 +2,23 @@ lib_LTLIBRARIES = libartsgui_idl.la libartsgui.la
 
 INCLUDES= -I$(arts_includes) -I$(top_builddir)/arts/runtime $(all_includes)
 
-libartsgui_idl_la_SOURCES = artsgui.cc
+libartsgui_idl_la_SOURCES = artsgui.cpp
 libartsgui_idl_la_LIBADD = -lmcop $(LIBDL)
 libartsgui_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
   -no-undefined
 
-libartsgui_la_SOURCES = genericguifactory_impl.cc
+libartsgui_la_SOURCES = genericguifactory_impl.cpp
 libartsgui_la_LIBADD = libartsgui_idl.la
 libartsgui_la_LDFLAGS = $(all_libraries) -no-undefined
 libartsgui_la_COMPILE_FIRST = artsgui.h
 
-artsgui.cc artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL)
+artsgui.cpp artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(includedir)/arts $(srcdir)/artsgui.idl
 
 artsgui.mcoptype: artsgui.h
 artsgui.mcopclass: artsgui.h
 
-DISTCLEANFILES = artsgui.cc artsgui.h \
+DISTCLEANFILES = artsgui.cpp artsgui.h \
   artsgui.mcoptype artsgui.mcopclass
 
 ####### install idl files
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index c7d0554e..76b6a8c5 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -23,7 +23,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/gui/common/genericguifactory_impl.cc b/arts/gui/common/genericguifactory_impl.cpp
index 163d7e21..163d7e21 100644
--- a/arts/gui/common/genericguifactory_impl.cc
+++ b/arts/gui/common/genericguifactory_impl.cpp
diff --git a/arts/midi/CMakeLists.txt b/arts/midi/CMakeLists.txt
index 0b91a9fe..c8c0925d 100644
--- a/arts/midi/CMakeLists.txt
+++ b/arts/midi/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 ##### artsmidi (library) ########################
 
 tde_add_library( artsmidi_idl SHARED
-  SOURCES artsmidi.cc
+  SOURCES artsmidi.cpp
   VERSION 0.0.0
   LINK ${ARTS_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} mcop artsflow artsflow_idl
   DESTINATION ${LIB_INSTALL_DIR}
@@ -37,11 +37,11 @@ tde_add_library( artsmidi_idl SHARED
 
 tde_add_library( artsmidi SHARED
   SOURCES
-    midimanager_impl.cc midiclient_impl.cc
-    miditest_impl.cc midimanagerport_impl.cc rawmidiport_impl.cc
-    systemmiditimer_impl.cc audiomiditimer_impl.cc miditimercommon.cc
-    audiosync_impl.cc audiotimer.cc alsamidigateway_impl.cc
-    alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
+    midimanager_impl.cpp midiclient_impl.cpp
+    miditest_impl.cpp midimanagerport_impl.cpp rawmidiport_impl.cpp
+    systemmiditimer_impl.cpp audiomiditimer_impl.cpp miditimercommon.cpp
+    audiosync_impl.cpp audiotimer.cpp alsamidigateway_impl.cpp
+    alsamidiport_impl.cpp midisyncgroup_impl.cpp timestampmath.cpp
   VERSION 0.0.0
   LINK
     artsmidi_idl-shared
@@ -50,7 +50,7 @@ tde_add_library( artsmidi SHARED
 
 add_custom_command(
   OUTPUT
-    artsmidi.cc artsmidi.h
+    artsmidi.cpp artsmidi.h
     artsmidi.mcopclass artsmidi.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsmidi.idl
@@ -61,13 +61,13 @@ add_custom_command(
 ##### midisend (executable) #####################
 
 tde_add_executable( midisend
-  SOURCES midisend.cc midimsg.c
+  SOURCES midisend.cpp midimsg.c
   LINK artsmidi_idl-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 tde_add_check_executable( midisynctest
-  SOURCES midisynctest.cc
+  SOURCES midisynctest.cpp
   LINK artsmidi-shared soundserver_idl
 )
 
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index d097dc85..679ff700 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -8,26 +8,26 @@ lib_LTLIBRARIES = libartsmidi_idl.la libartsmidi.la
 bin_PROGRAMS = midisend
 noinst_PROGRAMS = midisynctest
 
-midisend_SOURCES = midisend.cc midimsg.c
+midisend_SOURCES = midisend.cpp midimsg.c
 midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl
 midisend_LDADD   = libartsmidi_idl.la -lartsflow_idl
 midisend_COMPILE_FIRST = artsmidi.h
 
-midisynctest_SOURCES = midisynctest.cc
+midisynctest_SOURCES = midisynctest.cpp
 midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl -lartsmidi_idl
 midisynctest_LDADD   = libartsmidi.la -lsoundserver_idl -lartsflow_idl -lartsmidi_idl
 midisynctest_COMPILE_FIRST = artsmidi.h
 
-libartsmidi_idl_la_SOURCES = artsmidi.cc
+libartsmidi_idl_la_SOURCES = artsmidi.cpp
 libartsmidi_idl_la_LIBADD = -lmcop -lartsflow -lartsflow_idl
 libartsmidi_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
   -no-undefined -lartsflow_idl
 
-libartsmidi_la_SOURCES = midimanager_impl.cc midiclient_impl.cc \
-	miditest_impl.cc midimanagerport_impl.cc rawmidiport_impl.cc \
-	systemmiditimer_impl.cc audiomiditimer_impl.cc miditimercommon.cc \
-	audiosync_impl.cc audiotimer.cc alsamidigateway_impl.cc \
-	alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
+libartsmidi_la_SOURCES = midimanager_impl.cpp midiclient_impl.cpp \
+	miditest_impl.cpp midimanagerport_impl.cpp rawmidiport_impl.cpp \
+	systemmiditimer_impl.cpp audiomiditimer_impl.cpp miditimercommon.cpp \
+	audiosync_impl.cpp audiotimer.cpp alsamidigateway_impl.cpp \
+	alsamidiport_impl.cpp midisyncgroup_impl.cpp timestampmath.cpp
 libartsmidi_la_COMPILE_FIRST = artsmidi.h
 
 libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow_idl -lartsflow $(ARTS_LIBASOUND)
@@ -36,10 +36,10 @@ libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 
 artsmidi.mcopclass: artsmidi.h
 artsmidi.mcoptype: artsmidi.h
-artsmidi.cc artsmidi.h: $(srcdir)/artsmidi.idl $(MCOPIDL)
+artsmidi.cpp artsmidi.h: $(srcdir)/artsmidi.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(arts_includes) $(srcdir)/artsmidi.idl
 
-DISTCLEANFILES = artsmidi.cc artsmidi.h \
+DISTCLEANFILES = artsmidi.cpp artsmidi.h \
   artsmidi.mcoptype artsmidi.mcopclass
 
 ####### install idl files
diff --git a/arts/midi/README.midi b/arts/midi/README.midi
index 69342b32..a3463fde 100644
--- a/arts/midi/README.midi
+++ b/arts/midi/README.midi
@@ -250,7 +250,7 @@ synchronized to those of the midi channels.
   ---------------
 
 An example that illustrates most things discussed in this document is
-midisynctest.cc, which plays back two synchronized midi streams and samples.
+midisynctest.cpp, which plays back two synchronized midi streams and samples.
 Note that you might want to change the source code, as it hardcodes the
 location of the .wav file.
 
diff --git a/arts/midi/alsamidigateway_impl.cc b/arts/midi/alsamidigateway_impl.cpp
index 4b31042e..4b31042e 100644
--- a/arts/midi/alsamidigateway_impl.cc
+++ b/arts/midi/alsamidigateway_impl.cpp
diff --git a/arts/midi/alsamidiport_impl.cc b/arts/midi/alsamidiport_impl.cpp
index 97c8dffa..97c8dffa 100644
--- a/arts/midi/alsamidiport_impl.cc
+++ b/arts/midi/alsamidiport_impl.cpp
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index ce1c5891..9531d763 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -21,7 +21,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsmidi.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsmidi.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/midi/audiomiditimer_impl.cc b/arts/midi/audiomiditimer_impl.cpp
index a185b1cb..a185b1cb 100644
--- a/arts/midi/audiomiditimer_impl.cc
+++ b/arts/midi/audiomiditimer_impl.cpp
diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cpp
index 20f089df..20f089df 100644
--- a/arts/midi/audiosync_impl.cc
+++ b/arts/midi/audiosync_impl.cpp
diff --git a/arts/midi/audiotimer.cc b/arts/midi/audiotimer.cpp
index a80e551c..a80e551c 100644
--- a/arts/midi/audiotimer.cc
+++ b/arts/midi/audiotimer.cpp
diff --git a/arts/midi/midiclient_impl.cc b/arts/midi/midiclient_impl.cpp
index 0aa2ec6f..0aa2ec6f 100644
--- a/arts/midi/midiclient_impl.cc
+++ b/arts/midi/midiclient_impl.cpp
diff --git a/arts/midi/midimanager_impl.cc b/arts/midi/midimanager_impl.cpp
index ea310503..ea310503 100644
--- a/arts/midi/midimanager_impl.cc
+++ b/arts/midi/midimanager_impl.cpp
diff --git a/arts/midi/midimanagerport_impl.cc b/arts/midi/midimanagerport_impl.cpp
index 3b4261a7..3b4261a7 100644
--- a/arts/midi/midimanagerport_impl.cc
+++ b/arts/midi/midimanagerport_impl.cpp
diff --git a/arts/midi/midisend.cc b/arts/midi/midisend.cpp
index 2b976d61..2b976d61 100644
--- a/arts/midi/midisend.cc
+++ b/arts/midi/midisend.cpp
diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cpp
index 5d5305dd..5d5305dd 100644
--- a/arts/midi/midisyncgroup_impl.cc
+++ b/arts/midi/midisyncgroup_impl.cpp
diff --git a/arts/midi/midisynctest.cc b/arts/midi/midisynctest.cpp
index e1278f1b..e1278f1b 100644
--- a/arts/midi/midisynctest.cc
+++ b/arts/midi/midisynctest.cpp
diff --git a/arts/midi/miditest_impl.cc b/arts/midi/miditest_impl.cpp
index b6ecce90..b6ecce90 100644
--- a/arts/midi/miditest_impl.cc
+++ b/arts/midi/miditest_impl.cpp
diff --git a/arts/midi/miditimercommon.cc b/arts/midi/miditimercommon.cpp
index 69597b32..69597b32 100644
--- a/arts/midi/miditimercommon.cc
+++ b/arts/midi/miditimercommon.cpp
diff --git a/arts/midi/rawmidiport_impl.cc b/arts/midi/rawmidiport_impl.cpp
index f8311bd6..f8311bd6 100644
--- a/arts/midi/rawmidiport_impl.cc
+++ b/arts/midi/rawmidiport_impl.cpp
diff --git a/arts/midi/systemmiditimer_impl.cc b/arts/midi/systemmiditimer_impl.cpp
index 4f7329b2..4f7329b2 100644
--- a/arts/midi/systemmiditimer_impl.cc
+++ b/arts/midi/systemmiditimer_impl.cpp
diff --git a/arts/midi/timestampmath.cc b/arts/midi/timestampmath.cpp
index e8d5500a..e8d5500a 100644
--- a/arts/midi/timestampmath.cc
+++ b/arts/midi/timestampmath.cpp
diff --git a/arts/modules/CMakeLists.txt b/arts/modules/CMakeLists.txt
index 9f37038c..fb6d07e2 100644
--- a/arts/modules/CMakeLists.txt
+++ b/arts/modules/CMakeLists.txt
@@ -39,7 +39,7 @@ link_directories(
 
 tde_add_library( artsmodules SHARED
   SOURCES
-    artsmodules.cc
+    artsmodules.cpp
   VERSION 0.0.0
   LINK
     tdecore-shared ${DL_LIBRARIES} mcop artsflow
@@ -51,7 +51,7 @@ tde_add_library( artsmodules SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodules.cc artsmodules.h
+    artsmodules.cpp artsmodules.h
     artsmodules.mcoptype artsmodules.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/Makefile.am b/arts/modules/Makefile.am
index d604e8b9..9ac9de04 100644
--- a/arts/modules/Makefile.am
+++ b/arts/modules/Makefile.am
@@ -25,7 +25,7 @@ MCOPIDLINCLUDES = \
 
 lib_LTLIBRARIES = libartsmodules.la
 
-libartsmodules_la_SOURCES = artsmodules.cc
+libartsmodules_la_SOURCES = artsmodules.cpp
 
 libartsmodules_la_LIBADD = \
    $(top_builddir)/arts/runtime/libartsbuilder.la \
@@ -42,10 +42,10 @@ libartsmodules_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 
 artsmodules.mcopclass: artsmodules.h
 artsmodules.mcoptype: artsmodules.h
-artsmodules.cc artsmodules.h: $(srcdir)/artsmodules.idl $(MCOPIDL)
+artsmodules.cpp artsmodules.h: $(srcdir)/artsmodules.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOPIDLINCLUDES) $(srcdir)/artsmodules.idl
 
-DISTCLEANFILES = artsmodules.cc artsmodules.h \
+DISTCLEANFILES = artsmodules.cpp artsmodules.h \
   artsmodules.mcoptype artsmodules.mcopclass
 
 ####### install idl files
diff --git a/arts/modules/README.environments b/arts/modules/README.environments
index 0ac64df5..c3b7b985 100644
--- a/arts/modules/README.environments
+++ b/arts/modules/README.environments
@@ -281,7 +281,7 @@ Basically, you derive an interface from Arts::Environment::Item, like this:
 
 and your implementation from Arts::Environment::Item_impl, like this:
 
-    // this code is in the .cc file:
+    // this code is in the .cpp file:
     #include "artsmodules.h"
     #include "env_item_impl.h"
     
diff --git a/arts/modules/README.modules b/arts/modules/README.modules
index 7113b3a9..2379f618 100644
--- a/arts/modules/README.modules
+++ b/arts/modules/README.modules
@@ -7,9 +7,9 @@ To add a new module "foo" to aRts:
 1. Add a new interface to artsmodules.idl defining the
    module's input and output parameters.
 
-2. Implement the new module in a new source file foo_impl.cc
+2. Implement the new module in a new source file foo_impl.cpp
 
-3. Add foo_impl.cc to the list of libartsmodules_la_SOURCES in
+3. Add foo_impl.cpp to the list of libartsmodules_la_SOURCES in
    Makefile.am.
 
 4. Create a new file mcopclass/foo.mcopclass
diff --git a/arts/modules/artsmodules.idl b/arts/modules/artsmodules.idl
index c502871d..0148aa5b 100644
--- a/arts/modules/artsmodules.idl
+++ b/arts/modules/artsmodules.idl
@@ -25,7 +25,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/common/CMakeLists.txt b/arts/modules/common/CMakeLists.txt
index 329fb104..ea065260 100644
--- a/arts/modules/common/CMakeLists.txt
+++ b/arts/modules/common/CMakeLists.txt
@@ -38,10 +38,10 @@ link_directories(
 
 tde_add_library( artsmodulescommon SHARED
   SOURCES
-    artsmodulescommon.cc effectrackslot_impl.cc
-    env_container_impl.cc env_context_impl.cc
-    env_effectrackitem_impl.cc env_instrumentitem_impl.cc
-    env_item_impl.cc env_mixeritem_impl.cc
+    artsmodulescommon.cpp effectrackslot_impl.cpp
+    env_container_impl.cpp env_context_impl.cpp
+    env_effectrackitem_impl.cpp env_instrumentitem_impl.cpp
+    env_item_impl.cpp env_mixeritem_impl.cpp
   VERSION 0.0.0
   LINK
     artsgui_idl-shared artsmidi_idl-shared artsmodulessynth-shared
@@ -51,7 +51,7 @@ tde_add_library( artsmodulescommon SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulescommon.cc artsmodulescommon.h
+    artsmodulescommon.cpp artsmodulescommon.h
     artsmodulescommon.mcopclass artsmodulescommon.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index bcf472fc..49cd300b 100644
--- a/arts/modules/common/Makefile.am
+++ b/arts/modules/common/Makefile.am
@@ -14,11 +14,11 @@ INCLUDES = \
 
 lib_LTLIBRARIES = libartsmodulescommon.la
 
-libartsmodulescommon_la_SOURCES = artsmodulescommon.cc \
-	effectrackslot_impl.cc env_container_impl.cc \
-	env_context_impl.cc env_effectrackitem_impl.cc \
-	env_instrumentitem_impl.cc env_item_impl.cc \
-	env_mixeritem_impl.cc
+libartsmodulescommon_la_SOURCES = artsmodulescommon.cpp \
+	effectrackslot_impl.cpp env_container_impl.cpp \
+	env_context_impl.cpp env_effectrackitem_impl.cpp \
+	env_instrumentitem_impl.cpp env_item_impl.cpp \
+	env_mixeritem_impl.cpp
 libartsmodulescommon_la_COMPILE_FIRST = artsmodulescommon.h
 
 libartsmodulescommon_la_LIBADD = \
@@ -29,10 +29,10 @@ libartsmodulescommon_la_LIBADD = \
 
 libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
 
-artsmodulescommon.cc artsmodulescommon.h artsmodulescommon.mcoptype artsmodulescommon.mcopclass: $(srcdir)/artsmodulescommon.idl $(MCOPIDL)
+artsmodulescommon.cpp artsmodulescommon.h artsmodulescommon.mcoptype artsmodulescommon.mcopclass: $(srcdir)/artsmodulescommon.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(INCLUDES) $(srcdir)/artsmodulescommon.idl
 
-DISTCLEANFILES= artsmodulescommon.cc artsmodulescommon.h artsmodulescommon.mcop*
+DISTCLEANFILES= artsmodulescommon.cpp artsmodulescommon.h artsmodulescommon.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulescommon.h artsmodulescommon.idl
diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl
index 10ccd218..b22394eb 100644
--- a/arts/modules/common/artsmodulescommon.idl
+++ b/arts/modules/common/artsmodulescommon.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cpp
index 6671031b..6671031b 100644
--- a/arts/modules/common/effectrackslot_impl.cc
+++ b/arts/modules/common/effectrackslot_impl.cpp
diff --git a/arts/modules/common/env_container_impl.cc b/arts/modules/common/env_container_impl.cpp
index 0a6f87d7..0a6f87d7 100644
--- a/arts/modules/common/env_container_impl.cc
+++ b/arts/modules/common/env_container_impl.cpp
diff --git a/arts/modules/common/env_context_impl.cc b/arts/modules/common/env_context_impl.cpp
index a9b19a50..a9b19a50 100644
--- a/arts/modules/common/env_context_impl.cc
+++ b/arts/modules/common/env_context_impl.cpp
diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cpp
index c082ce24..c082ce24 100644
--- a/arts/modules/common/env_effectrackitem_impl.cc
+++ b/arts/modules/common/env_effectrackitem_impl.cpp
diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cpp
index 17959ca0..17959ca0 100644
--- a/arts/modules/common/env_instrumentitem_impl.cc
+++ b/arts/modules/common/env_instrumentitem_impl.cpp
diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cpp
index 6bc960d8..6bc960d8 100644
--- a/arts/modules/common/env_item_impl.cc
+++ b/arts/modules/common/env_item_impl.cpp
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cpp
index 93735dd5..93735dd5 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cpp
diff --git a/arts/modules/effects/CMakeLists.txt b/arts/modules/effects/CMakeLists.txt
index 58c847d9..a5136f08 100644
--- a/arts/modules/effects/CMakeLists.txt
+++ b/arts/modules/effects/CMakeLists.txt
@@ -38,15 +38,15 @@ link_directories(
 
 tde_add_library( artsmoduleseffects SHARED AUTOMOC
   SOURCES
-    artsmoduleseffects.cc
-    fivebandmonocomplexeq_impl.cc
-    monostereoconversion_impl.cc
-    synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc
-    synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc
-    synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc
-    synth_stereo_fir_equalizer_impl.cc
-    synth_freeverb_impl.cc freeverbguifactory_impl.cc
-    effect_wavecapture_impl.cc
+    artsmoduleseffects.cpp
+    fivebandmonocomplexeq_impl.cpp
+    monostereoconversion_impl.cpp
+    synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp
+    synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp
+    synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp
+    synth_stereo_fir_equalizer_impl.cpp
+    synth_freeverb_impl.cpp freeverbguifactory_impl.cpp
+    effect_wavecapture_impl.cpp
     kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
   VERSION 0.0.0
   EMBED
@@ -60,7 +60,7 @@ tde_add_library( artsmoduleseffects SHARED AUTOMOC
 
 add_custom_command(
   OUTPUT
-    artsmoduleseffects.cc artsmoduleseffects.h
+    artsmoduleseffects.cpp artsmoduleseffects.h
     artsmoduleseffects.mcopclass artsmoduleseffects.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/effects/Makefile.am b/arts/modules/effects/Makefile.am
index d5d54aad..a2c3f31f 100644
--- a/arts/modules/effects/Makefile.am
+++ b/arts/modules/effects/Makefile.am
@@ -20,15 +20,15 @@ INCLUDES = \
 
 lib_LTLIBRARIES = libartsmoduleseffects.la
 
-libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cc \
-	fivebandmonocomplexeq_impl.cc \
-	monostereoconversion_impl.cc \
-	synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc \
-	synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc \
-	synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc \
-	synth_stereo_fir_equalizer_impl.cc \
-	synth_freeverb_impl.cc freeverbguifactory_impl.cc \
-	effect_wavecapture_impl.cc \
+libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cpp \
+	fivebandmonocomplexeq_impl.cpp \
+	monostereoconversion_impl.cpp \
+	synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp \
+	synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp \
+	synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp \
+	synth_stereo_fir_equalizer_impl.cpp \
+	synth_freeverb_impl.cpp freeverbguifactory_impl.cpp \
+	effect_wavecapture_impl.cpp \
 	kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
 libartsmoduleseffects_la_COMPILE_FIRST = ../../gui/common/artsgui.h \
 	../common/artsmodulescommon.h ../../midi/artsmidi.h ../synth/artsmodulessynth.h \
@@ -44,10 +44,10 @@ libartsmoduleseffects_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-unde
 
 METASOURCES=AUTO
 
-artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
+artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(INCLUDES) $(srcdir)/artsmoduleseffects.idl
 
-DISTCLEANFILES= artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcop*
+DISTCLEANFILES= artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmoduleseffects.h artsmoduleseffects.idl
diff --git a/arts/modules/effects/artsmoduleseffects.idl b/arts/modules/effects/artsmoduleseffects.idl
index 13e978d9..9d7cd871 100644
--- a/arts/modules/effects/artsmoduleseffects.idl
+++ b/arts/modules/effects/artsmoduleseffects.idl
@@ -18,7 +18,7 @@
 */
 
 /*
- * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/effects/effect_wavecapture_impl.cc b/arts/modules/effects/effect_wavecapture_impl.cpp
index 639307a8..639307a8 100644
--- a/arts/modules/effects/effect_wavecapture_impl.cc
+++ b/arts/modules/effects/effect_wavecapture_impl.cpp
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
index 59d0ef44..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
diff --git a/arts/modules/effects/freeverb/allpass.cpp b/arts/modules/effects/freeverb/allpass.cpp
index ca4d8bc5..850337e3 100644
--- a/arts/modules/effects/freeverb/allpass.cpp
+++ b/arts/modules/effects/freeverb/allpass.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "allpass.hpp"
+#include "allpass.h"
 
 allpass::allpass()
 {
diff --git a/arts/modules/effects/freeverb/allpass.hpp b/arts/modules/effects/freeverb/allpass.h
index 853c7d41..853c7d41 100644
--- a/arts/modules/effects/freeverb/allpass.hpp
+++ b/arts/modules/effects/freeverb/allpass.h
diff --git a/arts/modules/effects/freeverb/comb.cpp b/arts/modules/effects/freeverb/comb.cpp
index c05f5069..62be706d 100644
--- a/arts/modules/effects/freeverb/comb.cpp
+++ b/arts/modules/effects/freeverb/comb.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "comb.hpp"
+#include "comb.h"
 
 comb::comb()
 {
diff --git a/arts/modules/effects/freeverb/comb.hpp b/arts/modules/effects/freeverb/comb.h
index 4a73b615..4a73b615 100644
--- a/arts/modules/effects/freeverb/comb.hpp
+++ b/arts/modules/effects/freeverb/comb.h
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index 23a766cc..3688dd34 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "revmodel.hpp"
+#include "revmodel.h"
 
 revmodel::revmodel()
 {
diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.h
index ca6c89a0..aec39dfe 100644
--- a/arts/modules/effects/freeverb/revmodel.hpp
+++ b/arts/modules/effects/freeverb/revmodel.h
@@ -7,8 +7,8 @@
 #ifndef _revmodel_
 #define _revmodel_
 
-#include "comb.hpp"
-#include "allpass.hpp"
+#include "comb.h"
+#include "allpass.h"
 #include "tuning.h"
 
 class revmodel
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cpp
index 4b5d4d34..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cpp
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cpp
index 9bf1bbee..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cpp
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cpp
index 295ad65d..295ad65d 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cpp
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cpp
index a1f35d06..3b882d48 100644
--- a/arts/modules/effects/synth_freeverb_impl.cc
+++ b/arts/modules/effects/synth_freeverb_impl.cpp
@@ -20,7 +20,7 @@
 
     */
 
-#include "freeverb/revmodel.hpp"
+#include "freeverb/revmodel.h"
 #include "artsmoduleseffects.h"
 #include "stdsynthmodule.h"
 
diff --git a/arts/modules/effects/synth_stereo_compressor_impl.cc b/arts/modules/effects/synth_stereo_compressor_impl.cpp
index 3add8d46..3add8d46 100644
--- a/arts/modules/effects/synth_stereo_compressor_impl.cc
+++ b/arts/modules/effects/synth_stereo_compressor_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
index 8f15a4dc..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
index 390fd04e..390fd04e 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
index fbf7bb07..fbf7bb07 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
diff --git a/arts/modules/effects/synth_voice_removal_impl.cc b/arts/modules/effects/synth_voice_removal_impl.cpp
index 2ade0879..2ade0879 100644
--- a/arts/modules/effects/synth_voice_removal_impl.cc
+++ b/arts/modules/effects/synth_voice_removal_impl.cpp
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cpp
index dc9dce20..dc9dce20 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cpp
diff --git a/arts/modules/mixers/CMakeLists.txt b/arts/modules/mixers/CMakeLists.txt
index 98e7147d..7f6d4dc4 100644
--- a/arts/modules/mixers/CMakeLists.txt
+++ b/arts/modules/mixers/CMakeLists.txt
@@ -37,10 +37,10 @@ link_directories(
 
 tde_add_library( artsmodulesmixers SHARED
   SOURCES
-    artsmodulesmixers.cc
-    monosimplemixerchannel_impl.cc monosimplemixerchannelguifactory_impl.cc
-    simplemixerchannel_impl.cc simplemixerchannelguifactory_impl.cc
-    littlestereomixerchannel_impl.cc
+    artsmodulesmixers.cpp
+    monosimplemixerchannel_impl.cpp monosimplemixerchannelguifactory_impl.cpp
+    simplemixerchannel_impl.cpp simplemixerchannelguifactory_impl.cpp
+    littlestereomixerchannel_impl.cpp
   VERSION 0.0.0
   LINK
     artsgui_idl-shared artsmodulescommon-shared artsmoduleseffects-shared
@@ -50,7 +50,7 @@ tde_add_library( artsmodulesmixers SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulesmixers.cc artsmodulesmixers.h
+    artsmodulesmixers.cpp artsmodulesmixers.h
     artsmodulesmixers.mcopclass artsmodulesmixers.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/mixers/Makefile.am b/arts/modules/mixers/Makefile.am
index b504bfba..0cb0b666 100644
--- a/arts/modules/mixers/Makefile.am
+++ b/arts/modules/mixers/Makefile.am
@@ -25,10 +25,10 @@ MCOPINCLUDES = \
 
 lib_LTLIBRARIES = libartsmodulesmixers.la
 
-libartsmodulesmixers_la_SOURCES = artsmodulesmixers.cc \
-	monosimplemixerchannel_impl.cc monosimplemixerchannelguifactory_impl.cc \
-	simplemixerchannel_impl.cc simplemixerchannelguifactory_impl.cc \
-	littlestereomixerchannel_impl.cc
+libartsmodulesmixers_la_SOURCES = artsmodulesmixers.cpp \
+	monosimplemixerchannel_impl.cpp monosimplemixerchannelguifactory_impl.cpp \
+	simplemixerchannel_impl.cpp simplemixerchannelguifactory_impl.cpp \
+	littlestereomixerchannel_impl.cpp
 libartsmodulesmixers_la_COMPILE_FIRST = ../synth/artsmodulessynth.h \
 	../../midi/artsmidi.h ../common/artsmodulescommon.h ../../gui/common/artsgui.h \
 	artsmodulesmixers.h
@@ -40,10 +40,10 @@ libartsmodulesmixers_la_LIBADD = \
 
 libartsmodulesmixers_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
 
-artsmodulesmixers.cc artsmodulesmixers.h artsmodulesmixers.mcoptype artsmodulesmixers.mcopclass: $(srcdir)/artsmodulesmixers.idl $(MCOPIDL)
+artsmodulesmixers.cpp artsmodulesmixers.h artsmodulesmixers.mcoptype artsmodulesmixers.mcopclass: $(srcdir)/artsmodulesmixers.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOPINCLUDES) $(srcdir)/artsmodulesmixers.idl
 
-DISTCLEANFILES= artsmodulesmixers.cc artsmodulesmixers.h artsmodulesmixers.mcop*
+DISTCLEANFILES= artsmodulesmixers.cpp artsmodulesmixers.h artsmodulesmixers.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulesmixers.h artsmodulesmixers.idl
diff --git a/arts/modules/mixers/artsmodulesmixers.idl b/arts/modules/mixers/artsmodulesmixers.idl
index 56ff073b..dbe82c5c 100644
--- a/arts/modules/mixers/artsmodulesmixers.idl
+++ b/arts/modules/mixers/artsmodulesmixers.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/mixers/littlestereomixerchannel_impl.cc b/arts/modules/mixers/littlestereomixerchannel_impl.cpp
index 3b14fa39..3b14fa39 100644
--- a/arts/modules/mixers/littlestereomixerchannel_impl.cc
+++ b/arts/modules/mixers/littlestereomixerchannel_impl.cpp
diff --git a/arts/modules/mixers/monosimplemixerchannel_impl.cc b/arts/modules/mixers/monosimplemixerchannel_impl.cpp
index 04bad0ce..04bad0ce 100644
--- a/arts/modules/mixers/monosimplemixerchannel_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannel_impl.cpp
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cpp
index 28fbab55..28fbab55 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cpp
diff --git a/arts/modules/mixers/simplemixerchannel_impl.cc b/arts/modules/mixers/simplemixerchannel_impl.cpp
index 0c00768a..0c00768a 100644
--- a/arts/modules/mixers/simplemixerchannel_impl.cc
+++ b/arts/modules/mixers/simplemixerchannel_impl.cpp
diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cpp
index 73ab31e2..73ab31e2 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cpp
diff --git a/arts/modules/synth/CMakeLists.txt b/arts/modules/synth/CMakeLists.txt
index 4362aaa7..9930b55d 100644
--- a/arts/modules/synth/CMakeLists.txt
+++ b/arts/modules/synth/CMakeLists.txt
@@ -34,20 +34,20 @@ link_directories(
 
 tde_add_library( artsmodulessynth SHARED
   SOURCES
-    artsmodulessynth.cc
-    synth_xfade_impl.cc synth_autopanner_impl.cc synth_delay_impl.cc
-    synth_cdelay_impl.cc synth_envelope_adsr_impl.cc synth_pscale_impl.cc
-    synth_tremolo_impl.cc synth_fx_cflanger_impl.cc synth_compressor_impl.cc
-    synth_pitch_shift_impl.cc synth_pitch_shift_fft_impl.cc c_filter_stuff.c
-    synth_shelve_cutoff_impl.cc synth_brickwall_limiter_impl.cc
-    synth_std_equalizer_impl.cc synth_rc_impl.cc synth_moog_vcf_impl.cc
-    synth_atan_saturate_impl.cc synth_fm_source_impl.cc
-    synth_wave_tri_impl.cc synth_noise_impl.cc synth_wave_softsaw_impl.cc
-    synth_wave_square_impl.cc synth_wave_pulse_impl.cc synth_osc_impl.cc
-    synth_play_pat_impl.cc synth_capture_wav_impl.cc
-    synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc
-    synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc
-    synth_debug_impl.cc synth_data_impl.cc synth_div_impl.cc
+    artsmodulessynth.cpp
+    synth_xfade_impl.cpp synth_autopanner_impl.cpp synth_delay_impl.cpp
+    synth_cdelay_impl.cpp synth_envelope_adsr_impl.cpp synth_pscale_impl.cpp
+    synth_tremolo_impl.cpp synth_fx_cflanger_impl.cpp synth_compressor_impl.cpp
+    synth_pitch_shift_impl.cpp synth_pitch_shift_fft_impl.cpp c_filter_stuff.c
+    synth_shelve_cutoff_impl.cpp synth_brickwall_limiter_impl.cpp
+    synth_std_equalizer_impl.cpp synth_rc_impl.cpp synth_moog_vcf_impl.cpp
+    synth_atan_saturate_impl.cpp synth_fm_source_impl.cpp
+    synth_wave_tri_impl.cpp synth_noise_impl.cpp synth_wave_softsaw_impl.cpp
+    synth_wave_square_impl.cpp synth_wave_pulse_impl.cpp synth_osc_impl.cpp
+    synth_play_pat_impl.cpp synth_capture_wav_impl.cpp
+    synth_midi_test_impl.cpp synth_sequence_impl.cpp synth_sequence_freq_impl.cpp
+    synth_midi_debug_impl.cpp objectcache_impl.cpp synth_nil_impl.cpp
+    synth_debug_impl.cpp synth_data_impl.cpp synth_div_impl.cpp
   VERSION 0.0.0
   LINK
     artsbuilder-shared artsmidi_idl-shared
@@ -57,7 +57,7 @@ tde_add_library( artsmodulessynth SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulessynth.cc artsmodulessynth.h
+    artsmodulessynth.cpp artsmodulessynth.h
     artsmodulessynth.mcopclass artsmodulessynth.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index 520b33fe..211d973c 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -15,17 +15,17 @@ MCOP_INCLUDES= \
 
 lib_LTLIBRARIES = libartsmodulessynth.la
 
-libartsmodulessynth_la_SOURCES = artsmodulessynth.cc \
-	synth_xfade_impl.cc synth_autopanner_impl.cc synth_delay_impl.cc synth_cdelay_impl.cc \
-	synth_envelope_adsr_impl.cc synth_pscale_impl.cc \
-	synth_tremolo_impl.cc synth_fx_cflanger_impl.cc synth_compressor_impl.cc \
-	synth_pitch_shift_impl.cc synth_pitch_shift_fft_impl.cc c_filter_stuff.c synth_shelve_cutoff_impl.cc synth_brickwall_limiter_impl.cc synth_std_equalizer_impl.cc synth_rc_impl.cc synth_moog_vcf_impl.cc synth_atan_saturate_impl.cc \
-	synth_fm_source_impl.cc \
-	synth_wave_tri_impl.cc synth_noise_impl.cc synth_wave_softsaw_impl.cc synth_wave_square_impl.cc synth_wave_pulse_impl.cc synth_osc_impl.cc synth_play_pat_impl.cc \
-	synth_capture_wav_impl.cc \
-	synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc \
-	synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc synth_debug_impl.cc synth_data_impl.cc \
-	synth_div_impl.cc
+libartsmodulessynth_la_SOURCES = artsmodulessynth.cpp \
+	synth_xfade_impl.cpp synth_autopanner_impl.cpp synth_delay_impl.cpp synth_cdelay_impl.cpp \
+	synth_envelope_adsr_impl.cpp synth_pscale_impl.cpp \
+	synth_tremolo_impl.cpp synth_fx_cflanger_impl.cpp synth_compressor_impl.cpp \
+	synth_pitch_shift_impl.cpp synth_pitch_shift_fft_impl.cpp c_filter_stuff.c synth_shelve_cutoff_impl.cpp synth_brickwall_limiter_impl.cpp synth_std_equalizer_impl.cpp synth_rc_impl.cpp synth_moog_vcf_impl.cpp synth_atan_saturate_impl.cpp \
+	synth_fm_source_impl.cpp \
+	synth_wave_tri_impl.cpp synth_noise_impl.cpp synth_wave_softsaw_impl.cpp synth_wave_square_impl.cpp synth_wave_pulse_impl.cpp synth_osc_impl.cpp synth_play_pat_impl.cpp \
+	synth_capture_wav_impl.cpp \
+	synth_midi_test_impl.cpp synth_sequence_impl.cpp synth_sequence_freq_impl.cpp \
+	synth_midi_debug_impl.cpp objectcache_impl.cpp synth_nil_impl.cpp synth_debug_impl.cpp synth_data_impl.cpp \
+	synth_div_impl.cpp
 libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h
 
 libartsmodulessynth_la_LIBADD = \
@@ -36,10 +36,10 @@ libartsmodulessynth_la_LIBADD = \
 #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE)
 libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
 
-artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
+artsmodulessynth.cpp artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOP_INCLUDES) $(srcdir)/artsmodulessynth.idl
 
-DISTCLEANFILES= artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcop*
+DISTCLEANFILES= artsmodulessynth.cpp artsmodulessynth.h artsmodulessynth.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulessynth.h artsmodulessynth.idl
diff --git a/arts/modules/synth/artsmodulessynth.idl b/arts/modules/synth/artsmodulessynth.idl
index b9ac3d46..6ba4248b 100644
--- a/arts/modules/synth/artsmodulessynth.idl
+++ b/arts/modules/synth/artsmodulessynth.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/synth/objectcache_impl.cc b/arts/modules/synth/objectcache_impl.cpp
index d4d833a3..d4d833a3 100644
--- a/arts/modules/synth/objectcache_impl.cc
+++ b/arts/modules/synth/objectcache_impl.cpp
diff --git a/arts/modules/synth/synth_atan_saturate_impl.cc b/arts/modules/synth/synth_atan_saturate_impl.cpp
index 7eb0b513..7eb0b513 100644
--- a/arts/modules/synth/synth_atan_saturate_impl.cc
+++ b/arts/modules/synth/synth_atan_saturate_impl.cpp
diff --git a/arts/modules/synth/synth_autopanner_impl.cc b/arts/modules/synth/synth_autopanner_impl.cpp
index 6e3526de..6e3526de 100644
--- a/arts/modules/synth/synth_autopanner_impl.cc
+++ b/arts/modules/synth/synth_autopanner_impl.cpp
diff --git a/arts/modules/synth/synth_brickwall_limiter_impl.cc b/arts/modules/synth/synth_brickwall_limiter_impl.cpp
index aea9d66e..aea9d66e 100644
--- a/arts/modules/synth/synth_brickwall_limiter_impl.cc
+++ b/arts/modules/synth/synth_brickwall_limiter_impl.cpp
diff --git a/arts/modules/synth/synth_capture_wav_impl.cc b/arts/modules/synth/synth_capture_wav_impl.cpp
index 84e91648..84e91648 100644
--- a/arts/modules/synth/synth_capture_wav_impl.cc
+++ b/arts/modules/synth/synth_capture_wav_impl.cpp
diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cpp
index 0ab3255d..0ab3255d 100644
--- a/arts/modules/synth/synth_cdelay_impl.cc
+++ b/arts/modules/synth/synth_cdelay_impl.cpp
diff --git a/arts/modules/synth/synth_compressor_impl.cc b/arts/modules/synth/synth_compressor_impl.cpp
index b27b2be1..b27b2be1 100644
--- a/arts/modules/synth/synth_compressor_impl.cc
+++ b/arts/modules/synth/synth_compressor_impl.cpp
diff --git a/arts/modules/synth/synth_data_impl.cc b/arts/modules/synth/synth_data_impl.cpp
index 5b95d400..5b95d400 100644
--- a/arts/modules/synth/synth_data_impl.cc
+++ b/arts/modules/synth/synth_data_impl.cpp
diff --git a/arts/modules/synth/synth_debug_impl.cc b/arts/modules/synth/synth_debug_impl.cpp
index 456f4a6f..456f4a6f 100644
--- a/arts/modules/synth/synth_debug_impl.cc
+++ b/arts/modules/synth/synth_debug_impl.cpp
diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cpp
index 92c23fd1..92c23fd1 100644
--- a/arts/modules/synth/synth_delay_impl.cc
+++ b/arts/modules/synth/synth_delay_impl.cpp
diff --git a/arts/modules/synth/synth_div_impl.cc b/arts/modules/synth/synth_div_impl.cpp
index 90c19996..90c19996 100644
--- a/arts/modules/synth/synth_div_impl.cc
+++ b/arts/modules/synth/synth_div_impl.cpp
diff --git a/arts/modules/synth/synth_envelope_adsr_impl.cc b/arts/modules/synth/synth_envelope_adsr_impl.cpp
index e6f47220..e6f47220 100644
--- a/arts/modules/synth/synth_envelope_adsr_impl.cc
+++ b/arts/modules/synth/synth_envelope_adsr_impl.cpp
diff --git a/arts/modules/synth/synth_fm_source_impl.cc b/arts/modules/synth/synth_fm_source_impl.cpp
index 2c2bd0e8..2c2bd0e8 100644
--- a/arts/modules/synth/synth_fm_source_impl.cc
+++ b/arts/modules/synth/synth_fm_source_impl.cpp
diff --git a/arts/modules/synth/synth_fx_cflanger_impl.cc b/arts/modules/synth/synth_fx_cflanger_impl.cpp
index 3f67fd7a..3f67fd7a 100644
--- a/arts/modules/synth/synth_fx_cflanger_impl.cc
+++ b/arts/modules/synth/synth_fx_cflanger_impl.cpp
diff --git a/arts/modules/synth/synth_midi_debug_impl.cc b/arts/modules/synth/synth_midi_debug_impl.cpp
index 2c4cf711..2c4cf711 100644
--- a/arts/modules/synth/synth_midi_debug_impl.cc
+++ b/arts/modules/synth/synth_midi_debug_impl.cpp
diff --git a/arts/modules/synth/synth_midi_test_impl.cc b/arts/modules/synth/synth_midi_test_impl.cpp
index 91714cac..91714cac 100644
--- a/arts/modules/synth/synth_midi_test_impl.cc
+++ b/arts/modules/synth/synth_midi_test_impl.cpp
diff --git a/arts/modules/synth/synth_moog_vcf_impl.cc b/arts/modules/synth/synth_moog_vcf_impl.cpp
index 77bf5394..77bf5394 100644
--- a/arts/modules/synth/synth_moog_vcf_impl.cc
+++ b/arts/modules/synth/synth_moog_vcf_impl.cpp
diff --git a/arts/modules/synth/synth_nil_impl.cc b/arts/modules/synth/synth_nil_impl.cpp
index db7b1942..db7b1942 100644
--- a/arts/modules/synth/synth_nil_impl.cc
+++ b/arts/modules/synth/synth_nil_impl.cpp
diff --git a/arts/modules/synth/synth_noise_impl.cc b/arts/modules/synth/synth_noise_impl.cpp
index 474368e1..474368e1 100644
--- a/arts/modules/synth/synth_noise_impl.cc
+++ b/arts/modules/synth/synth_noise_impl.cpp
diff --git a/arts/modules/synth/synth_osc_impl.cc b/arts/modules/synth/synth_osc_impl.cpp
index 214c2a16..214c2a16 100644
--- a/arts/modules/synth/synth_osc_impl.cc
+++ b/arts/modules/synth/synth_osc_impl.cpp
diff --git a/arts/modules/synth/synth_pitch_shift_fft_impl.cc b/arts/modules/synth/synth_pitch_shift_fft_impl.cpp
index f356e1b8..f356e1b8 100644
--- a/arts/modules/synth/synth_pitch_shift_fft_impl.cc
+++ b/arts/modules/synth/synth_pitch_shift_fft_impl.cpp
diff --git a/arts/modules/synth/synth_pitch_shift_impl.cc b/arts/modules/synth/synth_pitch_shift_impl.cpp
index 37217c8a..37217c8a 100644
--- a/arts/modules/synth/synth_pitch_shift_impl.cc
+++ b/arts/modules/synth/synth_pitch_shift_impl.cpp
diff --git a/arts/modules/synth/synth_play_pat_impl.cc b/arts/modules/synth/synth_play_pat_impl.cpp
index 7c2699f7..7c2699f7 100644
--- a/arts/modules/synth/synth_play_pat_impl.cc
+++ b/arts/modules/synth/synth_play_pat_impl.cpp
diff --git a/arts/modules/synth/synth_pscale_impl.cc b/arts/modules/synth/synth_pscale_impl.cpp
index 72298397..72298397 100644
--- a/arts/modules/synth/synth_pscale_impl.cc
+++ b/arts/modules/synth/synth_pscale_impl.cpp
diff --git a/arts/modules/synth/synth_rc_impl.cc b/arts/modules/synth/synth_rc_impl.cpp
index 12b30260..ce0252ea 100644
--- a/arts/modules/synth/synth_rc_impl.cc
+++ b/arts/modules/synth/synth_rc_impl.cpp
@@ -60,7 +60,7 @@ public:
 
 		if (zero_lower < invalue[0] && invalue[0] < zero_upper)
 		{
-			/* for comments see equalizer.cc/Synth_STD_EQUALIZER implementation */
+			/* for comments see equalizer.cpp/Synth_STD_EQUALIZER implementation */
 			
 			/*
 			 * This implementation differs from the implementation there,
diff --git a/arts/modules/synth/synth_sequence_freq_impl.cc b/arts/modules/synth/synth_sequence_freq_impl.cpp
index e3458d74..e3458d74 100644
--- a/arts/modules/synth/synth_sequence_freq_impl.cc
+++ b/arts/modules/synth/synth_sequence_freq_impl.cpp
diff --git a/arts/modules/synth/synth_sequence_impl.cc b/arts/modules/synth/synth_sequence_impl.cpp
index dc2588f5..dc2588f5 100644
--- a/arts/modules/synth/synth_sequence_impl.cc
+++ b/arts/modules/synth/synth_sequence_impl.cpp
diff --git a/arts/modules/synth/synth_shelve_cutoff_impl.cc b/arts/modules/synth/synth_shelve_cutoff_impl.cpp
index 01880b6c..01880b6c 100644
--- a/arts/modules/synth/synth_shelve_cutoff_impl.cc
+++ b/arts/modules/synth/synth_shelve_cutoff_impl.cpp
diff --git a/arts/modules/synth/synth_std_equalizer_impl.cc b/arts/modules/synth/synth_std_equalizer_impl.cpp
index be88a708..be88a708 100644
--- a/arts/modules/synth/synth_std_equalizer_impl.cc
+++ b/arts/modules/synth/synth_std_equalizer_impl.cpp
diff --git a/arts/modules/synth/synth_tremolo_impl.cc b/arts/modules/synth/synth_tremolo_impl.cpp
index 37b42302..37b42302 100644
--- a/arts/modules/synth/synth_tremolo_impl.cc
+++ b/arts/modules/synth/synth_tremolo_impl.cpp
diff --git a/arts/modules/synth/synth_wave_pulse_impl.cc b/arts/modules/synth/synth_wave_pulse_impl.cpp
index f179b376..f179b376 100644
--- a/arts/modules/synth/synth_wave_pulse_impl.cc
+++ b/arts/modules/synth/synth_wave_pulse_impl.cpp
diff --git a/arts/modules/synth/synth_wave_softsaw_impl.cc b/arts/modules/synth/synth_wave_softsaw_impl.cpp
index 5765250d..5765250d 100644
--- a/arts/modules/synth/synth_wave_softsaw_impl.cc
+++ b/arts/modules/synth/synth_wave_softsaw_impl.cpp
diff --git a/arts/modules/synth/synth_wave_square_impl.cc b/arts/modules/synth/synth_wave_square_impl.cpp
index c5693b18..c5693b18 100644
--- a/arts/modules/synth/synth_wave_square_impl.cc
+++ b/arts/modules/synth/synth_wave_square_impl.cpp
diff --git a/arts/modules/synth/synth_wave_tri_impl.cc b/arts/modules/synth/synth_wave_tri_impl.cpp
index 2333d31c..2333d31c 100644
--- a/arts/modules/synth/synth_wave_tri_impl.cc
+++ b/arts/modules/synth/synth_wave_tri_impl.cpp
diff --git a/arts/modules/synth/synth_xfade_impl.cc b/arts/modules/synth/synth_xfade_impl.cpp
index dcbb2290..dcbb2290 100644
--- a/arts/modules/synth/synth_xfade_impl.cc
+++ b/arts/modules/synth/synth_xfade_impl.cpp
diff --git a/arts/runtime/CMakeLists.txt b/arts/runtime/CMakeLists.txt
index 794ec7f5..ac8692c4 100644
--- a/arts/runtime/CMakeLists.txt
+++ b/arts/runtime/CMakeLists.txt
@@ -31,9 +31,9 @@ add_definitions(
 
 tde_add_library( artsbuilder SHARED
   SOURCES
-    artsbuilder.cc sequenceutils.cc
-    structurebuilder_impl.cc structures_impl.cc moduleinfo.cc
-    compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+    artsbuilder.cpp sequenceutils.cpp
+    structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp
+    compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
   VERSION 0.0.0
   LINK
     mcop artsflow artsflow_idl ${DL_LIBRARIES} ${ARTS_LIBRARIES}
@@ -42,7 +42,7 @@ tde_add_library( artsbuilder SHARED
 
 add_custom_command(
   OUTPUT
-    artsbuilder.cc artsbuilder.h
+    artsbuilder.cpp artsbuilder.h
     artsbuilder.mcoptype artsbuilder.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsbuilder.idl
diff --git a/arts/runtime/Makefile.am b/arts/runtime/Makefile.am
index d97ad50b..5a883d83 100644
--- a/arts/runtime/Makefile.am
+++ b/arts/runtime/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(arts_includes) $(all_includes)
 
 lib_LTLIBRARIES = libartsbuilder.la
 
-libartsbuilder_la_SOURCES = artsbuilder.cc sequenceutils.cc \
-  structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
-  compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+libartsbuilder_la_SOURCES = artsbuilder.cpp sequenceutils.cpp \
+  structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp \
+  compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
 
 libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
 libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
@@ -19,10 +19,10 @@ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 artsbuilder.lo: artsbuilder.h
 artsbuilder.mcopclass: artsbuilder.h
 artsbuilder.mcoptype: artsbuilder.h
-artsbuilder.h artsbuilder.cc: $(srcdir)/artsbuilder.idl $(MCOPIDL)
+artsbuilder.h artsbuilder.cpp: $(srcdir)/artsbuilder.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(arts_includes) $(srcdir)/artsbuilder.idl
 
-DISTCLEANFILES = artsbuilder.cc artsbuilder.h \
+DISTCLEANFILES = artsbuilder.cpp artsbuilder.h \
   artsbuilder.mcoptype artsbuilder.mcopclass
 
 ####### install idl files
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393a..4cc62329 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -1,5 +1,5 @@
 /*
- * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/runtime/artsbuilderloader_impl.cc b/arts/runtime/artsbuilderloader_impl.cpp
index 238daae2..238daae2 100644
--- a/arts/runtime/artsbuilderloader_impl.cc
+++ b/arts/runtime/artsbuilderloader_impl.cpp
diff --git a/arts/runtime/compatibility.cc b/arts/runtime/compatibility.cpp
index 72bed765..72bed765 100644
--- a/arts/runtime/compatibility.cc
+++ b/arts/runtime/compatibility.cpp
diff --git a/arts/runtime/localfactory_impl.cc b/arts/runtime/localfactory_impl.cpp
index bf55271c..bf55271c 100644
--- a/arts/runtime/localfactory_impl.cc
+++ b/arts/runtime/localfactory_impl.cpp
diff --git a/arts/runtime/moduleinfo.cc b/arts/runtime/moduleinfo.cpp
index 7bef4464..7bef4464 100644
--- a/arts/runtime/moduleinfo.cc
+++ b/arts/runtime/moduleinfo.cpp
diff --git a/arts/runtime/sequenceutils.cc b/arts/runtime/sequenceutils.cpp
index 335287d4..335287d4 100644
--- a/arts/runtime/sequenceutils.cc
+++ b/arts/runtime/sequenceutils.cpp
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cpp
index 43e5485c..43e5485c 100644
--- a/arts/runtime/structurebuilder_impl.cc
+++ b/arts/runtime/structurebuilder_impl.cpp
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cpp
index 7c5a5e05..7c5a5e05 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cpp