87 files changed, 182 insertions, 278 deletions

diff --git a/arts/modules/CMakeLists.txt b/arts/modules/CMakeLists.txt
index 9f37038c..0cc76da1 100644
--- a/arts/modules/CMakeLists.txt
+++ b/arts/modules/CMakeLists.txt
@@ -39,10 +39,10 @@ link_directories(
 
 tde_add_library( artsmodules SHARED
   SOURCES
-    artsmodules.cc
+    artsmodules.cpp
   VERSION 0.0.0
   LINK
-    tdecore-shared ${DL_LIBRARIES} mcop artsflow
+    tdecore-shared ${CMAKE_DL_LIBS} mcop artsflow
     artsbuilder-shared artsgui_idl-shared artsmidi_idl-shared
     artsmodulescommon-shared artsmodulessynth-shared
     artsmoduleseffects-shared artsmodulesmixers-shared
@@ -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..d8ca4dde 100644
--- a/arts/modules/README.environments
+++ b/arts/modules/README.environments
@@ -25,28 +25,28 @@ for composing a song, you might require
  - several audio tracks
  - a mixer
 
-While with artscontrol, the user can setup much of this himself manually, the
-problem is that this has to be done over and over again. That is, if he saves
-the song, the settings of his effects, instruments and the mixer will not be
-saved with it.
+While with artscontrol, the users can setup much of this themselves manually,
+the problem is that this has to be done over and over again. That is, if they
+save the song, the settings of their effects, instruments and the mixer will
+not be saved with it.
 
 The main idea of the new interfaces in Arts::Environment is that the sequencer
 can save the environment required to create a song along with the the song, so
-that the user will find himself surrounded by the same effects, instruments,...
-with the same settings again, once he loads the song again.
-
-So, conceptually, we can imagine the environment as a "room", where the user
-works in to create a song. He needs to install the things inside the room he
-needs. Initially, the room will be empty. Now, the user things: oh, I am going
-to need this nice 24 channel mixer. *plop* - it appears in the room. Now he
-thinks I need some sampler which can play my piano.  *plop* - it appears in
-the room.
-
-Now he starts working, and adds the "items" he needs. Finally, if he stops
-working on the song, he can pack all what is in the environment in a little
-box, and whenever he starts working on the song again, he can start where he
-left off. He can even take the environment to a friend, and continue working
-on the song there.
+that the users will find themselves surrounded by the same effects,
+instruments,... with the same settings again, once they load the song again.
+
+So, conceptually, we can imagine the environment as a "room", where a user
+works in to create a song. They needs to install the things inside the room
+they need. Initially, the room will be empty. Now, the user thinks: oh, I am
+going to need this nice 24 channel mixer. *plop* - it appears in the room.
+Now they think: I need some sampler which can play my piano.  *plop* - it
+appears in the room.
+
+Now they starts working, adding the "items" they need. Finally, if they stop
+working on the song, they can pack all what is in the environment in a little
+box, and whenever they starts working on the song again, they can start where
+they left off. They can even take the environment to a friend, and continue
+working on the song there.
 
 Note that there might be other tasks (such as creating a film, playing an
 mp3 with noatun,...) which will have similar requirements of saving the
@@ -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 1841d23d..8c795014 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 8e7e48e8..6671031b 100644
--- a/arts/modules/common/effectrackslot_impl.cc
+++ b/arts/modules/common/effectrackslot_impl.cpp
@@ -112,5 +112,3 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 };
 REGISTER_IMPLEMENTATION( EffectRackSlot_impl );
 }
-
-// vim: sw=4 ts=4
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 50fb116e..c082ce24 100644
--- a/arts/modules/common/env_effectrackitem_impl.cc
+++ b/arts/modules/common/env_effectrackitem_impl.cpp
@@ -397,4 +397,3 @@ public:
 };
 REGISTER_IMPLEMENTATION(EffectRackGuiFactory_impl);
 }
-// vim:ts=4:sw=4
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 6fee8b44..93735dd5 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cpp
@@ -365,4 +365,3 @@ public:
 };
 REGISTER_IMPLEMENTATION(MixerGuiFactory_impl);
 }
-// vim:ts=4:sw=4
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 430c4fad..639307a8 100644
--- a/arts/modules/effects/effect_wavecapture_impl.cc
+++ b/arts/modules/effects/effect_wavecapture_impl.cpp
@@ -59,5 +59,3 @@ void Effect_WAVECAPTURE_impl::streamEnd()
 REGISTER_IMPLEMENTATION(Effect_WAVECAPTURE_impl);
 
 }
-
-// vim:ts=4:sw=4
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/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index e6e0c54c..d7f8d30b 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
 KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
 {
 	//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
-	_mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
+	_mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
 	this->addWidget( _label, -100 );
 	_label.bottom( Arts::East );
 	_label.text( "Volume" );
@@ -126,7 +126,5 @@ void KStereoVolumeControlGui_impl::updateValues() {
 }
 
 REGISTER_IMPLEMENTATION( KStereoVolumeControlGui_impl );
-
-// vim: sw=4 ts=4
 #include "kstereovolumecontrolgui_impl.moc"
 
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index b562b988..ff5d96dd 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -80,7 +80,7 @@ private:
 #include <tqtimer.h>
 
 class KStereoVolumeControlGui_EventMapper : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TQTimer* _timer;
@@ -88,11 +88,10 @@ public:
 public:
 	KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
 		_timer = new TQTimer( this );
-		connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
+		connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimerSignal() ) );
 	}
 public slots:
 	void slotTimerSignal() { _impl->updateValues(); }
 };
 
 #endif
-// vim: sw=4 ts=4
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 0dd523e8..295ad65d 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cpp
@@ -106,9 +106,6 @@ public:
 		return hbox;
 	}
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(StereoCompressorGuiFactory_impl);
 
 }
diff --git a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
index 5a5e2a06..5db32751 100644
--- a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
+++ b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
@@ -41,5 +41,3 @@ public:
 REGISTER_IMPLEMENTATION( StereoVolumeControlGuiFactory_impl );
 
 }
-// vim: sw=4 ts=4
-
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 2707c334..3add8d46 100644
--- a/arts/modules/effects/synth_stereo_compressor_impl.cc
+++ b/arts/modules/effects/synth_stereo_compressor_impl.cpp
@@ -127,9 +127,6 @@ private:
 	}
 
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(Synth_STEREO_COMPRESSOR_impl);
 
 }
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 e35949a0..2ade0879 100644
--- a/arts/modules/effects/synth_voice_removal_impl.cc
+++ b/arts/modules/effects/synth_voice_removal_impl.cpp
@@ -104,5 +104,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_VOICE_REMOVAL_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cpp
index d4879b87..dc9dce20 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cpp
@@ -72,5 +72,3 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
 
 	return hbox;
 }
-
-// vim: ts=4 sw=4
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 ab35e4fc..28fbab55 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cpp
@@ -92,5 +92,3 @@ namespace Arts {
 	};
 	REGISTER_IMPLEMENTATION(MonoSimpleMixerChannelGuiFactory_impl);
 }
-
-// vim:ts=4:sw=4
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 0a36470d..73ab31e2 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cpp
@@ -80,7 +80,3 @@ namespace Arts {
 	};
 	REGISTER_IMPLEMENTATION(SimpleMixerChannelGuiFactory_impl);
 }
-
-
-// vim:ts=4:sw=4
-
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/c_filter_stuff.c b/arts/modules/synth/c_filter_stuff.c
index 531d5015..c3a42697 100644
--- a/arts/modules/synth/c_filter_stuff.c
+++ b/arts/modules/synth/c_filter_stuff.c
@@ -42,8 +42,7 @@
 /*#define SPN MINDOUBLE*/
 #define SPN 0.00001
 
-double bw2angle(a,bw)
-double a,bw;
+double bw2angle(double a, double bw)
 {
   double T,d,sn,cs,mag,delta,theta,tmp,a2,a4,asnd;
 
@@ -63,8 +62,8 @@ double a,bw;
   return(theta/(2.0*PI));
 }
 
-void presence(cf,boost,bw,a0,a1,a2,b1,b2)
-double cf,boost,bw,*a0,*a1,*a2,*b1,*b2;
+void presence(double cf, double boost, double bw, double *a0,
+              double *a1, double *a2, double *b1, double *b2)
 {
   double a,A,F,xfmbw,C,tmp,alphan,alphad,b0,recipb0,asq,F2,a2plus1,ma2plus1;
 
@@ -100,8 +99,8 @@ double cf,boost,bw,*a0,*a1,*a2,*b1,*b2;
   *b2 *= recipb0;
 }
 
-void shelve(cf,boost,a0,a1,a2,b1,b2)
-double cf,boost,*a0,*a1,*a2,*b1,*b2;
+void shelve(double cf, double boost, double *a0, double *a1,
+            double *a2, double *b1, double *b2)
 {
   double a,A,F,tmp,b0,recipb0,asq,F2,gamma2,siggam2,gam2p1;
   double gamman,gammad,ta0,ta1,ta2,tb0,tb1,tb2,aa1,ab1;
@@ -160,9 +159,7 @@ void initfilter(filter *f)
   f->y = 0.0;
 }
 
-void setfilter_presence(f,freq,boost,bw)
-filter *f;
-double freq,boost,bw;
+void setfilter_presence(filter *f, double freq, double boost, double bw)
 {
   presence(freq/(double)SR,boost,bw/(double)SR,
            &f->cx,&f->cx1,&f->cx2,&f->cy1,&f->cy2);
@@ -196,9 +193,7 @@ void setfilter_shelvelowpass(filter *f, double freq, double boost)
  * As in ''An introduction to digital filter theory'' by Julius O. Smith
  * and in Moore's book; I use the normalized version in Moore's book.
  */
-void setfilter_2polebp(f,freq,R)
-filter *f;
-double freq,R;
+void setfilter_2polebp(filter *f, double freq, double R)
 {
   double theta;
 
@@ -217,9 +212,7 @@ double freq,R;
  *   for digital audio equalization
  *   JAES, Vol. 34, No. 6, 1986 June
  */
-void setfilter_peaknotch(f,freq,M,bw)
-filter *f;
-double freq,M,bw;
+void setfilter_peaknotch(filter *f, double freq, double M, double bw)
 {
   double w0,om,ta,d,  p=0.0 /* prevents compiler warning */;
 
@@ -244,9 +237,7 @@ double freq,M,bw;
  * Some JAES's article on ladder filter.
  * freq (Hz), gdb (dB), bw (Hz)
  */
-void setfilter_peaknotch2(f,freq,gdb,bw)
-filter *f;
-double freq,gdb,bw;
+void setfilter_peaknotch2(filter *f, double freq, double gdb, double bw)
 {
   double k,w,bwr,abw,gain;
 
@@ -262,9 +253,7 @@ double freq,gdb,bw;
   f->cy2 = -abw;
 }
 
-double applyfilter(f,x)
-filter *f;
-double x;
+double applyfilter(filter *f, double x)
 {
   f->x = x;
   f->y = f->cx * f->x + f->cx1 * f->x1 + f->cx2 * f->x2
@@ -281,8 +270,7 @@ double x;
  */
 
 #if 0
-int saturate16(x)
-double x;
+int saturate16(double x)
 {
   if (x > 32765.0) {
     return(32765);
@@ -291,9 +279,7 @@ double x;
   } else return((int)x);
 }
 
-void initdelay(d,n)
-delay *d;
-int n;
+void initdelay(delay *d, int n)
 {
   int i;
 
@@ -304,8 +290,7 @@ int n;
   for(i = 0; i < n; i++) d->buf[i] = 0.0;
 }
 
-double readdelay(d)
-delay *d;
+double readdelay(delay *d)
 {
   double y;
 
@@ -315,18 +300,14 @@ delay *d;
   return(y);
 }
 
-void writedelay(d,x)
-delay *d;
-double x;
+void writedelay(delay *d, double x)
 {
   d->buf[d->wloc] = x;
   d->wloc++;
   if (d->wloc == d->len) d->wloc = 0;
 }
 
-void initringbufferd(rb,n)
-ringbufferd *rb;
-int n;
+void initringbufferd(ringbufferd *rb, int n)
 {
   int i;
 
@@ -336,9 +317,7 @@ int n;
   for(i = 0; i < n; i++) rb->buf[i] = 0.0;
 }
 
-double readringbufferd(rb,n)
-ringbufferd *rb;
-int n;
+double readringbufferd(ringbufferd *rb, int n)
 {
   int i;
 
@@ -348,18 +327,14 @@ int n;
   return(rb->buf[i]);
 }
 
-void writeringbufferd(rb,x)
-ringbufferd *rb;
-double x;
+void writeringbufferd(ringbufferd *rb, double x)
 {
   rb->buf[rb->wloc] = x;
   rb->wloc++;
   if (rb->wloc == rb->len) rb->wloc = 0;
 }
 
-void initringbufferi(rb,n)
-ringbufferi *rb;
-int n;
+void initringbufferi(ringbufferd *rb, int n)
 {
   int i;
 
@@ -369,9 +344,7 @@ int n;
   for(i = 0; i < n; i++) rb->buf[i] = 0;
 }
 
-int readringbufferi(rb,n)
-ringbufferi *rb;
-int n;
+int readringbufferi(ringbufferd *rb, int n)
 {
   int i;
 
@@ -381,9 +354,7 @@ int n;
   return(rb->buf[i]);
 }
 
-void writeringbufferi(rb,x)
-ringbufferi *rb;
-int x;
+void writeringbufferi(ringbufferd *rb, int x)
 {
   rb->buf[rb->wloc] = x;
   rb->wloc++;
@@ -396,8 +367,7 @@ int buffi[BUFFSIZE];
 int **buffs;
 
 
-int makenodes(n)
-int n;
+int makenodes(int n)
 {
   int *p;
   int i;
@@ -407,8 +377,7 @@ int n;
   return((int)p);
 }
 
-int makeints(n)
-int n;
+int makeints(int n)
 {
   int *p;
   int i;
@@ -419,13 +388,9 @@ int n;
 }
 
 /*
-
 constant memory size:
  (i) one big malloc
  (ii) many mallocs, upper limit in doing mallocs 
-
-
-
  */
 
 
@@ -461,10 +426,7 @@ constant memory size:
  *
  */
 /*
-int newfreadbufs(buf,n,p)
-short **buf;
-int n;
-ty_audiofile *p;
+int newfreadbufs(short **buf, int n, ty_audiofile *p)
 {
   if (n*p->afsc > BUFFSIZE) {
     fprintf(stderr,"freadbufi: reading too many samples\n");
@@ -475,10 +437,7 @@ ty_audiofile *p;
   return(m);
 }
    
-int newfreadbufi(buf,n,p)
-int **buf;
-int n;
-ty_audiofile *p;
+int newfreadbufi(int **buf, int n, ty_audiofile *p)
 {
   if (n*p->afsc > BUFFSIZE) {
     fprintf(stderr,"freadbufi: reading too many samples\n");
@@ -489,10 +448,7 @@ ty_audiofile *p;
   return(m);
 }
    
-int newfreadbuff(buf,n,p)
-float **buf;
-int n;
-ty_audiofile *p;
+int newfreadbuff(float **buf, int n, ty_audiofile *p)
 {
   if (n*p->afsc > BUFFSIZE) {
     fprintf(stderr,"freadbufi: reading too many samples\n");
@@ -504,9 +460,7 @@ ty_audiofile *p;
 }
 
 
-int newfreadbuf(buf,p)
-ty_buffer *buf;
-ty_audiofile *p;
+int newfreadbuf(ty_buffer **buf, ty_audiofile *p)
 {
   
 }
@@ -519,10 +473,7 @@ ty_audiofile *p;
  * Return value is the number of the samples read.
  */
 
-int freadbuf(buf,n,p)
-int **buf;
-int n;
-ty_audiofile *p;
+int freadbuf(int **buf, int n, ty_audiofile *p)
 {
   int h,i,j,k,l,s;
   unsigned int us;
@@ -571,10 +522,7 @@ ty_audiofile *p;
 }
 
 
-int fwritebuf(buf,n,p)
-int **buf;
-int n;
-ty_audiofile *p;
+int fwritebuf(int **buf, int n, ty_audiofile *p)
 {
   int h,i,j,k,l,s;
   unsigned int us1,us2;
@@ -640,10 +588,7 @@ ty_audiofile *p;
 }
 
 
-ty_audiofile *initaf(afm,afn,aft)
-ty_afmethod *afm;
-ty_afname *afn;
-ty_aftype *aft;
+ty_audiofile *initaf(ty_afmethod *afm, ty_afname *afn, ty_aftype *aft)
 {
   ty_audiofile *p;
   int i,j,k,n,s;
@@ -769,8 +714,7 @@ void bye()
 }
 
 
-ty_sample *makesample(sc)
-int sc;
+ty_sample *makesample(int sc)
 {
   ty_sample *p;
 
@@ -780,10 +724,7 @@ int sc;
 }
 
 
-int readsample(p,n,s)
-ty_audiofile *p;
-int n;
-ty_sample *s;
+int readsample(ty_audiofile *p, int n, ty_sample *s)
 {
   int i,j,k,dt,l;
   FILE *fp;
@@ -839,10 +780,7 @@ ty_sample *s;
 }
 
 
-int writesample(p,n,s)
-ty_audiofile *p;
-int n;
-ty_sample *s;
+int writesample(ty_audiofile *p, int n, ty_sample *s)
 {
   int i,j,k,dt,l;
   FILE *fp;
@@ -878,8 +816,7 @@ ty_afmethod *afmethod_flowout()
   return(p);
 }
 
-ty_afmethod *afmethod_rb(n)
-int n;
+ty_afmethod *afmethod_rb(int n)
 {
   ty_afmethod *p;
 
@@ -902,8 +839,7 @@ ty_afmethod *afmethod_aimro()
   return(p);
 }
 
-ty_afname *afname(s)
-char *s;
+ty_afname *afname(char *s)
 {
   ty_afname *p;
 
@@ -936,8 +872,7 @@ ty_afname *afname_stdout()
   return(p);
 }
 
-ty_aftype *aftype(sr,sc,stype)
-int sr,sc,stype;
+ty_aftype *aftype(int sr, int sc, int stype)
 {
   ty_aftype *p;
 
@@ -954,8 +889,7 @@ ty_aftype *aftype_defstereo()
 }
 
 
-ty_audiofile *initaf_aimdefstereo(filename)
-char *filename;
+ty_audiofile *initaf_aimdefstereo(char *filename)
 {
   return(initaf(afmethod_aimro(),afname(filename),aftype_defstereo()));
 }
diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h
index 89e93de3..4f3d7f6a 100644
--- a/arts/modules/synth/c_filter_stuff.h
+++ b/arts/modules/synth/c_filter_stuff.h
@@ -40,16 +40,18 @@ typedef struct {
   double x,x1,x2,y,y1,y2;
 } filter;
 
-void presence();
-void shelve();
+void presence(double cf, double boost, double bw, double *a0,
+              double *a1, double *a2, double *b1, double *b2);
+void shelve(double cf, double boost, double *a0, double *a1,
+              double *a2, double *b1, double *b2);
 void initfilter(filter *f);
-void setfilter_presence();
+void setfilter_presence(filter *f, double freq, double boost, double bw);
 void setfilter_shelve(filter *f, double freq, double boost);
 void setfilter_shelvelowpass(filter *f, double freq, double boost);
-void setfilter_2polebp();
-void setfilter_peaknotch();
-void setfilter_peaknotch2();
-double applyfilter();
+void setfilter_2polebp(filter *f, double freq, double R);
+void setfilter_peaknotch(filter *f, double freq, double M, double bw);
+void setfilter_peaknotch2(filter *f, double freq, double gdb, double bw);
+double applyfilter(filter *f, double x);
 
 #ifdef __cplusplus
 }
@@ -208,38 +210,38 @@ typedef struct {
 
 ty_audiofile *gaf[C_MAXAUDIOFILES];
 
-int makenodes();
-int makeints();
+int makenodes(int n);
+int makeints(int n);
 /*
-int freadbuf();
-int fwritebuf();
+int freadbuf(int **buf, int n, ty_audiofile *p);
+int fwritebuf(int **buf, int n, ty_audiofile *p);
 */
-ty_audiofile *initaf();
+ty_audiofile *initaf(ty_afmethod *afm, ty_afname *afn, ty_aftype *aft);
 void bye();
-ty_sample *makesample();
-int readsample();
-int writesample();
+ty_sample *makesample(int sc);
+int readsample(ty_audiofile *p, int n, ty_sample *s);
+int writesample(ty_audiofile *p, int n, ty_sample *s);
 ty_afmethod *afmethod_flowout();
-ty_afmethod *afmethod_rb();
+ty_afmethod *afmethod_rb(int n);
 ty_afmethod *afmethod_aimro();
-ty_afname *afname();
+ty_afname *afname(char *s);
 ty_afname *afname_stdin();
 ty_afname *afname_stdout();
-ty_aftype *aftype();
+ty_aftype *aftype(int sr, int sc, int stype);
 ty_aftype *aftype_defstereo();
-ty_audiofile *initaf_aimdefstereo();
+ty_audiofile *initaf_aimdefstereo(char *filename);
 ty_audiofile *initaf_stdin();
 void init();
-int saturate16();
-void initdelay();
-double readdelay();
-void writedelay();
-void initringbufferd();
-double readringbufferd();
-void writeringbufferd();
-void initringbufferi();
-int readringbufferi();
-void writeringbufferi();
+int saturate16(double x);
+void initdelay(delay *d, int n);
+double readdelay(delay *d);
+void writedelay(delay *d, double x);
+void initringbufferd(ringbufferd *rb, int n);
+double readringbufferd(ringbufferd *rb, int n);
+void writeringbufferd(ringbufferd *rb, double x);
+void initringbufferi(ringbufferd *rb, int n);
+int readringbufferi(ringbufferd *rb, int n);
+void writeringbufferi(ringbufferd *rb, int x);
 #endif
 
 #endif // C_FILTER_STUFF_H
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 28f4d12f..0ab3255d 100644
--- a/arts/modules/synth/synth_cdelay_impl.cc
+++ b/arts/modules/synth/synth_cdelay_impl.cpp
@@ -119,7 +119,4 @@ public:
 		}
 	}
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(Synth_CDELAY_impl);
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 0014d535..e3458d74 100644
--- a/arts/modules/synth/synth_sequence_freq_impl.cc
+++ b/arts/modules/synth/synth_sequence_freq_impl.cpp
@@ -128,4 +128,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_SEQUENCE_FREQ_impl);
-// vim: sw=4 ts=4 noet
diff --git a/arts/modules/synth/synth_sequence_impl.cc b/arts/modules/synth/synth_sequence_impl.cpp
index 981f0bba..dc2588f5 100644
--- a/arts/modules/synth/synth_sequence_impl.cc
+++ b/arts/modules/synth/synth_sequence_impl.cpp
@@ -129,4 +129,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_SEQUENCE_impl);
-// vim: sw=4 ts=4 noet
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