[beast/devel: 2/27] BSE: renamed C++ headers to .hh



commit 5cdf533a36ee32b03407d9222f2f9c5a60de4c53
Author: Tim Janik <timj gnu org>
Date:   Sun Dec 23 15:40:18 2012 +0100

    BSE: renamed C++ headers to .hh

 beast-gtk/bstmain.cc                               |    2 +-
 beast-gtk/bststest.cc                              |    6 +-
 beast-gtk/testgui.cc                               |    2 +-
 bse/Makefile.am                                    |   68 ++++++++++----------
 bse/{bse.h => bse.hh}                              |    0
 bse/bseautodoc.cc                                  |    8 +-
 bse/bsebiquadfilter.cc                             |    8 +-
 bse/{bsebiquadfilter.h => bsebiquadfilter.hh}      |    4 +-
 bse/bseblockutils.hh                               |    2 +-
 bse/bsebus.cc                                      |   20 +++---
 bse/{bsebus.h => bsebus.hh}                        |    2 +-
 bse/bsebus.proc                                    |   12 ++--
 bse/bsecategories.cc                               |    4 +-
 bse/{bsecategories.h => bsecategories.hh}          |    2 +-
 bse/bsecategories.proc                             |    6 +-
 bse/bsecompat.cc                                   |    4 +-
 bse/{bsecompat.h => bsecompat.hh}                  |    2 +-
 bse/bseconstant.cc                                 |    6 +-
 bse/{bseconstant.h => bseconstant.hh}              |    2 +-
 bse/bseconstvalues.cc                              |    2 +-
 bse/{bseconstvalues.h => bseconstvalues.hh}        |    2 +-
 bse/bsecontainer.cc                                |   14 ++--
 bse/{bsecontainer.h => bsecontainer.hh}            |    4 +-
 bse/bsecontainer.proc                              |    6 +-
 bse/bsecontextmerger.cc                            |    8 +-
 bse/{bsecontextmerger.h => bsecontextmerger.hh}    |    2 +-
 bse/bsecore.cc                                     |   10 ++--
 bse/bsecsynth.cc                                   |    2 +-
 bse/{bsecsynth.h => bsecsynth.hh}                  |    2 +-
 bse/bsecsynth.proc                                 |    8 +-
 bse/bsecxxbase.hh                                  |    2 +-
 bse/bsecxxclosure.cc                               |    2 +-
 bse/bsecxxclosure.hh                               |    2 +-
 bse/bsecxxmodule.cc                                |    6 +-
 bse/bsecxxmodule.hh                                |    4 +-
 bse/bsecxxplugin.cc                                |    4 +-
 bse/bsecxxplugin.hh                                |   10 ++--
 bse/bsecxxutils.cc                                 |    4 +-
 bse/bsecxxutils.hh                                 |    2 +-
 bse/bsedatahandle-fir.cc                           |    6 +-
 bse/bsedatahandle-resample.cc                      |    2 +-
 bse/bsedatapocket.cc                               |    6 +-
 bse/{bsedatapocket.h => bsedatapocket.hh}          |    2 +-
 bse/bsedatapocket.proc                             |    6 +-
 bse/{bsedefs.h => bsedefs.hh}                      |    4 +-
 bse/bsedevice.cc                                   |    2 +-
 bse/{bsedevice.h => bsedevice.hh}                  |    2 +-
 bse/bseeditablesample.cc                           |    8 +-
 bse/{bseeditablesample.h => bseeditablesample.hh}  |    4 +-
 bse/bseeditablesample.proc                         |    8 +-
 bse/bseengine.cc                                   |   10 ++--
 bse/{bseengine.h => bseengine.hh}                  |    4 +-
 bse/bseenginemaster.cc                             |   14 ++--
 bse/{bseenginemaster.h => bseenginemaster.hh}      |    2 +-
 bse/{bseenginenode.h => bseenginenode.hh}          |    4 +-
 bse/bseengineschedule.cc                           |    4 +-
 bse/{bseengineschedule.h => bseengineschedule.hh}  |    2 +-
 bse/bseengineutils.cc                              |   10 ++--
 bse/{bseengineutils.h => bseengineutils.hh}        |    4 +-
 bse/bseenums.cc                                    |    4 +-
 bse/{bseenums.h => bseenums.hh}                    |    6 +-
 bse/bseenums.proc                                  |    6 +-
 bse/{bseexports.h => bseexports.hh}                |    4 +-
 bse/bsefilter-ellf.cc                              |    2 +-
 bse/bsefilter.cc                                   |    2 +-
 bse/{bsefilter.h => bsefilter.hh}                  |    2 +-
 bse/bsegconfig.cc                                  |    6 +-
 bse/{bsegconfig.h => bsegconfig.hh}                |    6 +-
 bse/{bsegenclosures.h => bsegenclosures.hh}        |    0
 bse/bseglobals.cc                                  |    4 +-
 bse/{bseglobals.h => bseglobals.hh}                |    8 +-
 bse/bseglue.cc                                     |   12 ++--
 bse/{bseglue.h => bseglue.hh}                      |    2 +-
 bse/{bseieee754.h => bseieee754.hh}                |    2 +-
 bse/{bseincluder.h => bseincluder.hh}              |    2 +-
 bse/bseinfo.cc                                     |    6 +-
 bse/{bseinstrument.h => bseinstrument.hh}          |    2 +-
 bse/bseinstrumentinput.cc                          |    8 +-
 ...{bseinstrumentinput.h => bseinstrumentinput.hh} |    2 +-
 bse/bseinstrumentoutput.cc                         |    8 +-
 ...seinstrumentoutput.h => bseinstrumentoutput.hh} |    2 +-
 bse/bseitem.cc                                     |   20 +++---
 bse/{bseitem.h => bseitem.hh}                      |    2 +-
 bse/bseitem.proc                                   |   12 ++--
 bse/bsejanitor.cc                                  |   14 ++--
 bse/{bsejanitor.h => bsejanitor.hh}                |    2 +-
 bse/bsejanitor.proc                                |    8 +-
 bse/bseladspa.cc                                   |    8 +-
 bse/{bseladspa.h => bseladspa.hh}                  |    2 +-
 bse/bseladspamodule.cc                             |    8 +-
 bse/{bseladspamodule.h => bseladspamodule.hh}      |    4 +-
 bse/bseloader-aiff.cc                              |    8 +-
 bse/bseloader-bsewave.cc                           |   10 ++--
 bse/bseloader-guspatch.cc                          |    2 +-
 bse/bseloader-mad.cc                               |    4 +-
 bse/bseloader-oggvorbis.cc                         |    6 +-
 bse/bseloader-wav.cc                               |    4 +-
 bse/bseloader.cc                                   |   12 ++--
 bse/{bseloader.h => bseloader.hh}                  |    4 +-
 bse/bsemain.cc                                     |   26 ++++----
 bse/{bsemain.h => bsemain.hh}                      |    6 +-
 bse/bsemath.cc                                     |    2 +-
 bse/{bsemath.h => bsemath.hh}                      |    6 +-
 bse/bsemathsignal.cc                               |    2 +-
 bse/{bsemathsignal.h => bsemathsignal.hh}          |    6 +-
 bse/bsemidicontroller.cc                           |   10 ++--
 bse/{bsemidicontroller.h => bsemidicontroller.hh}  |    4 +-
 bse/bsemididecoder.cc                              |    6 +-
 bse/{bsemididecoder.h => bsemididecoder.hh}        |    2 +-
 bse/bsemididevice-null.cc                          |    4 +-
 ...{bsemididevice-null.h => bsemididevice-null.hh} |    4 +-
 bse/bsemididevice-oss.cc                           |   10 ++--
 bse/{bsemididevice-oss.h => bsemididevice-oss.hh}  |    4 +-
 bse/bsemididevice.cc                               |    4 +-
 bse/{bsemididevice.h => bsemididevice.hh}          |    6 +-
 bse/bsemidievent.cc                                |    8 +-
 bse/{bsemidievent.h => bsemidievent.hh}            |    2 +-
 bse/bsemidifile.cc                                 |    8 +-
 bse/{bsemidifile.h => bsemidifile.hh}              |    2 +-
 bse/bsemidiinput.cc                                |   10 ++--
 bse/{bsemidiinput.h => bsemidiinput.hh}            |    4 +-
 bse/bsemidinotifier.cc                             |    6 +-
 bse/{bsemidinotifier.h => bsemidinotifier.hh}      |    4 +-
 bse/bsemidinotifier.proc                           |    6 +-
 bse/bsemidireceiver.cc                             |   12 ++--
 bse/{bsemidireceiver.h => bsemidireceiver.hh}      |    4 +-
 bse/bsemidisynth.cc                                |   18 +++---
 bse/{bsemidisynth.h => bsemidisynth.hh}            |    6 +-
 bse/bsemidivoice.cc                                |   12 ++--
 bse/{bsemidivoice.h => bsemidivoice.hh}            |    4 +-
 bse/bsenote.cc                                     |    8 +-
 bse/{bsenote.h => bsenote.hh}                      |    4 +-
 bse/bseobject.cc                                   |   14 ++--
 bse/{bseobject.h => bseobject.hh}                  |    4 +-
 bse/bseparam.cc                                    |    4 +-
 bse/{bseparam.h => bseparam.hh}                    |    4 +-
 bse/bseparasite.cc                                 |    6 +-
 bse/{bseparasite.h => bseparasite.hh}              |    2 +-
 bse/bseparasite.proc                               |    6 +-
 bse/bsepart.cc                                     |   16 ++--
 bse/{bsepart.h => bsepart.hh}                      |    2 +-
 bse/bsepart.proc                                   |    8 +-
 bse/{bsepattern.h => bsepattern.hh}                |    4 +-
 bse/{bsepatterngroup.h => bsepatterngroup.hh}      |    4 +-
 bse/bsepcmdevice-null.cc                           |    6 +-
 bse/{bsepcmdevice-null.h => bsepcmdevice-null.hh}  |    2 +-
 bse/bsepcmdevice-oss.cc                            |    6 +-
 bse/{bsepcmdevice-oss.h => bsepcmdevice-oss.hh}    |    4 +-
 bse/bsepcmdevice.cc                                |    4 +-
 bse/{bsepcmdevice.h => bsepcmdevice.hh}            |    4 +-
 bse/bsepcminput.cc                                 |    8 +-
 bse/{bsepcminput.h => bsepcminput.hh}              |    2 +-
 bse/bsepcmmodule.cc                                |    4 +-
 bse/bsepcmoutput.cc                                |    8 +-
 bse/{bsepcmoutput.h => bsepcmoutput.hh}            |    2 +-
 bse/bsepcmwriter.cc                                |    6 +-
 bse/{bsepcmwriter.h => bsepcmwriter.hh}            |    2 +-
 bse/bseplugin.cc                                   |   12 ++--
 bse/{bseplugin.h => bseplugin.hh}                  |    4 +-
 bse/bseprobe.cc                                    |   10 ++--
 bse/bseprocedure.cc                                |   12 ++--
 bse/{bseprocedure.h => bseprocedure.hh}            |    2 +-
 bse/bseprocedure.proc                              |   12 ++--
 bse/bseprocidl.cc                                  |    8 +-
 bse/bseproject.cc                                  |   32 +++++-----
 bse/{bseproject.h => bseproject.hh}                |    2 +-
 bse/bseproject.proc                                |   28 ++++----
 bse/bsequery.cc                                    |   10 ++--
 bse/bsescripthelper.cc                             |   12 ++--
 bse/{bsescripthelper.h => bsescripthelper.hh}      |    2 +-
 bse/bsescripthelper.proc                           |    6 +-
 bse/bsesequencer.cc                                |   20 +++---
 bse/{bsesequencer.h => bsesequencer.hh}            |    2 +-
 bse/bseserver.cc                                   |   22 +++---
 bse/{bseserver.h => bseserver.hh}                  |    6 +-
 bse/bseserver.proc                                 |   26 ++++----
 bse/bsesnet.cc                                     |   18 +++---
 bse/{bsesnet.h => bsesnet.hh}                      |    4 +-
 bse/bsesnet.proc                                   |    8 +-
 bse/bsesnooper.cc                                  |    8 +-
 bse/{bsesnooper.h => bsesnooper.hh}                |    2 +-
 bse/bsesong.cc                                     |   28 ++++----
 bse/{bsesong.h => bsesong.hh}                      |    2 +-
 bse/bsesong.proc                                   |   24 ++++----
 bse/bsesource.cc                                   |   10 ++--
 bse/{bsesource.h => bsesource.hh}                  |    6 +-
 bse/bsesource.proc                                 |   12 ++--
 bse/bsestandardosc.cc                              |    8 +-
 bse/{bsestandardosc.h => bsestandardosc.hh}        |    4 +-
 bse/bsestandardsynths.cc                           |    6 +-
 bse/{bsestandardsynths.h => bsestandardsynths.hh}  |    2 +-
 bse/bsestorage.cc                                  |   16 ++--
 bse/{bsestorage.h => bsestorage.hh}                |    4 +-
 bse/bsesubiport.cc                                 |    6 +-
 bse/{bsesubiport.h => bsesubiport.hh}              |    4 +-
 bse/bsesuboport.cc                                 |    6 +-
 bse/{bsesuboport.h => bsesuboport.hh}              |    4 +-
 bse/bsesubsynth.cc                                 |   12 ++--
 bse/{bsesubsynth.h => bsesubsynth.hh}              |    2 +-
 bse/bsesuper.cc                                    |    4 +-
 bse/{bsesuper.h => bsesuper.hh}                    |    2 +-
 bse/bsetrack.cc                                    |   30 ++++----
 bse/{bsetrack.h => bsetrack.hh}                    |    6 +-
 bse/bsetrack.proc                                  |   14 ++--
 bse/bsetype.cc                                     |    4 +-
 bse/{bsetype.h => bsetype.hh}                      |    2 +-
 bse/bseundostack.cc                                |    6 +-
 bse/{bseundostack.h => bseundostack.hh}            |    2 +-
 bse/bseutils.cc                                    |    4 +-
 bse/{bseutils.h => bseutils.hh}                    |    6 +-
 bse/bsewave.cc                                     |   16 ++--
 bse/{bsewave.h => bsewave.hh}                      |    2 +-
 bse/bsewave.proc                                   |    8 +-
 bse/bsewaveosc.cc                                  |   18 +++---
 bse/{bsewaveosc.h => bsewaveosc.hh}                |    6 +-
 bse/bsewaveosc.proc                                |    8 +-
 bse/bsewaverepo.cc                                 |    4 +-
 bse/{bsewaverepo.h => bsewaverepo.hh}              |    2 +-
 bse/bsewaverepo.proc                               |   10 ++--
 bse/gsl-fftconf.sh                                 |    2 +-
 bse/gslcommon.cc                                   |    4 +-
 bse/{gslcommon.h => gslcommon.hh}                  |    4 +-
 bse/gsldatacache.cc                                |    8 +-
 bse/{gsldatacache.h => gsldatacache.hh}            |    2 +-
 bse/gsldatahandle-mad.cc                           |    6 +-
 bse/{gsldatahandle-mad.h => gsldatahandle-mad.hh}  |    4 +-
 bse/gsldatahandle-vorbis.cc                        |    6 +-
 ...datahandle-vorbis.h => gsldatahandle-vorbis.hh} |    4 +-
 bse/gsldatahandle.cc                               |   10 ++--
 bse/{gsldatahandle.h => gsldatahandle.hh}          |    2 +-
 bse/gsldatautils.cc                                |    4 +-
 bse/{gsldatautils.h => gsldatautils.hh}            |    4 +-
 bse/{gsldefs.h => gsldefs.hh}                      |    0
 bse/{gslfft.h => gslfft.hh}                        |    2 +-
 bse/gslfilehash.cc                                 |    2 +-
 bse/{gslfilehash.h => gslfilehash.hh}              |    4 +-
 bse/gslfilter.cc                                   |    6 +-
 bse/{gslfilter.h => gslfilter.hh}                  |    2 +-
 bse/{gslincluder.h => gslincluder.hh}              |    0
 bse/gslmagic.cc                                    |    4 +-
 bse/{gslmagic.h => gslmagic.hh}                    |    2 +-
 bse/gsloscillator.cc                               |    8 +-
 bse/{gsloscillator.h => gsloscillator.hh}          |    4 +-
 bse/gslosctable.cc                                 |    8 +-
 bse/{gslosctable.h => gslosctable.hh}              |    2 +-
 bse/gslvorbis-cutter.cc                            |    2 +-
 bse/{gslvorbis-cutter.h => gslvorbis-cutter.hh}    |    2 +-
 bse/gslvorbis-enc.cc                               |    4 +-
 bse/{gslvorbis-enc.h => gslvorbis-enc.hh}          |    2 +-
 bse/gslwavechunk.cc                                |   10 ++--
 bse/{gslwavechunk.h => gslwavechunk.hh}            |    6 +-
 bse/gslwaveosc.cc                                  |   10 ++--
 bse/{gslwaveosc.h => gslwaveosc.hh}                |    4 +-
 bse/{ladspa.h => ladspa.hh}                        |    2 +-
 bse/tests/blocktests.cc                            |    2 +-
 bse/tests/filtertest.cc                            |   10 ++--
 bse/tests/firhandle.cc                             |    8 +-
 bse/tests/loophandle.cc                            |    8 +-
 bse/tests/misctests.cc                             |    4 +-
 bse/tests/resamplehandle.cc                        |    6 +-
 bse/tests/subnormals-aux.cc                        |    4 +-
 bse/tests/subnormals.cc                            |    6 +-
 bse/tests/testcxx.cc                               |    2 +-
 bse/tests/testfft.cc                               |    8 +-
 drivers/bse-portaudio/bsepcmdevice-portaudio.cc    |    2 +-
 drivers/bse-portaudio/bsepcmdevice-portaudio.hh    |    4 +-
 drivers/bsemididevice-alsa.cc                      |    4 +-
 drivers/bsemididevice-alsa.h                       |    4 +-
 drivers/bsepcmdevice-alsa.cc                       |    2 +-
 drivers/bsepcmdevice-alsa.h                        |    4 +-
 plugins/artscompressor.cc                          |    2 +-
 plugins/bseadder.cc                                |    2 +-
 plugins/bseadder.h                                 |    4 +-
 plugins/bseamplifier.cc                            |    4 +-
 plugins/bseatandistort.cc                          |    4 +-
 plugins/bseatandistort.h                           |    4 +-
 plugins/bsecontribsampleandhold.cc                 |    2 +-
 plugins/bsefirfilter.h                             |    4 +-
 plugins/bseiirfilter.cc                            |    4 +-
 plugins/bseiirfilter.h                             |    2 +-
 plugins/bsemixer.cc                                |    2 +-
 plugins/bsemixer.h                                 |    4 +-
 plugins/bsemult.cc                                 |    2 +-
 plugins/bsemult.h                                  |    4 +-
 plugins/bsenoise.cc                                |    2 +-
 plugins/bsequantizer.cc                            |    4 +-
 plugins/bsesequencer.cc                            |    2 +-
 plugins/bsesequencer.h                             |    4 +-
 plugins/bsesimpleadsr.cc                           |    2 +-
 plugins/bsesimpleadsr.h                            |    4 +-
 plugins/davcanyondelay.cc                          |    4 +-
 plugins/davcanyondelay.h                           |    4 +-
 plugins/davguitar.h                                |    4 +-
 plugins/davorgan.cc                                |    4 +-
 plugins/davsyndrum.cc                              |    4 +-
 plugins/davsyndrum.h                               |    4 +-
 plugins/davxtalstrings.cc                          |    6 +-
 plugins/davxtalstrings.h                           |    4 +-
 plugins/freeverb/bsefreeverb.cc                    |    2 +-
 plugins/freeverb/bsefreeverb.h                     |    4 +-
 plugins/freeverb/denormals.h                       |    4 +-
 plugins/standardguspatchenvelope.cc                |    6 +-
 plugins/standardsaturator.cc                       |    4 +-
 shell/bsescm.cc                                    |    4 +-
 shell/bsescminterp.cc                              |    2 +-
 shell/bsescminterp.hh                              |    2 +-
 tests/bse/cxxbinding.cc                            |    2 +-
 tests/bse/filtertest.cc                            |    8 +-
 tests/perftest.cc                                  |    2 +-
 tests/testresampler.cc                             |    8 +-
 tests/testresamplerq.cc                            |    6 +-
 tests/testwavechunk.c                              |    6 +-
 tools/bsefcompare.cc                               |    8 +-
 tools/bsefextract.cc                               |   14 ++--
 tools/bseloopfuncs.cc                              |    2 +-
 tools/bseloopfuncs.hh                              |    4 +-
 tools/bsewavetool.cc                               |    8 +-
 tools/bsewavetool.hh                               |    4 +-
 tools/bwtwave.cc                                   |    8 +-
 tools/bwtwave.hh                                   |    6 +-
 tools/cutvorbis.cc                                 |    4 +-
 tools/magictest.cc                                 |   10 ++--
 tools/mathtool.cc                                  |   10 ++--
 tools/sfiutils.cc                                  |    4 +-
 tools/sfiutils.hh                                  |    2 +-
 325 files changed, 990 insertions(+), 990 deletions(-)
---
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 3a8abf0..d00c057 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -16,7 +16,7 @@
  */
 #include "bstutils.h"
 #include "bstcxxutils.h"
-#include "bse/bse.h"
+#include "bse/bse.hh"
 #include "bstapp.h"
 #include "bstsplash.h"
 #include "bstxkb.h"
diff --git a/beast-gtk/bststest.cc b/beast-gtk/bststest.cc
index 3fc9638..02871a1 100644
--- a/beast-gtk/bststest.cc
+++ b/beast-gtk/bststest.cc
@@ -17,8 +17,8 @@
 #include "bstutils.h"
 #include "bstqsampler.h"
 // #include "bstcellptrack.h"
-// #include <bse/gsldatacache.h>
-// #include <bse/gsldatahandle.h>
+// #include <bse/gsldatacache.hh>
+// #include <bse/gsldatahandle.hh>
 #include <string.h>
 
 #include <math.h>
@@ -380,7 +380,7 @@ score_loop (GslDataHandle *shandle,
   return score;
 }
 
-#include <bse/gsldatautils.h>
+#include <bse/gsldatautils.hh>
 
 static void
 find (WaveView *view)
diff --git a/beast-gtk/testgui.cc b/beast-gtk/testgui.cc
index bc79a9e..bd9598c 100644
--- a/beast-gtk/testgui.cc
+++ b/beast-gtk/testgui.cc
@@ -16,7 +16,7 @@
  */
 #include "topconfig.h"
 #include "bstutils.h"
-#include "bse/bse.h"
+#include "bse/bse.hh"
 #include "bstdbmeter.h"
 #include "bstparam.h"
 #include "bstgconfig.h"
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 31c9bba..2862fc0 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -6,9 +6,9 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = icons zintern . tests
 
-# need -I$(top_srcdir) for <bse/bsedefs.h>
+# need -I$(top_srcdir) for <bse/bsedefs.hh>
 # need -I$(top_builddir) for <sfi/sficonfig.h>
-# need -I$(srcdir) for "bseserver.h" in .genprc.cc
+# need -I$(srcdir) for "bseserver.hh" in .genprc.cc
 # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
 DEFS     += $(strip \
@@ -21,41 +21,41 @@ DEFS     += $(strip \
 #
 # BSE public header files
 bse_public_headers = $(strip \
-	gsldefs.h \
-	gslfft.h		gsloscillator.h	gsldatahandle.h	gslwavechunk.h \
-	gslfilter.h		gslcommon.h \
-	gsldatahandle-vorbis.h	gslvorbis-enc.h	gsldatacache.h	gslvorbis-cutter.h \
-	gsldatahandle-mad.h	           	gslfilehash.h	gsldatautils.h	\
-	gslwaveosc.h		gslosctable.h	gslmagic.h	\
+	gsldefs.hh \
+	gslfft.hh		gsloscillator.hh	gsldatahandle.hh	gslwavechunk.hh \
+	gslfilter.hh		gslcommon.hh \
+	gsldatahandle-vorbis.hh	gslvorbis-enc.hh	gsldatacache.hh	gslvorbis-cutter.hh \
+	gsldatahandle-mad.hh	           	gslfilehash.hh	gsldatautils.hh	\
+	gslwaveosc.hh		gslosctable.hh	gslmagic.hh	\
 	\
 	bsegentypes.h \
 	\
-	bse.h	bsedefs.h	bseexports.h	bseconfig.h	bsegenclosures.h \
-	bseincluder.h	ladspa.h	bseenginenode.h bseieee754.h \
+	bse.hh	bsedefs.hh	bseexports.hh	bseconfig.h	bsegenclosures.hh \
+	bseincluder.hh	ladspa.hh	bseenginenode.hh bseieee754.hh \
 	\
-	bseengine.h		bseenginemaster.h	bseengineschedule.h		bseengineutils.h \
-	bsebus.h		bsecategories.h 	\
-	bsefilter.h    		bsebiquadfilter.h	\
-	bseconstant.h		bseconstvalues.h	bsecontainer.h			bsecontextmerger.h \
-	bsedatapocket.h		bseeditablesample.h	bseenums.h			bsegconfig.h \
-	bseglobals.h		bseglue.h		bseitem.h			bsejanitor.h \
-	bsemain.h		bsemath.h		bsemathsignal.h			bseladspa.h \
-	bsemidicontroller.h	bsemididevice.h		bsedevice.h 			\
-	bsemididevice-null.h	bsemididevice-oss.h	bsemidievent.h			bsemidinotifier.h \
-	bsemidireceiver.h	bsemidisynth.h		bseobject.h			bsepart.h \
-	bsepcminput.h		bsepcmoutput.h		bseparam.h			bseparasite.h \
-	bsepcmdevice.h		bsepcmdevice-oss.h	bsepcmdevice-null.h		bseplugin.h \
-	bseprocedure.h		bseproject.h		bsescripthelper.h		bseserver.h \
-	bsesnet.h		bsesnooper.h		bsesong.h			bsesequencer.h \
-	bsesource.h		bsestandardosc.h	bsestandardsynths.h		bsestorage.h \
-	bseinstrumentoutput.h	bsesubiport.h		bseinstrumentinput.h		bsesuboport.h \
-	bsesubsynth.h		bsesuper.h		bsetrack.h			bsetype.h \
-	bseutils.h		bsemidivoice.h		bsewave.h			bsewaveosc.h \
-	bsecsynth.h		bsewaverepo.h		bseladspamodule.h		bsepcmwriter.h \
-	bsecompat.h		bseundostack.h		bsemidiinput.h			bsemididecoder.h \
-	bsenote.h		bsemidifile.h		bseblockutils.hh		\
+	bseengine.hh		bseenginemaster.hh	bseengineschedule.hh		bseengineutils.hh \
+	bsebus.hh		bsecategories.hh 	\
+	bsefilter.hh    		bsebiquadfilter.hh	\
+	bseconstant.hh		bseconstvalues.hh	bsecontainer.hh			bsecontextmerger.hh \
+	bsedatapocket.hh		bseeditablesample.hh	bseenums.hh			bsegconfig.hh \
+	bseglobals.hh		bseglue.hh		bseitem.hh			bsejanitor.hh \
+	bsemain.hh		bsemath.hh		bsemathsignal.hh			bseladspa.hh \
+	bsemidicontroller.hh	bsemididevice.hh		bsedevice.hh 			\
+	bsemididevice-null.hh	bsemididevice-oss.hh	bsemidievent.hh			bsemidinotifier.hh \
+	bsemidireceiver.hh	bsemidisynth.hh		bseobject.hh			bsepart.hh \
+	bsepcminput.hh		bsepcmoutput.hh		bseparam.hh			bseparasite.hh \
+	bsepcmdevice.hh		bsepcmdevice-oss.hh	bsepcmdevice-null.hh		bseplugin.hh \
+	bseprocedure.hh		bseproject.hh		bsescripthelper.hh		bseserver.hh \
+	bsesnet.hh		bsesnooper.hh		bsesong.hh			bsesequencer.hh \
+	bsesource.hh		bsestandardosc.hh	bsestandardsynths.hh		bsestorage.hh \
+	bseinstrumentoutput.hh	bsesubiport.hh		bseinstrumentinput.hh		bsesuboport.hh \
+	bsesubsynth.hh		bsesuper.hh		bsetrack.hh			bsetype.hh \
+	bseutils.hh		bsemidivoice.hh		bsewave.hh			bsewaveosc.hh \
+	bsecsynth.hh		bsewaverepo.hh		bseladspamodule.hh		bsepcmwriter.hh \
+	bsecompat.hh		bseundostack.hh		bsemidiinput.hh			bsemididecoder.hh \
+	bsenote.hh		bsemidifile.hh		bseblockutils.hh		\
 	bsecxxvalue.hh		bsecxxutils.hh		bsecxxbase.hh			bsecxxclosure.hh \
-	bsecxxarg.hh		bsecxxmodule.hh		bsecxxplugin.hh			bseloader.h \
+	bsecxxarg.hh		bsecxxmodule.hh		bsecxxplugin.hh			bseloader.hh \
 	bseresampler.hh		bseresamplerimpl.hh	\
 )
 # BSE C & C++ sources
@@ -126,7 +126,7 @@ EXTRA_DIST += $(strip \
 	bseconfig.h.in	bsepcmmodule.cc				\
 	bsewave.header						\
 	gsl-fftgen.pl	gsl-fftconf.sh	gsloscillator-aux.cc	\
-	gslincluder.h	gslwaveosc-aux.cc			\
+	gslincluder.hh	gslwaveosc-aux.cc			\
 )
 
 # -pthread -> -lpthread hack (required for libtool library linkage)
@@ -173,7 +173,7 @@ endif
 # gslfft.cc
 GENERATED += gslfft.cc
 $(srcdir)/gslfft.cc: @PERLRULE@ $(srcdir)/gsl-fftgen.pl $(srcdir)/gsl-fftconf.sh
-	$(srcdir)/gsl-fftconf.sh '$(PERL) $(srcdir)/gsl-fftgen.pl' \"gslfft.h\" >$@
+	$(srcdir)/gsl-fftconf.sh '$(PERL) $(srcdir)/gsl-fftgen.pl' \"gslfft.hh\" >$@
 # bsegentypes.h
 GENERATED_EXTRA_DIST += bsegentypes.h
 $(libbse_la_OBJECTS): bsegentypes.h
diff --git a/bse/bse.h b/bse/bse.hh
similarity index 100%
rename from bse/bse.h
rename to bse/bse.hh
diff --git a/bse/bseautodoc.cc b/bse/bseautodoc.cc
index 9a8f17a..f309a7b 100644
--- a/bse/bseautodoc.cc
+++ b/bse/bseautodoc.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemain.h"
-#include "bsecategories.h"
-#include "bseprocedure.h"
-#include "bsesource.h"
+#include "bsemain.hh"
+#include "bsecategories.hh"
+#include "bseprocedure.hh"
+#include "bsesource.hh"
 #include "topconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bse/bsebiquadfilter.cc b/bse/bsebiquadfilter.cc
index 28e116b..2b3636d 100644
--- a/bse/bsebiquadfilter.cc
+++ b/bse/bsebiquadfilter.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsebiquadfilter.h"
+#include "bsebiquadfilter.hh"
 
-#include <bse/bsecategories.h>
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bsecategories.hh>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 
 static SFI_MSG_TYPE_DEFINE (debug_biquadfilter, "biquadfilter", SFI_MSG_DEBUG, NULL);
 #define	DEBUG(...)      sfi_debug (debug_biquadfilter, __VA_ARGS__)
diff --git a/bse/bsebiquadfilter.h b/bse/bsebiquadfilter.hh
similarity index 98%
rename from bse/bsebiquadfilter.h
rename to bse/bsebiquadfilter.hh
index 9ad6d10..01485f6 100644
--- a/bse/bsebiquadfilter.h
+++ b/bse/bsebiquadfilter.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_BIQUAD_FILTER_H__
 #define __BSE_BIQUAD_FILTER_H__
 
-#include <bse/bsesource.h>
-#include <bse/gslfilter.h>
+#include <bse/bsesource.hh>
+#include <bse/gslfilter.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/bseblockutils.hh b/bse/bseblockutils.hh
index e8bfd2d..a115adb 100644
--- a/bse/bseblockutils.hh
+++ b/bse/bseblockutils.hh
@@ -19,7 +19,7 @@
 #define __BSE_BLOCK_UTILS_H__
 
 #include <wchar.h> /* wmemset */
-#include <bse/bseieee754.h>
+#include <bse/bseieee754.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsebus.cc b/bse/bsebus.cc
index 4a94154..372955f 100644
--- a/bse/bsebus.cc
+++ b/bse/bsebus.cc
@@ -14,16 +14,16 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsebus.h"
-#include "bsecategories.h"
-#include "bsetrack.h"
-#include "bsesong.h"
-#include "bseengine.h"
-#include "bsecsynth.h"
-#include "bsesubiport.h"
-#include "bsesuboport.h"
-#include "bseproject.h"
-#include "bsestorage.h"
+#include "bsebus.hh"
+#include "bsecategories.hh"
+#include "bsetrack.hh"
+#include "bsesong.hh"
+#include "bseengine.hh"
+#include "bsecsynth.hh"
+#include "bsesubiport.hh"
+#include "bsesuboport.hh"
+#include "bseproject.hh"
+#include "bsestorage.hh"
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsebus.h b/bse/bsebus.hh
similarity index 99%
rename from bse/bsebus.h
rename to bse/bsebus.hh
index 23ef7ad..753438f 100644
--- a/bse/bsebus.h
+++ b/bse/bsebus.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_BUS_H__
 #define __BSE_BUS_H__
 
-#include <bse/bsesubsynth.h>
+#include <bse/bsesubsynth.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsebus.proc b/bse/bsebus.proc
index ef398a0..806cbca 100644
--- a/bse/bsebus.proc
+++ b/bse/bsebus.proc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsebus.h>
-#include <bse/bsetrack.h>
-#include <bse/bsesong.h>
-#include <bse/bseundostack.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsebus.hh>
+#include <bse/bsetrack.hh>
+#include <bse/bsesong.hh>
+#include <bse/bseundostack.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsecategories.cc b/bse/bsecategories.cc
index b980d65..97e248a 100644
--- a/bse/bsecategories.cc
+++ b/bse/bsecategories.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsecategories.h"
+#include "bsecategories.hh"
 
-#include "bseutils.h"
+#include "bseutils.hh"
 #include <string.h>
 
 
diff --git a/bse/bsecategories.h b/bse/bsecategories.hh
similarity index 98%
rename from bse/bsecategories.h
rename to bse/bsecategories.hh
index c8835bb..af8719d 100644
--- a/bse/bsecategories.h
+++ b/bse/bsecategories.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CATEGORIES_H__
 #define __BSE_CATEGORIES_H__
 
-#include        <bse/bsetype.h>
+#include        <bse/bsetype.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsecategories.proc b/bse/bsecategories.proc
index e150e12..45fbdc4 100644
--- a/bse/bsecategories.proc
+++ b/bse/bsecategories.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsecategories.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseplugin.h>
+#include <bse/bsecategories.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseplugin.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsecompat.cc b/bse/bsecompat.cc
index 1ea1ba0..d2ca9d5 100644
--- a/bse/bsecompat.cc
+++ b/bse/bsecompat.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsecompat.h"
-#include "bsestorage.h"
+#include "bsecompat.hh"
+#include "bsestorage.hh"
 #include <string.h>
 
 
diff --git a/bse/bsecompat.h b/bse/bsecompat.hh
similarity index 98%
rename from bse/bsecompat.h
rename to bse/bsecompat.hh
index f6c573c..622aab8 100644
--- a/bse/bsecompat.h
+++ b/bse/bsecompat.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_COMPAT_H__
 #define __BSE_COMPAT_H__
 
-#include        <bse/bseenums.h>
+#include        <bse/bseenums.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseconstant.cc b/bse/bseconstant.cc
index 13bb3f9..944579b 100644
--- a/bse/bseconstant.cc
+++ b/bse/bseconstant.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseconstant.h"
+#include "bseconstant.hh"
 
-#include <bse/bsecategories.h>
-#include <bse/bseengine.h>
+#include <bse/bsecategories.hh>
+#include <bse/bseengine.hh>
 
 #include <string.h>
 
diff --git a/bse/bseconstant.h b/bse/bseconstant.hh
similarity index 98%
rename from bse/bseconstant.h
rename to bse/bseconstant.hh
index e05921d..5ae77d1 100644
--- a/bse/bseconstant.h
+++ b/bse/bseconstant.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CONSTANT_H__
 #define __BSE_CONSTANT_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/bseconstvalues.cc b/bse/bseconstvalues.cc
index e83eafa..6f1b786 100644
--- a/bse/bseconstvalues.cc
+++ b/bse/bseconstvalues.cc
@@ -14,6 +14,6 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseconstvalues.h"
+#include "bseconstvalues.hh"
 
 
diff --git a/bse/bseconstvalues.h b/bse/bseconstvalues.hh
similarity index 99%
rename from bse/bseconstvalues.h
rename to bse/bseconstvalues.hh
index 3f6f8fd..3438443 100644
--- a/bse/bseconstvalues.h
+++ b/bse/bseconstvalues.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CONST_VALUES_H__
 #define __BSE_CONST_VALUES_H__
 
-#include <bse/bsedefs.h>
+#include <bse/bsedefs.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsecontainer.cc b/bse/bsecontainer.cc
index 7f24aa9..c4e1a4e 100644
--- a/bse/bsecontainer.cc
+++ b/bse/bsecontainer.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsecontainer.h"
-#include "bseundostack.h"
-#include "bsesource.h"
-#include "bseproject.h"
-#include "bsestorage.h"
-#include "bsemain.h"
-#include "bseengine.h"
+#include "bsecontainer.hh"
+#include "bseundostack.hh"
+#include "bsesource.hh"
+#include "bseproject.hh"
+#include "bsestorage.hh"
+#include "bsemain.hh"
+#include "bseengine.hh"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/bse/bsecontainer.h b/bse/bsecontainer.hh
similarity index 98%
rename from bse/bsecontainer.h
rename to bse/bsecontainer.hh
index d530d23..a4c2a11 100644
--- a/bse/bsecontainer.h
+++ b/bse/bsecontainer.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsecontainer.h: base type to manage BSE items
+ * bsecontainer.hh: base type to manage BSE items
  */
 #ifndef __BSE_CONTAINER_H__
 #define __BSE_CONTAINER_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 #include <sfi/gbsearcharray.hh>
 
 G_BEGIN_DECLS
diff --git a/bse/bsecontainer.proc b/bse/bsecontainer.proc
index e57384a..f832849 100644
--- a/bse/bsecontainer.proc
+++ b/bse/bsecontainer.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsecontainer.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsecontainer.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsecontextmerger.cc b/bse/bsecontextmerger.cc
index 3c62ede..39fa8b7 100644
--- a/bse/bsecontextmerger.cc
+++ b/bse/bsecontextmerger.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsecontextmerger.h"
+#include "bsecontextmerger.hh"
 #include "bseblockutils.hh"
-#include "bsesnet.h"
-#include "bseserver.h"
-#include "bseengine.h"
+#include "bsesnet.hh"
+#include "bseserver.hh"
+#include "bseengine.hh"
 
 #include <string.h>
 
diff --git a/bse/bsecontextmerger.h b/bse/bsecontextmerger.hh
similarity index 98%
rename from bse/bsecontextmerger.h
rename to bse/bsecontextmerger.hh
index d1d5581..c6ecf2d 100644
--- a/bse/bsecontextmerger.h
+++ b/bse/bsecontextmerger.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CONTEXT_MERGER_H__
 #define __BSE_CONTEXT_MERGER_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsecore.cc b/bse/bsecore.cc
index a24d3f3..4896b9a 100644
--- a/bse/bsecore.cc
+++ b/bse/bsecore.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsetype.h"        /* import all required types first */
-#include "bsepart.h"
-#include "bsemain.h"
-#include "bseengine.h"
-#include "bsesequencer.h"
+#include "bsetype.hh"        /* import all required types first */
+#include "bsepart.hh"
+#include "bsemain.hh"
+#include "bseengine.hh"
+#include "bsesequencer.hh"
 #include "bsecxxplugin.hh" /* includes bsecore.genidl.hh for us */
 
 namespace Bse {
diff --git a/bse/bsecsynth.cc b/bse/bsecsynth.cc
index 0649f8e..282c205 100644
--- a/bse/bsecsynth.cc
+++ b/bse/bsecsynth.cc
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsecsynth.h"
+#include "bsecsynth.hh"
 
 
 /* --- parameters --- */
diff --git a/bse/bsecsynth.h b/bse/bsecsynth.hh
similarity index 98%
rename from bse/bsecsynth.h
rename to bse/bsecsynth.hh
index 45f46bc..aba1f7d 100644
--- a/bse/bsecsynth.h
+++ b/bse/bsecsynth.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CSYNTH_H__
 #define __BSE_CSYNTH_H__
 
-#include        <bse/bsesnet.h>
+#include        <bse/bsesnet.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsecsynth.proc b/bse/bsecsynth.proc
index 0379f9c..478fd36 100644
--- a/bse/bsecsynth.proc
+++ b/bse/bsecsynth.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        <bse/bseplugin.h>
-#include        <bse/bseprocedure.h>
-#include        <bse/bsecsynth.h>
-#include        <bse/bsemain.h>
+#include        <bse/bseplugin.hh>
+#include        <bse/bseprocedure.hh>
+#include        <bse/bsecsynth.hh>
+#include        <bse/bsemain.hh>
 
 
 AUTHORS = "Tim Janik <timj gtk org>";
diff --git a/bse/bsecxxbase.hh b/bse/bsecxxbase.hh
index 0d3eb46..9323a2e 100644
--- a/bse/bsecxxbase.hh
+++ b/bse/bsecxxbase.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CXX_BASE_H__
 #define __BSE_CXX_BASE_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 #include <bse/bsecxxvalue.hh>
 #include <bse/bsecxxclosure.hh>
 
diff --git a/bse/bsecxxclosure.cc b/bse/bsecxxclosure.cc
index a99b095..e0ff0f2 100644
--- a/bse/bsecxxclosure.cc
+++ b/bse/bsecxxclosure.cc
@@ -36,7 +36,7 @@ CxxClosure::gclosure()
 
 } // Bse
 
-#else /* !BSE_COMPILATION */    // program to generate bsegenclosures.h
+#else /* !BSE_COMPILATION */    // program to generate bsegenclosures.hh
 
 #include <string>
 #include <stdio.h>
diff --git a/bse/bsecxxclosure.hh b/bse/bsecxxclosure.hh
index d726b79..fc6c087 100644
--- a/bse/bsecxxclosure.hh
+++ b/bse/bsecxxclosure.hh
@@ -40,7 +40,7 @@ public:
 };
 
 /* include generated CxxClosure* Closure (class T*, ... (T::*f) (...)); constructors */
-#include <bse/bsegenclosures.h>
+#include <bse/bsegenclosures.hh>
 
 } // Bse
 
diff --git a/bse/bsecxxmodule.cc b/bse/bsecxxmodule.cc
index 09bcf74..ca4feac 100644
--- a/bse/bsecxxmodule.cc
+++ b/bse/bsecxxmodule.cc
@@ -15,9 +15,9 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsecxxmodule.hh"
-#include "bseengine.h"
-#include "bsemidireceiver.h"
-#include "bsesnet.h"
+#include "bseengine.hh"
+#include "bsemidireceiver.hh"
+#include "bsesnet.hh"
 
 namespace Bse {
 
diff --git a/bse/bsecxxmodule.hh b/bse/bsecxxmodule.hh
index 03d661d..452914a 100644
--- a/bse/bsecxxmodule.hh
+++ b/bse/bsecxxmodule.hh
@@ -18,11 +18,11 @@
 #define __BSE_CXX_MODULE_H__
 
 #include <bse/bsecxxbase.hh>
-#include <bse/bseieee754.h>
+#include <bse/bseieee754.hh>
 
 namespace Bse {
 
-/* enums/structures mirrored from bseengine.h */
+/* enums/structures mirrored from bseengine.hh */
 enum ProcessCost {
   NORMAL,
   CHEAP,
diff --git a/bse/bsecxxplugin.cc b/bse/bsecxxplugin.cc
index f47bd0a..cf84a13 100644
--- a/bse/bsecxxplugin.cc
+++ b/bse/bsecxxplugin.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsecxxplugin.hh"
-#include "bseplugin.h"
-#include "bsemain.h"
+#include "bseplugin.hh"
+#include "bsemain.hh"
 #include <new>
 
 namespace Bse {
diff --git a/bse/bsecxxplugin.hh b/bse/bsecxxplugin.hh
index 5849312..a580867 100644
--- a/bse/bsecxxplugin.hh
+++ b/bse/bsecxxplugin.hh
@@ -18,10 +18,10 @@
 #define __BSE_CXX_PLUGIN_H__
 
 #include <bse/bsecxxmodule.hh>
-#include <bse/bseexports.h>
-#include <bse/bseparam.h>
-#include <bse/bsecategories.h>
-#include <bse/bseplugin.h>
+#include <bse/bseexports.hh>
+#include <bse/bseparam.hh>
+#include <bse/bsecategories.hh>
+#include <bse/bseplugin.hh>
 #include <sfi/sficxx.hh>
 
 namespace Bse {
@@ -44,7 +44,7 @@ const SfiInt  MAX_FINE_TUNE = BSE_MAX_FINE_TUNE;
 #define BSE_CXX_DEFINE_EXPORTS()
 #define BSE_CXX_EXPORT_IDENTITY    &bse_builtin_export_identity
 extern "C" {
-extern ::BseExportIdentity bse_builtin_export_identity; /* sync with bseplugin.h */
+extern ::BseExportIdentity bse_builtin_export_identity; /* sync with bseplugin.hh */
 };
 #endif
 
diff --git a/bse/bsecxxutils.cc b/bse/bsecxxutils.cc
index aa6ab43..ab6faec 100644
--- a/bse/bsecxxutils.cc
+++ b/bse/bsecxxutils.cc
@@ -17,7 +17,7 @@
 #include "bsecxxutils.hh"
 
 #include "bsecxxbase.hh"
-#include "bsecategories.h"
+#include "bsecategories.hh"
 #include <list>
 using namespace std;
 
@@ -142,7 +142,7 @@ init_exception_handler ()
 }
 
 extern "C" void
-bse_cxx_init (void)  // prototyped in bseutils.h
+bse_cxx_init (void)  // prototyped in bseutils.hh
 {
   init_exception_handler ();
   Bse::TypeRegistry::init_types();
diff --git a/bse/bsecxxutils.hh b/bse/bsecxxutils.hh
index 446a945..b5a0d34 100644
--- a/bse/bsecxxutils.hh
+++ b/bse/bsecxxutils.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_CXX_UTILS_H__
 #define __BSE_CXX_UTILS_H__
 
-#include <bse/bseutils.h>
+#include <bse/bseutils.hh>
 #include <sfi/sficxx.hh>
 #include <vector>
 #include <algorithm>
diff --git a/bse/bsedatahandle-fir.cc b/bse/bsedatahandle-fir.cc
index adff131..a9c29c1 100644
--- a/bse/bsedatahandle-fir.cc
+++ b/bse/bsedatahandle-fir.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsldatahandle.h"
-#include "gsldatautils.h"
-#include "gslfilter.h"
+#include "gsldatahandle.hh"
+#include "gsldatautils.hh"
+#include "gslfilter.hh"
 #include "bseblockutils.hh"
 #include <complex>
 #include <vector>
diff --git a/bse/bsedatahandle-resample.cc b/bse/bsedatahandle-resample.cc
index da09b1e..77b7ac9 100644
--- a/bse/bsedatahandle-resample.cc
+++ b/bse/bsedatahandle-resample.cc
@@ -16,7 +16,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseresampler.hh"
-#include "gsldatahandle.h"
+#include "gsldatahandle.hh"
 #include <sfi/sficxx.hh>
 #include <vector>
 
diff --git a/bse/bsedatapocket.cc b/bse/bsedatapocket.cc
index 8f8ed3b..7e724ff 100644
--- a/bse/bsedatapocket.cc
+++ b/bse/bsedatapocket.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsedatapocket.h"
+#include "bsedatapocket.hh"
 #include "bsecxxplugin.hh"
 
-#include "bsemain.h"
-#include "bsestorage.h"
+#include "bsemain.hh"
+#include "bsestorage.hh"
 
 #include <string.h>
 
diff --git a/bse/bsedatapocket.h b/bse/bsedatapocket.hh
similarity index 98%
rename from bse/bsedatapocket.h
rename to bse/bsedatapocket.hh
index 25e540f..ab00401 100644
--- a/bse/bsedatapocket.h
+++ b/bse/bsedatapocket.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_DATA_POCKET_H__
 #define __BSE_DATA_POCKET_H__
 
-#include        <bse/bsesuper.h>
+#include        <bse/bsesuper.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsedatapocket.proc b/bse/bsedatapocket.proc
index 7385edd..5d8f4a2 100644
--- a/bse/bsedatapocket.proc
+++ b/bse/bsedatapocket.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        <bse/bseplugin.h>
-#include        <bse/bseprocedure.h>
-#include        <bse/bsedatapocket.h>
+#include        <bse/bseplugin.hh>
+#include        <bse/bseprocedure.hh>
+#include        <bse/bsedatapocket.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsedefs.h b/bse/bsedefs.hh
similarity index 99%
rename from bse/bsedefs.h
rename to bse/bsedefs.hh
index c1d7757..9a70563 100644
--- a/bse/bsedefs.h
+++ b/bse/bsedefs.hh
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsedefs.h: type definitions and forward definitions libbse
+ * bsedefs.hh: type definitions and forward definitions libbse
  */
 #ifndef __BSE_DEFS_H__
 #define __BSE_DEFS_H__
@@ -110,7 +110,7 @@ typedef struct _BseModuleClass             BseModuleClass;
 typedef struct _BseIStream                 BseIStream;
 typedef struct _BseJStream                 BseJStream;
 typedef struct _BseOStream                 BseOStream;
-/* dereference some BseModule members without including bseengine.h */
+/* dereference some BseModule members without including bseengine.hh */
 #define	BSE_MODULE_GET_USER_DATA(bsemodule)	(((gpointer*) bsemodule)[1])
 #define	BSE_MODULE_GET_ISTREAMSP(bsemodule)	(((gpointer*) bsemodule)[2])
 #define	BSE_MODULE_GET_JSTREAMSP(bsemodule)	(((gpointer*) bsemodule)[3])
diff --git a/bse/bsedevice.cc b/bse/bsedevice.cc
index 8f822da..e30d787 100644
--- a/bse/bsedevice.cc
+++ b/bse/bsedevice.cc
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsedevice.h"
+#include "bsedevice.hh"
 #include <sfi/gbsearcharray.hh>
 
 /* --- functions --- */
diff --git a/bse/bsedevice.h b/bse/bsedevice.hh
similarity index 99%
rename from bse/bsedevice.h
rename to bse/bsedevice.hh
index 06a2853..2eaf2bf 100644
--- a/bse/bsedevice.h
+++ b/bse/bsedevice.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_DEVICE_H__
 #define __BSE_DEVICE_H__
 
-#include        <bse/bseobject.h>
+#include        <bse/bseobject.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseeditablesample.cc b/bse/bseeditablesample.cc
index 320627e..e5b24d1 100644
--- a/bse/bseeditablesample.cc
+++ b/bse/bseeditablesample.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseeditablesample.h"
+#include "bseeditablesample.hh"
 
-#include "bsemain.h"
-#include "bsestorage.h"
-#include "gsldatahandle.h"
+#include "bsemain.hh"
+#include "bsestorage.hh"
+#include "gsldatahandle.hh"
 
 
 /* --- structures --- */
diff --git a/bse/bseeditablesample.h b/bse/bseeditablesample.hh
similarity index 97%
rename from bse/bseeditablesample.h
rename to bse/bseeditablesample.hh
index 91ed001..e1cf839 100644
--- a/bse/bseeditablesample.h
+++ b/bse/bseeditablesample.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_EDITABLE_SAMPLE_H__
 #define __BSE_EDITABLE_SAMPLE_H__
 
-#include <bse/bsesuper.h>
-#include <bse/gslwavechunk.h>
+#include <bse/bsesuper.hh>
+#include <bse/gslwavechunk.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/bseeditablesample.proc b/bse/bseeditablesample.proc
index 1704c6f..6626150 100644
--- a/bse/bseeditablesample.proc
+++ b/bse/bseeditablesample.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        <bse/bseplugin.h>
-#include        <bse/bseprocedure.h>
-#include        <bse/bseeditablesample.h>
-#include        <bse/gsldatahandle.h>
+#include        <bse/bseplugin.hh>
+#include        <bse/bseprocedure.hh>
+#include        <bse/bseeditablesample.hh>
+#include        <bse/gsldatahandle.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bseengine.cc b/bse/bseengine.cc
index d569563..1e28ccd 100644
--- a/bse/bseengine.cc
+++ b/bse/bseengine.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseengine.h"
-#include "gslcommon.h"
-#include "bseengineutils.h"
-#include "bseenginemaster.h"
+#include "bseengine.hh"
+#include "gslcommon.hh"
+#include "bseengineutils.hh"
+#include "bseenginemaster.hh"
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
@@ -1426,7 +1426,7 @@ bse_engine_init (gboolean run_threaded)
   
   bse_engine_initialized = TRUE;
   
-  /* assert correct implmentation of accessor macros defined in bsedefs.h */
+  /* assert correct implmentation of accessor macros defined in bsedefs.hh */
   g_assert (&BSE_MODULE_GET_USER_DATA ((BseModule*) 42) == &((BseModule*) 42)->user_data);
   g_assert (&BSE_MODULE_GET_ISTREAMSP ((BseModule*) 42) == (void*) &((BseModule*) 42)->istreams);
   g_assert (&BSE_MODULE_GET_JSTREAMSP ((BseModule*) 42) == (void*) &((BseModule*) 42)->jstreams);
diff --git a/bse/bseengine.h b/bse/bseengine.hh
similarity index 99%
rename from bse/bseengine.h
rename to bse/bseengine.hh
index dcb2fc8..d3ce549 100644
--- a/bse/bseengine.h
+++ b/bse/bseengine.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_ENGINE_H__
 #define __BSE_ENGINE_H__
 
-#include <bse/bsedefs.h>
+#include <bse/bsedefs.hh>
 
 G_BEGIN_DECLS
 
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 
 /* --- typedefs --- */
 typedef struct _BseJob                   BseJob;
-/* bsedefs.h:
+/* bsedefs.hh:
  * typedef void (*BseEngineAccessFunc)  (BseModule      *module,
  *                                       gpointer        data);
  * typedef void (*BseFreeFunc)          (gpointer        data);
diff --git a/bse/bseenginemaster.cc b/bse/bseenginemaster.cc
index 3e8b8f7..a69b53b 100644
--- a/bse/bseenginemaster.cc
+++ b/bse/bseenginemaster.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseenginemaster.h"
+#include "bseenginemaster.hh"
 #include "bseblockutils.hh"
-#include "gslcommon.h"
-#include "bsemain.h" /* bse_log_handler */
-#include "bseenginenode.h"
-#include "bseengineutils.h"
-#include "bseengineschedule.h"
-#include "bseieee754.h"
+#include "gslcommon.hh"
+#include "bsemain.hh" /* bse_log_handler */
+#include "bseenginenode.hh"
+#include "bseengineutils.hh"
+#include "bseengineschedule.hh"
+#include "bseieee754.hh"
 #include <string.h>
 #include <unistd.h>
 #include <sys/poll.h>
diff --git a/bse/bseenginemaster.h b/bse/bseenginemaster.hh
similarity index 97%
rename from bse/bseenginemaster.h
rename to bse/bseenginemaster.hh
index cacfc3a..262223c 100644
--- a/bse/bseenginemaster.h
+++ b/bse/bseenginemaster.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_ENGINE_MASTER_H__
 #define __BSE_ENGINE_MASTER_H__
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseenginenode.h b/bse/bseenginenode.hh
similarity index 99%
rename from bse/bseenginenode.h
rename to bse/bseenginenode.hh
index 9389c2f..7a08e4b 100644
--- a/bse/bseenginenode.h
+++ b/bse/bseenginenode.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_ENGINE_NODE_H__
 #define __BSE_ENGINE_NODE_H__
 
-#include "bseengine.h"
-#include "gslcommon.h"
+#include "bseengine.hh"
+#include "gslcommon.hh"
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseengineschedule.cc b/bse/bseengineschedule.cc
index 7dbb68e..944df76 100644
--- a/bse/bseengineschedule.cc
+++ b/bse/bseengineschedule.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseengineschedule.h"
-#include "bseengineutils.h"
+#include "bseengineschedule.hh"
+#include "bseengineutils.hh"
 
 static SFI_MSG_TYPE_DEFINE (debug_sched, "sched", SFI_MSG_DEBUG, NULL);
 
diff --git a/bse/bseengineschedule.h b/bse/bseengineschedule.hh
similarity index 98%
rename from bse/bseengineschedule.h
rename to bse/bseengineschedule.hh
index 2f9b977..9e9c003 100644
--- a/bse/bseengineschedule.h
+++ b/bse/bseengineschedule.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_ENGINE_SCHEDULE_H__
 #define __BSE_ENGINE_SCHEDULE_H__
 
-#include <bse/bseenginenode.h>
+#include <bse/bseenginenode.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseengineutils.cc b/bse/bseengineutils.cc
index 2416538..0f4a58a 100644
--- a/bse/bseengineutils.cc
+++ b/bse/bseengineutils.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseengineutils.h"
+#include "bseengineutils.hh"
 #include "bseblockutils.hh"
-#include "gslcommon.h"
-#include "bseenginenode.h"
-#include "bseengineschedule.h"
-#include "bsemathsignal.h"
+#include "gslcommon.hh"
+#include "bseenginenode.hh"
+#include "bseengineschedule.hh"
+#include "bsemathsignal.hh"
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/bse/bseengineutils.h b/bse/bseengineutils.hh
similarity index 97%
rename from bse/bseengineutils.h
rename to bse/bseengineutils.hh
index e07f45d..6509b44 100644
--- a/bse/bseengineutils.h
+++ b/bse/bseengineutils.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_ENGINE_UTIL_H__
 #define __BSE_ENGINE_UTIL_H__
 
-#include <bse/bseenginenode.h>
+#include <bse/bseenginenode.hh>
 
 G_BEGIN_DECLS
 
@@ -25,7 +25,7 @@ G_BEGIN_DECLS
 void            bse_engine_reinit_utils         (void);
 void		_engine_free_trans		(BseTrans      *trans);
 BseOStream*	_engine_alloc_ostreams		(guint		n);
-#if 0	/* bseengine.h: */
+#if 0	/* bseengine.hh: */
 void            bse_engine_user_thread_collect	(void);
 gfloat*		bse_engine_const_values		(gfloat		value);
 #endif
diff --git a/bse/bseenums.cc b/bse/bseenums.cc
index 7900c60..ac593fe 100644
--- a/bse/bseenums.cc
+++ b/bse/bseenums.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseenums.h"
-#include "gslcommon.h"
+#include "bseenums.hh"
+#include "gslcommon.hh"
 #include <errno.h>
 
 /* include generated enum value arrays and *.h files the enums steam from */
diff --git a/bse/bseenums.h b/bse/bseenums.hh
similarity index 97%
rename from bse/bseenums.h
rename to bse/bseenums.hh
index a72eeca..576c066 100644
--- a/bse/bseenums.h
+++ b/bse/bseenums.hh
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bseenums.h: main portion of enum definitions in BSE and convenience functions
+ * bseenums.hh: main portion of enum definitions in BSE and convenience functions
  */
 #ifndef __BSE_ENUMS_H__
 #define __BSE_ENUMS_H__
 
-#include <bse/bsetype.h>
-#include <bse/gsldefs.h>
+#include <bse/bsetype.hh>
+#include <bse/gsldefs.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bseenums.proc b/bse/bseenums.proc
index 5e382d6..f0aca77 100644
--- a/bse/bseenums.proc
+++ b/bse/bseenums.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        <bse/bseplugin.h>
-#include        <bse/bseprocedure.h>
-#include        <bse/bseenums.h>
+#include        <bse/bseplugin.hh>
+#include        <bse/bseprocedure.hh>
+#include        <bse/bseenums.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bseexports.h b/bse/bseexports.hh
similarity index 98%
rename from bse/bseexports.h
rename to bse/bseexports.hh
index 7030ccf..5814f29 100644
--- a/bse/bseexports.h
+++ b/bse/bseexports.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bseexports.h: export declarations for external plugins
+ * bseexports.hh: export declarations for external plugins
  */
 #ifndef __BSE_EXPORTS_H__
 #define __BSE_EXPORTS_H__
 
-#include	<bse/bseprocedure.h>
+#include	<bse/bseprocedure.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsefilter-ellf.cc b/bse/bsefilter-ellf.cc
index 3580b88..f1f8ed3 100644
--- a/bse/bsefilter-ellf.cc
+++ b/bse/bsefilter-ellf.cc
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "bsefilter.h"
+#include "bsefilter.hh"
 
 typedef struct {
   int    n_poles;
diff --git a/bse/bsefilter.cc b/bse/bsefilter.cc
index 270eb47..b21f9a2 100644
--- a/bse/bsefilter.cc
+++ b/bse/bsefilter.cc
@@ -16,7 +16,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include "bsefilter.h"
+#include "bsefilter.hh"
 #include <birnet/birnet.hh>
 
 using namespace Birnet;
diff --git a/bse/bsefilter.h b/bse/bsefilter.hh
similarity index 99%
rename from bse/bsefilter.h
rename to bse/bsefilter.hh
index debe175..f54fdaa 100644
--- a/bse/bsefilter.h
+++ b/bse/bsefilter.hh
@@ -19,7 +19,7 @@
 #ifndef BSE_FILTER_H__
 #define BSE_FILTER_H__
 
-#include <bse/bsemath.h>
+#include <bse/bsemath.hh>
 
 BIRNET_EXTERN_C_BEGIN();
 
diff --git a/bse/bsegconfig.cc b/bse/bsegconfig.cc
index 45e84a1..7d49b19 100644
--- a/bse/bsegconfig.cc
+++ b/bse/bsegconfig.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"bsegconfig.h"
-#include	"bseserver.h"
-#include	"bsepcmdevice.h"	/* for frequency alignment */
+#include	"bsegconfig.hh"
+#include	"bseserver.hh"
+#include	"bsepcmdevice.hh"	/* for frequency alignment */
 
 
 
diff --git a/bse/bsegconfig.h b/bse/bsegconfig.hh
similarity index 91%
rename from bse/bsegconfig.h
rename to bse/bsegconfig.hh
index dbfa2eb..2559d06 100644
--- a/bse/bsegconfig.h
+++ b/bse/bsegconfig.hh
@@ -17,13 +17,13 @@
 #ifndef __BSE_GCONFIG_H__
 #define __BSE_GCONFIG_H__
 
-#include	<bse/bseobject.h>
-#include	<bse/bsemain.h>
+#include	<bse/bseobject.hh>
+#include	<bse/bsemain.hh>
 
 G_BEGIN_DECLS
 
 /* --- Global Config --- */
-/* extern BseGConfig *bse_global_config; bsetype.h */
+/* extern BseGConfig *bse_global_config; bsetype.hh */
 void               _bse_gconfig_init	  (void);
 void               bse_gconfig_apply	  (SfiRec *rec);
 GParamSpec*        bse_gconfig_pspec	  (void);
diff --git a/bse/bsegenclosures.h b/bse/bsegenclosures.hh
similarity index 100%
rename from bse/bsegenclosures.h
rename to bse/bsegenclosures.hh
diff --git a/bse/bseglobals.cc b/bse/bseglobals.cc
index d1222e2..197aefc 100644
--- a/bse/bseglobals.cc
+++ b/bse/bseglobals.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"bseglobals.h"
-#include	"bsemain.h"
+#include	"bseglobals.hh"
+#include	"bsemain.hh"
 
 
 /* --- functions --- */
diff --git a/bse/bseglobals.h b/bse/bseglobals.hh
similarity index 96%
rename from bse/bseglobals.h
rename to bse/bseglobals.hh
index f2569c2..38bb1de 100644
--- a/bse/bseglobals.h
+++ b/bse/bseglobals.hh
@@ -17,10 +17,10 @@
 #ifndef __BSE_GLOBALS_H__
 #define __BSE_GLOBALS_H__
 
-#include <bse/bsedefs.h>
-#include <bse/bsemath.h>
-#include <bse/bsenote.h>
-#include <bse/bseconstvalues.h>
+#include <bse/bsedefs.hh>
+#include <bse/bsemath.hh>
+#include <bse/bsenote.hh>
+#include <bse/bseconstvalues.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseglue.cc b/bse/bseglue.cc
index 8de73d9..af6686e 100644
--- a/bse/bseglue.cc
+++ b/bse/bseglue.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseglue.h"
-#include "bseparam.h"
-#include "bseitem.h"
-#include "bseprocedure.h"
-#include "bsecategories.h"
-#include "bsemain.h"
+#include "bseglue.hh"
+#include "bseparam.hh"
+#include "bseitem.hh"
+#include "bseprocedure.hh"
+#include "bsecategories.hh"
+#include "bsemain.hh"
 #include <string.h>
 
 
diff --git a/bse/bseglue.h b/bse/bseglue.hh
similarity index 98%
rename from bse/bseglue.h
rename to bse/bseglue.hh
index b54a4cd..f20bf6c 100644
--- a/bse/bseglue.h
+++ b/bse/bseglue.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_GLUE_H__
 #define __BSE_GLUE_H__
 
-#include <bse/bsetype.h>
+#include <bse/bsetype.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseieee754.h b/bse/bseieee754.hh
similarity index 99%
rename from bse/bseieee754.h
rename to bse/bseieee754.hh
index 5014d90..05c48d9 100644
--- a/bse/bseieee754.h
+++ b/bse/bseieee754.hh
@@ -18,7 +18,7 @@
 #ifndef __BSE_IEEE754_H__
 #define __BSE_IEEE754_H__
 
-#include <bse/bsedefs.h>
+#include <bse/bsedefs.hh>
 #include <math.h> /* signbit */
 
 /* override math.h definition of PI */
diff --git a/bse/bseincluder.h b/bse/bseincluder.hh
similarity index 99%
rename from bse/bseincluder.h
rename to bse/bseincluder.hh
index 2b17737..8fcd60a 100644
--- a/bse/bseincluder.h
+++ b/bse/bseincluder.hh
@@ -26,7 +26,7 @@
  *   #define BSE_INCLUDER_MATCH(n)   (n >= 10 && n <= 333)
  *   #define BSE_INCLUDER_FUNC(n)    foo<n>
  *   #define BSE_INCLUDER_ARGS(n)    ()
- *   #include "bseincluder.h"
+ *   #include "bseincluder.hh"
  *   }
  */
 
diff --git a/bse/bseinfo.cc b/bse/bseinfo.cc
index a2d4ad6..9da3b61 100644
--- a/bse/bseinfo.cc
+++ b/bse/bseinfo.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseutils.h"
-#include "bsemain.h"
-#include "bsemathsignal.h"
+#include "bseutils.hh"
+#include "bsemain.hh"
+#include "bsemathsignal.hh"
 
 #define	PREC_SHIFT	16
 #define	FLF	"26.20"
diff --git a/bse/bseinstrument.h b/bse/bseinstrument.hh
similarity index 98%
rename from bse/bseinstrument.h
rename to bse/bseinstrument.hh
index f3e91cf..fa84652 100644
--- a/bse/bseinstrument.h
+++ b/bse/bseinstrument.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_INSTRUMENT_H__
 #define __BSE_INSTRUMENT_H__
 
-#include	<bse/bseitem.h>
+#include	<bse/bseitem.hh>
 
 
 #ifdef __cplusplus
diff --git a/bse/bseinstrumentinput.cc b/bse/bseinstrumentinput.cc
index 1a36d7b..be05ab7 100644
--- a/bse/bseinstrumentinput.cc
+++ b/bse/bseinstrumentinput.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseinstrumentinput.h"
+#include "bseinstrumentinput.hh"
 
-#include "bsecategories.h"
-#include "bsesnet.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bsesnet.hh"
+#include "bseengine.hh"
 
 #include <string.h>
 
diff --git a/bse/bseinstrumentinput.h b/bse/bseinstrumentinput.hh
similarity index 98%
rename from bse/bseinstrumentinput.h
rename to bse/bseinstrumentinput.hh
index 48c350e..e12f5b5 100644
--- a/bse/bseinstrumentinput.h
+++ b/bse/bseinstrumentinput.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_INSTRUMENT_INPUT_H__
 #define __BSE_INSTRUMENT_INPUT_H__
 
-#include <bse/bsesubiport.h>
+#include <bse/bsesubiport.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseinstrumentoutput.cc b/bse/bseinstrumentoutput.cc
index ea444b4..f148ace 100644
--- a/bse/bseinstrumentoutput.cc
+++ b/bse/bseinstrumentoutput.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseinstrumentoutput.h"
+#include "bseinstrumentoutput.hh"
 
-#include "bsecategories.h"
-#include "bsesnet.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bsesnet.hh"
+#include "bseengine.hh"
 
 #include <string.h>
 
diff --git a/bse/bseinstrumentoutput.h b/bse/bseinstrumentoutput.hh
similarity index 98%
rename from bse/bseinstrumentoutput.h
rename to bse/bseinstrumentoutput.hh
index ea0e3e8..328391b 100644
--- a/bse/bseinstrumentoutput.h
+++ b/bse/bseinstrumentoutput.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_INSTRUMENT_OUTPUT_H__
 #define __BSE_INSTRUMENT_OUTPUT_H__
 
-#include <bse/bsesuboport.h>
+#include <bse/bsesuboport.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseitem.cc b/bse/bseitem.cc
index 215b3c5..78f6431 100644
--- a/bse/bseitem.cc
+++ b/bse/bseitem.cc
@@ -14,16 +14,16 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseitem.h"
-#include "bsesuper.h"
-#include "bsesnet.h"
-#include "bsestorage.h"
-#include "bseprocedure.h"
-#include "bsemain.h"
-#include "bseparasite.h"
-#include "bseproject.h"
-#include "bsesong.h" // for song->musical_tuning
-#include "bseundostack.h"
+#include "bseitem.hh"
+#include "bsesuper.hh"
+#include "bsesnet.hh"
+#include "bsestorage.hh"
+#include "bseprocedure.hh"
+#include "bsemain.hh"
+#include "bseparasite.hh"
+#include "bseproject.hh"
+#include "bsesong.hh" // for song->musical_tuning
+#include "bseundostack.hh"
 #include <gobject/gvaluecollector.h>
 #include <string.h>
 
diff --git a/bse/bseitem.h b/bse/bseitem.hh
similarity index 99%
rename from bse/bseitem.h
rename to bse/bseitem.hh
index 1807581..b1a0980 100644
--- a/bse/bseitem.h
+++ b/bse/bseitem.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_ITEM_H__
 #define __BSE_ITEM_H__
 
-#include        <bse/bseobject.h>
+#include        <bse/bseobject.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseitem.proc b/bse/bseitem.proc
index 052e952..87c0d5b 100644
--- a/bse/bseitem.proc
+++ b/bse/bseitem.proc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseitem.h>
-#include <bse/bsecontainer.h>
-#include <bse/bseundostack.h>
-#include <bse/bseparasite.h>	// FIXME
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseitem.hh>
+#include <bse/bsecontainer.hh>
+#include <bse/bseundostack.hh>
+#include <bse/bseparasite.hh>	// FIXME
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsejanitor.cc b/bse/bsejanitor.cc
index 103eab4..9711ac5 100644
--- a/bse/bsejanitor.cc
+++ b/bse/bsejanitor.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsejanitor.h"
-#include "bsemain.h"
-#include "bseglue.h"
-#include "bseserver.h"
-#include "bsecontainer.h"
-#include "bseprocedure.h"
-#include "bsescripthelper.h"
+#include "bsejanitor.hh"
+#include "bsemain.hh"
+#include "bseglue.hh"
+#include "bseserver.hh"
+#include "bsecontainer.hh"
+#include "bseprocedure.hh"
+#include "bsescripthelper.hh"
 
 
 enum
diff --git a/bse/bsejanitor.h b/bse/bsejanitor.hh
similarity index 99%
rename from bse/bsejanitor.h
rename to bse/bsejanitor.hh
index 92a036a..fb2032a 100644
--- a/bse/bsejanitor.h
+++ b/bse/bsejanitor.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_JANITOR_H__
 #define __BSE_JANITOR_H__
 
-#include <bse/bseitem.h>
+#include <bse/bseitem.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsejanitor.proc b/bse/bsejanitor.proc
index 69c90cb..aef848a 100644
--- a/bse/bsejanitor.proc
+++ b/bse/bsejanitor.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsejanitor.h>
-#include <bse/bseserver.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsejanitor.hh>
+#include <bse/bseserver.hh>
 #include <string.h>
 
 
diff --git a/bse/bseladspa.cc b/bse/bseladspa.cc
index edd6d8b..b7d376c 100644
--- a/bse/bseladspa.cc
+++ b/bse/bseladspa.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseladspa.h"
-#include "bseladspamodule.h"
-#include "bsecategories.h"
+#include "bseladspa.hh"
+#include "bseladspamodule.hh"
+#include "bsecategories.hh"
 #include <birnet/birnet.hh>
 #include <string.h>
 
-#include "ladspa.h"
+#include "ladspa.hh"
 
 using namespace Birnet;
 
diff --git a/bse/bseladspa.h b/bse/bseladspa.hh
similarity index 99%
rename from bse/bseladspa.h
rename to bse/bseladspa.hh
index 7839ae0..fbfb43e 100644
--- a/bse/bseladspa.h
+++ b/bse/bseladspa.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_LADSPA_H__
 #define __BSE_LADSPA_H__
 
-#include <bse/bseutils.h>
+#include <bse/bseutils.hh>
 #include <gmodule.h>
 
 G_BEGIN_DECLS
diff --git a/bse/bseladspamodule.cc b/bse/bseladspamodule.cc
index 01a26c9..d071352 100644
--- a/bse/bseladspamodule.cc
+++ b/bse/bseladspamodule.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseladspamodule.h"
+#include "bseladspamodule.hh"
 #include "bseblockutils.hh"
-#include "bsecategories.h"
-#include "bseengine.h"
-#include "bsemathsignal.h"
+#include "bsecategories.hh"
+#include "bseengine.hh"
+#include "bsemathsignal.hh"
 #include <string.h>
 
 
diff --git a/bse/bseladspamodule.h b/bse/bseladspamodule.hh
similarity index 97%
rename from bse/bseladspamodule.h
rename to bse/bseladspamodule.hh
index 98c64c4..ed46261 100644
--- a/bse/bseladspamodule.h
+++ b/bse/bseladspamodule.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_LADSPA_MODULE_H__
 #define __BSE_LADSPA_MODULE_H__
 
-#include <bse/bsesource.h>
-#include <bse/bseladspa.h>
+#include <bse/bsesource.hh>
+#include <bse/bseladspa.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseloader-aiff.cc b/bse/bseloader-aiff.cc
index f7ef500..b542be4 100644
--- a/bse/bseloader-aiff.cc
+++ b/bse/bseloader-aiff.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseloader.h"
-#include "bsemain.h"
-#include "gsldatahandle.h"
-#include "bsemath.h"
+#include "bseloader.hh"
+#include "bsemain.hh"
+#include "gsldatahandle.hh"
+#include "bsemath.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/bse/bseloader-bsewave.cc b/bse/bseloader-bsewave.cc
index 1aaf83f..e68da1b 100644
--- a/bse/bseloader-bsewave.cc
+++ b/bse/bseloader-bsewave.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseloader.h"
-#include "bsemain.h"
-#include "gsldatahandle.h"
-#include "gsldatahandle-vorbis.h"
-#include "bsemath.h"
+#include "bseloader.hh"
+#include "bsemain.hh"
+#include "gsldatahandle.hh"
+#include "gsldatahandle-vorbis.hh"
+#include "bsemath.hh"
 #include <sfi/sfistore.hh>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/bse/bseloader-guspatch.cc b/bse/bseloader-guspatch.cc
index c5a7e0e..4efccb4 100644
--- a/bse/bseloader-guspatch.cc
+++ b/bse/bseloader-guspatch.cc
@@ -15,7 +15,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseloader.h"
+#include "bseloader.hh"
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/bse/bseloader-mad.cc b/bse/bseloader-mad.cc
index 4872941..15b6845 100644
--- a/bse/bseloader-mad.cc
+++ b/bse/bseloader-mad.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "topconfig.h"
-#include "bse/bseloader.h"
-#include "gsldatahandle-mad.h"
+#include "bse/bseloader.hh"
+#include "gsldatahandle-mad.hh"
 
 #include <unistd.h>
 #include <string.h>
diff --git a/bse/bseloader-oggvorbis.cc b/bse/bseloader-oggvorbis.cc
index 910394f..994d124 100644
--- a/bse/bseloader-oggvorbis.cc
+++ b/bse/bseloader-oggvorbis.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bse/bseloader.h"
+#include "bse/bseloader.hh"
 
-#include <bse/gsldatahandle.h>
-#include "gsldatahandle-vorbis.h"
+#include <bse/gsldatahandle.hh>
+#include "gsldatahandle-vorbis.hh"
 
 #include <vorbis/vorbisfile.h>
 #include <unistd.h>
diff --git a/bse/bseloader-wav.cc b/bse/bseloader-wav.cc
index bfea812..43d6be6 100644
--- a/bse/bseloader-wav.cc
+++ b/bse/bseloader-wav.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseloader.h"
+#include "bseloader.hh"
 
-#include "gsldatahandle.h"
+#include "gsldatahandle.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bse/bseloader.cc b/bse/bseloader.cc
index e3664b6..4bb0959 100644
--- a/bse/bseloader.cc
+++ b/bse/bseloader.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseloader.h"
-#include "bsemain.h"
-#include "gslcommon.h"
-#include "gsldatahandle.h"
-#include "gslmagic.h"
-#include "gslfilehash.h"
+#include "bseloader.hh"
+#include "bsemain.hh"
+#include "gslcommon.hh"
+#include "gsldatahandle.hh"
+#include "gslmagic.hh"
+#include "gslfilehash.hh"
 #include <string.h>
 
 
diff --git a/bse/bseloader.h b/bse/bseloader.hh
similarity index 98%
rename from bse/bseloader.h
rename to bse/bseloader.hh
index 3d34151..e0a4ce6 100644
--- a/bse/bseloader.h
+++ b/bse/bseloader.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_LOADER_H__
 #define __BSE_LOADER_H__
 
-#include <bse/bseutils.h>
-#include <bse/gslwavechunk.h>
+#include <bse/bseutils.hh>
+#include <bse/gslwavechunk.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 2d684f0..ee167ba 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -14,19 +14,19 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemain.h"
+#include "bsemain.hh"
 #include "topconfig.h"
-#include "bseserver.h"
-#include "bsesequencer.h"
-#include "bsejanitor.h"
-#include "bseplugin.h"
-#include "bsecategories.h"
-#include "bsemidireceiver.h"
-#include "bsemathsignal.h"
-#include "gsldatacache.h"
-#include "bsepcmdevice.h"
-#include "bsemididevice.h"
-#include "bseengine.h"
+#include "bseserver.hh"
+#include "bsesequencer.hh"
+#include "bsejanitor.hh"
+#include "bseplugin.hh"
+#include "bsecategories.hh"
+#include "bsemidireceiver.hh"
+#include "bsemathsignal.hh"
+#include "gsldatacache.hh"
+#include "bsepcmdevice.hh"
+#include "bsemididevice.hh"
+#include "bseengine.hh"
 #include "bseblockutils.hh" /* bse_block_impl_name() */
 #include <string.h>
 #include <stdlib.h>
@@ -45,7 +45,7 @@ static void	bse_async_parse_args	(gint	        *argc_p,
 
 
 /* --- variables --- */
-/* from bse.h */
+/* from bse.hh */
 const guint		 bse_major_version = BSE_MAJOR_VERSION;
 const guint		 bse_minor_version = BSE_MINOR_VERSION;
 const guint		 bse_micro_version = BSE_MICRO_VERSION;
diff --git a/bse/bsemain.h b/bse/bsemain.hh
similarity index 97%
rename from bse/bsemain.h
rename to bse/bsemain.hh
index d9a2b1e..059f2bc 100644
--- a/bse/bsemain.h
+++ b/bse/bsemain.hh
@@ -17,15 +17,15 @@
 #ifndef __BSE_MAIN_H__
 #define __BSE_MAIN_H__
 
-#include	<bse/bse.h>	/* initialization */
-#include        <bse/bsetype.h>
+#include	<bse/bse.hh>	/* initialization */
+#include        <bse/bsetype.hh>
 
 G_BEGIN_DECLS
 
 
 /* --- initialization --- */
 void		bse_init_textdomain_only (void);
-#if 0	// prototyped in bse.h */
+#if 0	// prototyped in bse.hh */
 void		bse_init_async		(gint		*argc,
 					 gchar	      ***argv,
 					 const char     *app_name,
diff --git a/bse/bsemath.cc b/bse/bsemath.cc
index 3142dad..b94985e 100644
--- a/bse/bsemath.cc
+++ b/bse/bsemath.cc
@@ -15,7 +15,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemath.h"
+#include "bsemath.hh"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/bse/bsemath.h b/bse/bsemath.hh
similarity index 99%
rename from bse/bsemath.h
rename to bse/bsemath.hh
index 8f481f2..a9ec759 100644
--- a/bse/bsemath.h
+++ b/bse/bsemath.hh
@@ -18,13 +18,13 @@
 #ifndef __BSE_MATH_H__
 #define __BSE_MATH_H__
 
-#include <bse/bsedefs.h>
-#include <bse/bseieee754.h> 	/* provides math.h */
+#include <bse/bsedefs.hh>
+#include <bse/bseieee754.hh> 	/* provides math.h */
 
 G_BEGIN_DECLS
 
 /* --- constants --- */
-/* PI is defined in bseieee754.h */
+/* PI is defined in bseieee754.hh */
 #define BSE_1_DIV_PI                  (0.3183098861837906715377675267450287240689)   // 1/pi
 #define BSE_PI_DIV_2                  (1.570796326794896619231321691639751442099)    // pi/2
 #define BSE_2_DIV_PI                  (0.6366197723675813430755350534900574481378)   // 2/pi
diff --git a/bse/bsemathsignal.cc b/bse/bsemathsignal.cc
index 0a977c4..8a8c56c 100644
--- a/bse/bsemathsignal.cc
+++ b/bse/bsemathsignal.cc
@@ -15,7 +15,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemathsignal.h"
+#include "bsemathsignal.hh"
 
 
 /* --- frequency modulation --- */
diff --git a/bse/bsemathsignal.h b/bse/bsemathsignal.hh
similarity index 99%
rename from bse/bsemathsignal.h
rename to bse/bsemathsignal.hh
index 6c8c78b..afda195 100644
--- a/bse/bsemathsignal.h
+++ b/bse/bsemathsignal.hh
@@ -18,9 +18,9 @@
 #ifndef __BSE_SIGNAL_H__
 #define __BSE_SIGNAL_H__
 
-#include <bse/bsemath.h>
-#include <bse/bseglobals.h>
-#include <bse/bsetype.h> // for BseMusicalTuningType
+#include <bse/bsemath.hh>
+#include <bse/bseglobals.hh>
+#include <bse/bsetype.hh> // for BseMusicalTuningType
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidicontroller.cc b/bse/bsemidicontroller.cc
index 4dd4f1c..0e58a0d 100644
--- a/bse/bsemidicontroller.cc
+++ b/bse/bsemidicontroller.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidicontroller.h"
+#include "bsemidicontroller.hh"
 
-#include "bsecategories.h"
-#include "bsemidireceiver.h"
-#include "bsesnet.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bsemidireceiver.hh"
+#include "bsesnet.hh"
+#include "bseengine.hh"
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsemidicontroller.h b/bse/bsemidicontroller.hh
similarity index 97%
rename from bse/bsemidicontroller.h
rename to bse/bsemidicontroller.hh
index 7581ec2..5c175a8 100644
--- a/bse/bsemidicontroller.h
+++ b/bse/bsemidicontroller.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_CONTROLLER_H__
 #define __BSE_MIDI_CONTROLLER_H__
 
-#include <bse/bsesource.h>
-#include <bse/bsemidievent.h>
+#include <bse/bsesource.hh>
+#include <bse/bsemidievent.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemididecoder.cc b/bse/bsemididecoder.cc
index 513528d..de7ff24 100644
--- a/bse/bsemididecoder.cc
+++ b/bse/bsemididecoder.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemididecoder.h"
-#include "bsemidireceiver.h"
-#include "bseengine.h"
+#include "bsemididecoder.hh"
+#include "bsemidireceiver.hh"
+#include "bseengine.hh"
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_midi_decoder, "midi-decoder", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bsemididecoder.h b/bse/bsemididecoder.hh
similarity index 98%
rename from bse/bsemididecoder.h
rename to bse/bsemididecoder.hh
index 1409a47..e3a3465 100644
--- a/bse/bsemididecoder.h
+++ b/bse/bsemididecoder.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_MIDI_DECODER_H__
 #define __BSE_MIDI_DECODER_H__
 
-#include        <bse/bsemidievent.h>
+#include        <bse/bsemidievent.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemididevice-null.cc b/bse/bsemididevice-null.cc
index 72573ef..524e9e6 100644
--- a/bse/bsemididevice-null.cc
+++ b/bse/bsemididevice-null.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"bsemididevice-null.h"
+#include	"bsemididevice-null.hh"
 
-#include	"bseserver.h"
+#include	"bseserver.hh"
 
 static SFI_MSG_TYPE_DEFINE (debug_midi, "midi", SFI_MSG_DEBUG, NULL);
 #define MIDI_DEBUG(...) sfi_debug (debug_midi, __VA_ARGS__)
diff --git a/bse/bsemididevice-null.h b/bse/bsemididevice-null.hh
similarity index 94%
rename from bse/bsemididevice-null.h
rename to bse/bsemididevice-null.hh
index 4444e1b..56110c9 100644
--- a/bse/bsemididevice-null.h
+++ b/bse/bsemididevice-null.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsemididevice-oss.h: midi device implementation for OSS Lite driver
+ * bsemididevice-oss.hh: midi device implementation for OSS Lite driver
  */
 #ifndef	__BSE_MIDI_DEVICE_NULL_H__
 #define	__BSE_MIDI_DEVICE_NULL_H__
 
-#include	<bse/bsemididevice.h>
+#include	<bse/bsemididevice.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemididevice-oss.cc b/bse/bsemididevice-oss.cc
index 2983fad..895c7b0 100644
--- a/bse/bsemididevice-oss.cc
+++ b/bse/bsemididevice-oss.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemididevice-oss.h"
-#include "bseserver.h"
-#include "bsemididecoder.h"
-#include "gslcommon.h" // FIXME: remove
-#include "bsesequencer.h"
+#include "bsemididevice-oss.hh"
+#include "bseserver.hh"
+#include "bsemididecoder.hh"
+#include "gslcommon.hh" // FIXME: remove
+#include "bsesequencer.hh"
 #include "topconfig.h"
 
 #ifndef	BSE_MIDI_DEVICE_CONF_OSS
diff --git a/bse/bsemididevice-oss.h b/bse/bsemididevice-oss.hh
similarity index 94%
rename from bse/bsemididevice-oss.h
rename to bse/bsemididevice-oss.hh
index e97a28e..944771d 100644
--- a/bse/bsemididevice-oss.h
+++ b/bse/bsemididevice-oss.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsemididevice-oss.h: midi device implementation for OSS Lite driver
+ * bsemididevice-oss.hh: midi device implementation for OSS Lite driver
  */
 #ifndef	__BSE_MIDI_DEVICE_OSS_H__
 #define	__BSE_MIDI_DEVICE_OSS_H__
 
-#include	<bse/bsemididevice.h>
+#include	<bse/bsemididevice.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsemididevice.cc b/bse/bsemididevice.cc
index af393c6..5c8ab13 100644
--- a/bse/bsemididevice.cc
+++ b/bse/bsemididevice.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemididevice.h"
+#include "bsemididevice.hh"
 
-#include "bsemididecoder.h"
+#include "bsemididecoder.hh"
 
 #include <errno.h>
 
diff --git a/bse/bsemididevice.h b/bse/bsemididevice.hh
similarity index 93%
rename from bse/bsemididevice.h
rename to bse/bsemididevice.hh
index 057b6e6..7303467 100644
--- a/bse/bsemididevice.h
+++ b/bse/bsemididevice.hh
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsemididevice.h: midi (musical instruments digital interface) device driver
+ * bsemididevice.hh: midi (musical instruments digital interface) device driver
  */
 #ifndef __BSE_MIDI_DEVICE_H__
 #define __BSE_MIDI_DEVICE_H__
 
-#include        <bse/bsedevice.h>
-#include        <bse/bsemidievent.h>
+#include        <bse/bsedevice.hh>
+#include        <bse/bsemidievent.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidievent.cc b/bse/bsemidievent.cc
index 9ada9e5..7f5bb18 100644
--- a/bse/bsemidievent.cc
+++ b/bse/bsemidievent.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidievent.h"
+#include "bsemidievent.hh"
 
-#include "bseglue.h"
-#include "gslcommon.h"
-#include "bseieee754.h"
+#include "bseglue.hh"
+#include "gslcommon.hh"
+#include "bseieee754.hh"
 #include "bsecxxplugin.hh"
 
 #include <errno.h>
diff --git a/bse/bsemidievent.h b/bse/bsemidievent.hh
similarity index 99%
rename from bse/bsemidievent.h
rename to bse/bsemidievent.hh
index e9c30dd..e1e5203 100644
--- a/bse/bsemidievent.h
+++ b/bse/bsemidievent.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_MIDI_EVENT_H__
 #define __BSE_MIDI_EVENT_H__
 
-#include <bse/bseobject.h>
+#include <bse/bseobject.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidifile.cc b/bse/bsemidifile.cc
index 86cd3dc..4ef11bc 100644
--- a/bse/bsemidifile.cc
+++ b/bse/bsemidifile.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidifile.h"
-#include "bsemididecoder.h"
-#include "bseitem.h"
-#include "gslcommon.h"
+#include "bsemidifile.hh"
+#include "bsemididecoder.hh"
+#include "bseitem.hh"
+#include "gslcommon.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/bse/bsemidifile.h b/bse/bsemidifile.hh
similarity index 98%
rename from bse/bsemidifile.h
rename to bse/bsemidifile.hh
index 2add9ce..fadfaf9 100644
--- a/bse/bsemidifile.h
+++ b/bse/bsemidifile.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_MIDI_FILE_H__
 #define __BSE_MIDI_FILE_H__
 
-#include <bse/bsemidievent.h>
+#include <bse/bsemidievent.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidiinput.cc b/bse/bsemidiinput.cc
index c39b613..2744131 100644
--- a/bse/bsemidiinput.cc
+++ b/bse/bsemidiinput.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidiinput.h"
+#include "bsemidiinput.hh"
 
-#include "bsecategories.h"
-#include "bsemidireceiver.h"
-#include "bsesnet.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bsemidireceiver.hh"
+#include "bsesnet.hh"
+#include "bseengine.hh"
 
 
 
diff --git a/bse/bsemidiinput.h b/bse/bsemidiinput.hh
similarity index 97%
rename from bse/bsemidiinput.h
rename to bse/bsemidiinput.hh
index 2e172c2..63558e8 100644
--- a/bse/bsemidiinput.h
+++ b/bse/bsemidiinput.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_INPUT_H__
 #define __BSE_MIDI_INPUT_H__
 
-#include <bse/bsesource.h>
-#include <bse/bsemidievent.h>
+#include <bse/bsesource.hh>
+#include <bse/bsemidievent.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsemidinotifier.cc b/bse/bsemidinotifier.cc
index b95b7a3..a484f4e 100644
--- a/bse/bsemidinotifier.cc
+++ b/bse/bsemidinotifier.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidinotifier.h"
-#include "bsemain.h"
-#include "gslcommon.h"
+#include "bsemidinotifier.hh"
+#include "bsemain.hh"
+#include "gslcommon.hh"
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsemidinotifier.h b/bse/bsemidinotifier.hh
similarity index 97%
rename from bse/bsemidinotifier.h
rename to bse/bsemidinotifier.hh
index 0d7ab39..e94bea3 100644
--- a/bse/bsemidinotifier.h
+++ b/bse/bsemidinotifier.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_NOTIFIER_H__
 #define __BSE_MIDI_NOTIFIER_H__
 
-#include <bse/bseitem.h>
-#include <bse/bsemidireceiver.h>
+#include <bse/bseitem.hh>
+#include <bse/bsemidireceiver.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsemidinotifier.proc b/bse/bsemidinotifier.proc
index 59a482f..8e5ed98 100644
--- a/bse/bsemidinotifier.proc
+++ b/bse/bsemidinotifier.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsemidinotifier.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsemidinotifier.hh>
 #include <sys/time.h>
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsemidireceiver.cc b/bse/bsemidireceiver.cc
index 8fe95ce..52df2b8 100644
--- a/bse/bsemidireceiver.cc
+++ b/bse/bsemidireceiver.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidireceiver.h"
+#include "bsemidireceiver.hh"
 
-#include "bsemain.h"
-#include "gslcommon.h"
-#include "bseengine.h"
-#include "bsemathsignal.h"
+#include "bsemain.hh"
+#include "gslcommon.hh"
+#include "bseengine.hh"
+#include "bsemathsignal.hh"
 #include "bsecxxutils.hh"
-#include "bsemidinotifier.h"
+#include "bsemidinotifier.hh"
 #include <string.h>
 #include <sfi/gbsearcharray.hh>
 #include <map>
diff --git a/bse/bsemidireceiver.h b/bse/bsemidireceiver.hh
similarity index 99%
rename from bse/bsemidireceiver.h
rename to bse/bsemidireceiver.hh
index 4c60955..3b1a2a3 100644
--- a/bse/bsemidireceiver.h
+++ b/bse/bsemidireceiver.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_RECEIVER_H__
 #define __BSE_MIDI_RECEIVER_H__
 
-#include        <bse/bseobject.h>
-#include        <bse/bsemidievent.h>
+#include        <bse/bseobject.hh>
+#include        <bse/bsemidievent.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidisynth.cc b/bse/bsemidisynth.cc
index 4aaceb3..4ed68ed 100644
--- a/bse/bsemidisynth.cc
+++ b/bse/bsemidisynth.cc
@@ -14,16 +14,16 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidisynth.h"
-
-#include "bsemidievent.h"	/* BSE_MIDI_MAX_CHANNELS */
-#include "bsemidivoice.h"
-#include "bsemidireceiver.h"
-#include "bsecontextmerger.h"
-#include "bsesubsynth.h"
-#include "bsepcmoutput.h"
-#include "bseproject.h"
-#include "bsecsynth.h"
+#include "bsemidisynth.hh"
+
+#include "bsemidievent.hh"	/* BSE_MIDI_MAX_CHANNELS */
+#include "bsemidivoice.hh"
+#include "bsemidireceiver.hh"
+#include "bsecontextmerger.hh"
+#include "bsesubsynth.hh"
+#include "bsepcmoutput.hh"
+#include "bseproject.hh"
+#include "bsecsynth.hh"
 #include <string.h>
 #include <time.h>
 #include <fcntl.h>
diff --git a/bse/bsemidisynth.h b/bse/bsemidisynth.hh
similarity index 95%
rename from bse/bsemidisynth.h
rename to bse/bsemidisynth.hh
index 453af6b..a2edb12 100644
--- a/bse/bsemidisynth.h
+++ b/bse/bsemidisynth.hh
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsemidisynth.h: bse midi synthesizer
+ * bsemidisynth.hh: bse midi synthesizer
  */
 #ifndef	__BSE_MIDI_SYNTH_H__
 #define	__BSE_MIDI_SYNTH_H__
 
-#include	<bse/bsesnet.h>
-#include	<bse/bsesubsynth.h>
+#include	<bse/bsesnet.hh>
+#include	<bse/bsesubsynth.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsemidivoice.cc b/bse/bsemidivoice.cc
index 1b0e709..8ea1817 100644
--- a/bse/bsemidivoice.cc
+++ b/bse/bsemidivoice.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemidivoice.h"
+#include "bsemidivoice.hh"
 
-#include "bseserver.h"
-#include "bsemidireceiver.h"
-#include "bseengine.h"
-#include "gslcommon.h"
-#include "bsesnet.h"
+#include "bseserver.hh"
+#include "bsemidireceiver.hh"
+#include "bseengine.hh"
+#include "gslcommon.hh"
+#include "bsesnet.hh"
 
 
 /* --- prototypes --- */
diff --git a/bse/bsemidivoice.h b/bse/bsemidivoice.hh
similarity index 98%
rename from bse/bsemidivoice.h
rename to bse/bsemidivoice.hh
index 3d78e3e..71d2e94 100644
--- a/bse/bsemidivoice.h
+++ b/bse/bsemidivoice.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_VOICE_H__
 #define __BSE_MIDI_VOICE_H__
 
-#include <bse/bsesource.h>
-#include <bse/bsesnet.h>
+#include <bse/bsesource.hh>
+#include <bse/bsesnet.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsenote.cc b/bse/bsenote.cc
index c41adff..7b224ad 100644
--- a/bse/bsenote.cc
+++ b/bse/bsenote.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsenote.h"
-#include "bseutils.h"
-#include "bseieee754.h"
-#include "bsemathsignal.h"
+#include "bsenote.hh"
+#include "bseutils.hh"
+#include "bseieee754.hh"
+#include "bsemathsignal.hh"
 #include <string.h>
 #include <birnet/birnet.hh>
 
diff --git a/bse/bsenote.h b/bse/bsenote.hh
similarity index 98%
rename from bse/bsenote.h
rename to bse/bsenote.hh
index 53765a1..a18d622 100644
--- a/bse/bsenote.h
+++ b/bse/bsenote.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_NOTE_H__
 #define __BSE_NOTE_H__
 
-#include        <bse/bseglobals.h>
-#include        <bse/bsetype.h>
+#include        <bse/bseglobals.hh>
+#include        <bse/bsetype.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseobject.cc b/bse/bseobject.cc
index 798bac6..ef863b4 100644
--- a/bse/bseobject.cc
+++ b/bse/bseobject.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseobject.h"
-
-#include "bseexports.h"
-#include "bsestorage.h"
-#include "bseparasite.h"
-#include "bsecategories.h"
-#include "bsegconfig.h"
-#include "bsesource.h"		/* debug hack */
+#include "bseobject.hh"
+
+#include "bseexports.hh"
+#include "bsestorage.hh"
+#include "bseparasite.hh"
+#include "bsecategories.hh"
+#include "bsegconfig.hh"
+#include "bsesource.hh"		/* debug hack */
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_leaks, "leaks", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bseobject.h b/bse/bseobject.hh
similarity index 98%
rename from bse/bseobject.h
rename to bse/bseobject.hh
index 1d4cb99..4aa4642 100644
--- a/bse/bseobject.h
+++ b/bse/bseobject.hh
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bseobject.h: basic object definition for the BSE object heirarchy
+ * bseobject.hh: basic object definition for the BSE object heirarchy
  * a bse object implements means
  * - of setting/retriving an object name and blurb
  * - to set generic keyed data
@@ -24,7 +24,7 @@
 #ifndef __BSE_OBJECT_H__
 #define __BSE_OBJECT_H__
 
-#include	<bse/bseparam.h>
+#include	<bse/bseparam.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseparam.cc b/bse/bseparam.cc
index 040cd05..98f4826 100644
--- a/bse/bseparam.cc
+++ b/bse/bseparam.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseparam.h"
-#include "bseobject.h"
+#include "bseparam.hh"
+#include "bseobject.hh"
 
 
 #define NULL_CHECKED(x)         ((x) && (x)[0] ? x : NULL)
diff --git a/bse/bseparam.h b/bse/bseparam.hh
similarity index 97%
rename from bse/bseparam.h
rename to bse/bseparam.hh
index 34a4096..977dbd6 100644
--- a/bse/bseparam.h
+++ b/bse/bseparam.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_PARAM_H__
 #define __BSE_PARAM_H__
 
-#include        <bse/bsetype.h>
-#include        <bse/bseutils.h>
+#include        <bse/bsetype.hh>
+#include        <bse/bseutils.hh>
 
 
 #ifdef __cplusplus
diff --git a/bse/bseparasite.cc b/bse/bseparasite.cc
index a240ec9..131d96f 100644
--- a/bse/bseparasite.cc
+++ b/bse/bseparasite.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseparasite.h"
-#include "bseundostack.h"
-#include "bsestorage.h"
+#include "bseparasite.hh"
+#include "bseundostack.hh"
+#include "bsestorage.hh"
 #include <sfi/gbsearcharray.hh>
 #include <string.h>
 
diff --git a/bse/bseparasite.h b/bse/bseparasite.hh
similarity index 99%
rename from bse/bseparasite.h
rename to bse/bseparasite.hh
index ca15233..28e6d14 100644
--- a/bse/bseparasite.h
+++ b/bse/bseparasite.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PARASITE_H__
 #define __BSE_PARASITE_H__
 
-#include <bse/bseitem.h>
+#include <bse/bseitem.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseparasite.proc b/bse/bseparasite.proc
index 112f7b3..8e0c123 100644
--- a/bse/bseparasite.proc
+++ b/bse/bseparasite.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseparasite.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseexports.h>
+#include <bse/bseparasite.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseexports.hh>
 #include "bsecxxplugin.hh"
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsepart.cc b/bse/bsepart.cc
index 9401c07..c840d05 100644
--- a/bse/bsepart.cc
+++ b/bse/bsepart.cc
@@ -14,15 +14,15 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepart.h"
-#include "bsemain.h"
-#include "bsestorage.h"
-#include "bsesong.h"
-#include "bsetrack.h"
+#include "bsepart.hh"
+#include "bsemain.hh"
+#include "bsestorage.hh"
+#include "bsesong.hh"
+#include "bsetrack.hh"
 #include "bsecxxplugin.hh"
-#include "gslcommon.h"
-#include "bsemathsignal.h" // bse_semitone_table
-#include "bseieee754.h"
+#include "gslcommon.hh"
+#include "bsemathsignal.hh" // bse_semitone_table
+#include "bseieee754.hh"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/bse/bsepart.h b/bse/bsepart.hh
similarity index 99%
rename from bse/bsepart.h
rename to bse/bsepart.hh
index 7d2c339..0c419df 100644
--- a/bse/bsepart.h
+++ b/bse/bsepart.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PART_H__
 #define __BSE_PART_H__
 
-#include <bse/bseitem.h>
+#include <bse/bseitem.hh>
 #include <sfi/gbsearcharray.hh>
 
 G_BEGIN_DECLS
diff --git a/bse/bsepart.proc b/bse/bsepart.proc
index b1d7249..da8490f 100644
--- a/bse/bsepart.proc
+++ b/bse/bsepart.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsepart.h>
-#include <bse/bsesong.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsepart.hh>
+#include <bse/bsesong.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsepattern.h b/bse/bsepattern.hh
similarity index 98%
rename from bse/bsepattern.h
rename to bse/bsepattern.hh
index 61431a4..486b7ba 100644
--- a/bse/bsepattern.h
+++ b/bse/bsepattern.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsepattern.h: notes container for songs
+ * bsepattern.hh: notes container for songs
  */
 #ifndef __BSE_PATTERN_H__
 #define __BSE_PATTERN_H__
 
-#include	<bse/bseitem.h>
+#include	<bse/bseitem.hh>
 #include	<bse/bseeffect.h>
 
 
diff --git a/bse/bsepatterngroup.h b/bse/bsepatterngroup.hh
similarity index 96%
rename from bse/bsepatterngroup.h
rename to bse/bsepatterngroup.hh
index fa8ffdb..ddd3e09 100644
--- a/bse/bsepatterngroup.h
+++ b/bse/bsepatterngroup.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsepatterngroup.h: patternary group container
+ * bsepatterngroup.hh: patternary group container
  */
 #ifndef __BSE_PATTERN_GROUP_H__
 #define __BSE_PATTERN_GROUP_H__
 
-#include        <bse/bsepattern.h>
+#include        <bse/bsepattern.hh>
 
 
 /* --- object type macros --- */
diff --git a/bse/bsepcmdevice-null.cc b/bse/bsepcmdevice-null.cc
index 5b8265b..9fca37f 100644
--- a/bse/bsepcmdevice-null.cc
+++ b/bse/bsepcmdevice-null.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepcmdevice-null.h"
-#include "bsesequencer.h"
-#include "bseengine.h"
+#include "bsepcmdevice-null.hh"
+#include "bsesequencer.hh"
+#include "bseengine.hh"
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_pcm, "pcm", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bsepcmdevice-null.h b/bse/bsepcmdevice-null.hh
similarity index 98%
rename from bse/bsepcmdevice-null.h
rename to bse/bsepcmdevice-null.hh
index 190ea07..bfe56da 100644
--- a/bse/bsepcmdevice-null.h
+++ b/bse/bsepcmdevice-null.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PCM_DEVICE_NULL_H__
 #define __BSE_PCM_DEVICE_NULL_H__
 
-#include        <bse/bsepcmdevice.h>
+#include        <bse/bsepcmdevice.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsepcmdevice-oss.cc b/bse/bsepcmdevice-oss.cc
index 473f6b3..435d3f0 100644
--- a/bse/bsepcmdevice-oss.cc
+++ b/bse/bsepcmdevice-oss.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"bsepcmdevice-oss.h"
+#include	"bsepcmdevice-oss.hh"
 
 #include	"topconfig.h"
 
-#include	"gsldatautils.h"
-#include	"gslcommon.h" // FIXME: remove
+#include	"gsldatautils.hh"
+#include	"gslcommon.hh" // FIXME: remove
 
 #ifndef	BSE_PCM_DEVICE_CONF_OSS
 BSE_DUMMY_TYPE (BsePcmDeviceOSS);
diff --git a/bse/bsepcmdevice-oss.h b/bse/bsepcmdevice-oss.hh
similarity index 94%
rename from bse/bsepcmdevice-oss.h
rename to bse/bsepcmdevice-oss.hh
index 9bc1b03..bc69326 100644
--- a/bse/bsepcmdevice-oss.h
+++ b/bse/bsepcmdevice-oss.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsepcmdevice-oss.h: pcm device implementation for OSS Lite driver
+ * bsepcmdevice-oss.hh: pcm device implementation for OSS Lite driver
  */
 #ifndef	__BSE_PCM_DEVICE_OSS_H__
 #define	__BSE_PCM_DEVICE_OSS_H__
 
-#include	<bse/bsepcmdevice.h>
+#include	<bse/bsepcmdevice.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsepcmdevice.cc b/bse/bsepcmdevice.cc
index 5047ed6..634f4c4 100644
--- a/bse/bsepcmdevice.cc
+++ b/bse/bsepcmdevice.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepcmdevice.h"
+#include "bsepcmdevice.hh"
 
-#include "gslcommon.h"
+#include "gslcommon.hh"
 #include <errno.h>
 
 
diff --git a/bse/bsepcmdevice.h b/bse/bsepcmdevice.hh
similarity index 98%
rename from bse/bsepcmdevice.h
rename to bse/bsepcmdevice.hh
index 89831c1..328d004 100644
--- a/bse/bsepcmdevice.h
+++ b/bse/bsepcmdevice.hh
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsepcmdevice.h: pcm device driver class
+ * bsepcmdevice.hh: pcm device driver class
  */
 #ifndef __BSE_PCM_DEVICE_H__
 #define __BSE_PCM_DEVICE_H__
 
-#include <bse/bsedevice.h>
+#include <bse/bsedevice.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsepcminput.cc b/bse/bsepcminput.cc
index f73e2bf..3de2e79 100644
--- a/bse/bsepcminput.cc
+++ b/bse/bsepcminput.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepcminput.h"
+#include "bsepcminput.hh"
 
-#include "bsecategories.h"
-#include "bseserver.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bseserver.hh"
+#include "bseengine.hh"
 
 
 
diff --git a/bse/bsepcminput.h b/bse/bsepcminput.hh
similarity index 98%
rename from bse/bsepcminput.h
rename to bse/bsepcminput.hh
index 6aff4d1..55f16de 100644
--- a/bse/bsepcminput.h
+++ b/bse/bsepcminput.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PCM_INPUT_H__
 #define __BSE_PCM_INPUT_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsepcmmodule.cc b/bse/bsepcmmodule.cc
index 9cdc269..99c58bd 100644
--- a/bse/bsepcmmodule.cc
+++ b/bse/bsepcmmodule.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseengine.h"
-#include "bsepcmdevice.h"
+#include "bseengine.hh"
+#include "bsepcmdevice.hh"
 
 
 /* --- typedefs & structures --- */
diff --git a/bse/bsepcmoutput.cc b/bse/bsepcmoutput.cc
index 1db026a..21cba30 100644
--- a/bse/bsepcmoutput.cc
+++ b/bse/bsepcmoutput.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepcmoutput.h"
+#include "bsepcmoutput.hh"
 
-#include "bsecategories.h"
-#include "bseserver.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bseserver.hh"
+#include "bseengine.hh"
 
 
 
diff --git a/bse/bsepcmoutput.h b/bse/bsepcmoutput.hh
similarity index 98%
rename from bse/bsepcmoutput.h
rename to bse/bsepcmoutput.hh
index 8360ffd..1c9983e 100644
--- a/bse/bsepcmoutput.h
+++ b/bse/bsepcmoutput.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PCM_OUTPUT_H__
 #define __BSE_PCM_OUTPUT_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/bsepcmwriter.cc b/bse/bsepcmwriter.cc
index ba9a142..e007d65 100644
--- a/bse/bsepcmwriter.cc
+++ b/bse/bsepcmwriter.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsepcmwriter.h"
-#include "bseserver.h"
-#include "gsldatautils.h"
+#include "bsepcmwriter.hh"
+#include "bseserver.hh"
+#include "gsldatautils.hh"
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/bse/bsepcmwriter.h b/bse/bsepcmwriter.hh
similarity index 98%
rename from bse/bsepcmwriter.h
rename to bse/bsepcmwriter.hh
index 01b0715..2418c8b 100644
--- a/bse/bsepcmwriter.h
+++ b/bse/bsepcmwriter.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PCM_WRITER_H__
 #define __BSE_PCM_WRITER_H__
 
-#include <bse/bseitem.h>
+#include <bse/bseitem.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index 87db882..b499edc 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseplugin.h"
+#include "bseplugin.hh"
 
-#include "bsecategories.h"
-#include "bseprocedure.h"
-#include "bseobject.h"
-#include "bseenums.h"
-#include "bsemain.h"
+#include "bsecategories.hh"
+#include "bseprocedure.hh"
+#include "bseobject.hh"
+#include "bseenums.hh"
+#include "bsemain.hh"
 #include <gmodule.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/bse/bseplugin.h b/bse/bseplugin.hh
similarity index 96%
rename from bse/bseplugin.h
rename to bse/bseplugin.hh
index 3b6d890..d6d0d13 100644
--- a/bse/bseplugin.h
+++ b/bse/bseplugin.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_PLUGIN_H__
 #define __BSE_PLUGIN_H__
 
-#include	<bse/bse.h>	/* for bse_check_version() */
-#include	<bse/bseexports.h>
+#include	<bse/bse.hh>	/* for bse_check_version() */
+#include	<bse/bseexports.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseprobe.cc b/bse/bseprobe.cc
index e9e1292..61b31de 100644
--- a/bse/bseprobe.cc
+++ b/bse/bseprobe.cc
@@ -15,10 +15,10 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseprobe.genidl.hh"
-#include "bseengine.h"
+#include "bseengine.hh"
 #include "bseblockutils.hh"
-#include "gslcommon.h" /* for gsl_tick_stamp() */
-#include "gslfft.h"
+#include "gslcommon.hh" /* for gsl_tick_stamp() */
+#include "gslfft.hh"
 #include <stdexcept>
 #include <set>
 using namespace std;
@@ -733,8 +733,8 @@ BSE_CXX_REGISTER_ALL_TYPES_FROM_BSEPROBE_IDL();
 
 } // Bse
 
-/* --- bsesource.h bits --- */
-extern "C" {    // from bsesource.h
+/* --- bsesource.hh bits --- */
+extern "C" {    // from bsesource.hh
 using namespace Bse;
 
 void
diff --git a/bse/bseprocedure.cc b/bse/bseprocedure.cc
index d18e3e4..c6d1dd8 100644
--- a/bse/bseprocedure.cc
+++ b/bse/bseprocedure.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseprocedure.h"
-#include "bsemain.h"
+#include "bseprocedure.hh"
+#include "bsemain.hh"
 #include <gobject/gvaluecollector.h>
-#include "bseobject.h"
-#include "bseserver.h"
-#include "bsestorage.h"
-#include "bseexports.h"
+#include "bseobject.hh"
+#include "bseserver.hh"
+#include "bsestorage.hh"
+#include "bseexports.hh"
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_procs, "procs", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bseprocedure.h b/bse/bseprocedure.hh
similarity index 99%
rename from bse/bseprocedure.h
rename to bse/bseprocedure.hh
index 9bfd6b9..ad000e6 100644
--- a/bse/bseprocedure.h
+++ b/bse/bseprocedure.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PROCEDURE_H__
 #define __BSE_PROCEDURE_H__
 
-#include	<bse/bseparam.h>
+#include	<bse/bseparam.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseprocedure.proc b/bse/bseprocedure.proc
index 7e786b1..8976806 100644
--- a/bse/bseprocedure.proc
+++ b/bse/bseprocedure.proc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseplugin.h"
-#include "bseprocedure.h"
-#include "bsescripthelper.h"
-#include "bseserver.h"
-#include "bsemath.h"    /* bse_temp_freq */
-#include "bsemain.h"
+#include "bseplugin.hh"
+#include "bseprocedure.hh"
+#include "bsescripthelper.hh"
+#include "bseserver.hh"
+#include "bsemath.hh"    /* bse_temp_freq */
+#include "bsemain.hh"
 #include "bsecxxplugin.hh"
 #include <string.h>     /* strchr */
 #include <stdlib.h>     /* strtol */
diff --git a/bse/bseprocidl.cc b/bse/bseprocidl.cc
index 6cd703c..6815be5 100644
--- a/bse/bseprocidl.cc
+++ b/bse/bseprocidl.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsemain.h"
-#include "bsecategories.h"
-#include "bseprocedure.h"
-#include "bseglue.h"
+#include "bsemain.hh"
+#include "bsecategories.hh"
+#include "bseprocedure.hh"
+#include "bseglue.hh"
 #include <sfi/sfiglue.hh>
 #include <stdio.h>
 #include <string.h>
diff --git a/bse/bseproject.cc b/bse/bseproject.cc
index 9afcd96..2a0802b 100644
--- a/bse/bseproject.cc
+++ b/bse/bseproject.cc
@@ -14,23 +14,23 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseproject.h"
-
-#include "bsesuper.h"
-#include "bsestorage.h"
-#include "bsesong.h"
-#include "bsesnet.h"
-#include "bsecsynth.h"
-#include "bsewaverepo.h"
-#include "bsesequencer.h"
-#include "bseserver.h"
-#include "bseundostack.h"
-#include "bsemain.h"
-#include "bsestandardsynths.h"
-#include "bsemidireceiver.h"
-#include "bsemidinotifier.h"
-#include "gslcommon.h"
-#include "bseengine.h"
+#include "bseproject.hh"
+
+#include "bsesuper.hh"
+#include "bsestorage.hh"
+#include "bsesong.hh"
+#include "bsesnet.hh"
+#include "bsecsynth.hh"
+#include "bsewaverepo.hh"
+#include "bsesequencer.hh"
+#include "bseserver.hh"
+#include "bseundostack.hh"
+#include "bsemain.hh"
+#include "bsestandardsynths.hh"
+#include "bsemidireceiver.hh"
+#include "bsemidinotifier.hh"
+#include "gslcommon.hh"
+#include "bseengine.hh"
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/bse/bseproject.h b/bse/bseproject.hh
similarity index 99%
rename from bse/bseproject.h
rename to bse/bseproject.hh
index baa510b..6f050ff 100644
--- a/bse/bseproject.h
+++ b/bse/bseproject.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_PROJECT_H__
 #define __BSE_PROJECT_H__
 
-#include        <bse/bsecontainer.h>
+#include        <bse/bsecontainer.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseproject.proc b/bse/bseproject.proc
index 18c0028..bc061a7 100644
--- a/bse/bseproject.proc
+++ b/bse/bseproject.proc
@@ -14,20 +14,20 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseproject.h>
-#include <bse/bsestorage.h>
-#include <bse/bsesong.h>
-#include <bse/bseundostack.h>
-#include <bse/bsewaverepo.h>
-#include <bse/bsecsynth.h>
-#include <bse/bsemidisynth.h>
-#include <bse/bsedatapocket.h>
-#include <bse/bsemidifile.h>
-#include <bse/bsemidireceiver.h>
-#include <bse/bsemidinotifier.h>
-#include <bse/bseengine.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseproject.hh>
+#include <bse/bsestorage.hh>
+#include <bse/bsesong.hh>
+#include <bse/bseundostack.hh>
+#include <bse/bsewaverepo.hh>
+#include <bse/bsecsynth.hh>
+#include <bse/bsemidisynth.hh>
+#include <bse/bsedatapocket.hh>
+#include <bse/bsemidifile.hh>
+#include <bse/bsemidireceiver.hh>
+#include <bse/bsemidinotifier.hh>
+#include <bse/bseengine.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsequery.cc b/bse/bsequery.cc
index 3682a23..db4ab14 100644
--- a/bse/bsequery.cc
+++ b/bse/bsequery.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        "bsecategories.h"
-#include        "bsesource.h"
-#include        "bseprocedure.h"
-#include        "bsemain.h"
-#include        "bsestandardsynths.h"
+#include        "bsecategories.hh"
+#include        "bsesource.hh"
+#include        "bseprocedure.hh"
+#include        "bsemain.hh"
+#include        "bsestandardsynths.hh"
 #include        "topconfig.h"
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/bse/bsescripthelper.cc b/bse/bsescripthelper.cc
index 1aff8bb..110c151 100644
--- a/bse/bsescripthelper.cc
+++ b/bse/bsescripthelper.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsescripthelper.h"
+#include "bsescripthelper.hh"
 
 #include "topconfig.h"
-#include "bsecategories.h"
-#include "bsejanitor.h"
-#include "bseserver.h"
-#include "bseglue.h"
-#include "bsemain.h"
+#include "bsecategories.hh"
+#include "bsejanitor.hh"
+#include "bseserver.hh"
+#include "bseglue.hh"
+#include "bsemain.hh"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/bse/bsescripthelper.h b/bse/bsescripthelper.hh
similarity index 97%
rename from bse/bsescripthelper.h
rename to bse/bsescripthelper.hh
index 7778169..e206506 100644
--- a/bse/bsescripthelper.h
+++ b/bse/bsescripthelper.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SCRIPT_HELPER_H__
 #define __BSE_SCRIPT_HELPER_H__
 
-#include        <bse/bseprocedure.h>
+#include        <bse/bseprocedure.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/bsescripthelper.proc b/bse/bsescripthelper.proc
index c97ea3c..485cc47 100644
--- a/bse/bsescripthelper.proc
+++ b/bse/bsescripthelper.proc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsecontainer.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsecontainer.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsesequencer.cc b/bse/bsesequencer.cc
index 03af7b5..3856808 100644
--- a/bse/bsesequencer.cc
+++ b/bse/bsesequencer.cc
@@ -14,16 +14,16 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesequencer.h"
-#include "gslcommon.h"
-#include "bsemathsignal.h"
-#include "bseengine.h"
-#include "bsetrack.h"
-#include "bsepart.h"
-#include "bseproject.h"
-#include "bsemidireceiver.h"
-#include "bsemain.h"
-#include "bseieee754.h"
+#include "bsesequencer.hh"
+#include "gslcommon.hh"
+#include "bsemathsignal.hh"
+#include "bseengine.hh"
+#include "bsetrack.hh"
+#include "bsepart.hh"
+#include "bseproject.hh"
+#include "bsemidireceiver.hh"
+#include "bsemain.hh"
+#include "bseieee754.hh"
 #include <sys/poll.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/bse/bsesequencer.h b/bse/bsesequencer.hh
similarity index 98%
rename from bse/bsesequencer.h
rename to bse/bsesequencer.hh
index 54c9b31..dc3b419 100644
--- a/bse/bsesequencer.h
+++ b/bse/bsesequencer.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SSEQUENCER_H__
 #define __BSE_SSEQUENCER_H__
 
-#include <bse/bsesong.h>
+#include <bse/bsesong.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 8d05573..859edd4 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -14,17 +14,17 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseserver.h"
-#include "bseproject.h"
-#include "bseengine.h"
-#include "gslcommon.h"
-#include "bseglue.h"
-#include "bsegconfig.h"
-#include "bsemidinotifier.h"
-#include "bsemain.h"		/* threads enter/leave */
-#include "bsepcmwriter.h"
-#include "bsemididevice-null.h"
-#include "bsejanitor.h"
+#include "bseserver.hh"
+#include "bseproject.hh"
+#include "bseengine.hh"
+#include "gslcommon.hh"
+#include "bseglue.hh"
+#include "bsegconfig.hh"
+#include "bsemidinotifier.hh"
+#include "bsemain.hh"		/* threads enter/leave */
+#include "bsepcmwriter.hh"
+#include "bsemididevice-null.hh"
+#include "bsejanitor.hh"
 #include "bsecxxplugin.hh"
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/bse/bseserver.h b/bse/bseserver.hh
similarity index 98%
rename from bse/bseserver.h
rename to bse/bseserver.hh
index 96e1182..3b4099c 100644
--- a/bse/bseserver.h
+++ b/bse/bseserver.hh
@@ -17,9 +17,9 @@
 #ifndef __BSE_SERVER_H__
 #define __BSE_SERVER_H__
 
-#include        <bse/bsesuper.h>
-#include        <bse/bsepcmdevice.h>
-#include        <bse/bsemididevice.h>
+#include        <bse/bsesuper.hh>
+#include        <bse/bsepcmdevice.hh>
+#include        <bse/bsemididevice.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseserver.proc b/bse/bseserver.proc
index 0c56a39..9ddaa00 100644
--- a/bse/bseserver.proc
+++ b/bse/bseserver.proc
@@ -14,17 +14,17 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseserver.h>
-#include <bse/bseproject.h>
-#include <bse/bseloader.h>
-#include <bse/bsemidinotifier.h>
-#include <bse/bsemidievent.h>
-#include <bse/bsejanitor.h>
-#include <bse/bsescripthelper.h>
-#include <bse/bsegconfig.h>
-#include <bse/bseladspa.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseserver.hh>
+#include <bse/bseproject.hh>
+#include <bse/bseloader.hh>
+#include <bse/bsemidinotifier.hh>
+#include <bse/bsemidievent.hh>
+#include <bse/bsejanitor.hh>
+#include <bse/bsescripthelper.hh>
+#include <bse/bsegconfig.hh>
+#include <bse/bseladspa.hh>
 #include "topconfig.h"
 #include <string.h>
 
@@ -591,7 +591,7 @@ BODY (BseProcedureClass *proc,
   return BSE_ERROR_NONE;
 }
 
-#include "gslvorbis-enc.h"
+#include "gslvorbis-enc.hh"
 
 METHOD (BseServer, get-vorbis-version) {
   HELP	= "Retrieve BSE Vorbis handler version.";
@@ -614,7 +614,7 @@ BODY (BseProcedureClass *proc,
   return BSE_ERROR_NONE;
 }
 
-#include "gsldatahandle-mad.h"
+#include "gsldatahandle-mad.hh"
 
 METHOD (BseServer, get-mp3-version) {
   HELP	= "Retrieve BSE MP3 handler version.";
diff --git a/bse/bsesnet.cc b/bse/bsesnet.cc
index d5d8219..9d3d885 100644
--- a/bse/bsesnet.cc
+++ b/bse/bsesnet.cc
@@ -19,16 +19,16 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <bse/bseengine.h>
-#include <bse/gslcommon.h>
-#include "bsesnet.h"
-
-#include "bseproject.h"
-#include "bsecategories.h"
-#include "bsestorage.h"
-#include "bsemain.h"
-#include "bsecontextmerger.h"
-#include "bsemidireceiver.h"
+#include <bse/bseengine.hh>
+#include <bse/gslcommon.hh>
+#include "bsesnet.hh"
+
+#include "bseproject.hh"
+#include "bsecategories.hh"
+#include "bsestorage.hh"
+#include "bsemain.hh"
+#include "bsecontextmerger.hh"
+#include "bsemidireceiver.hh"
 
 
 typedef struct
diff --git a/bse/bsesnet.h b/bse/bsesnet.hh
similarity index 98%
rename from bse/bsesnet.h
rename to bse/bsesnet.hh
index 452a247..1547b24 100644
--- a/bse/bsesnet.h
+++ b/bse/bsesnet.hh
@@ -17,8 +17,8 @@
 #ifndef	__BSE_SNET_H__
 #define	__BSE_SNET_H__
 
-#include	<bse/bsesuper.h>
-#include	<bse/bseglobals.h> /* FIXME */
+#include	<bse/bsesuper.hh>
+#include	<bse/bseglobals.hh> /* FIXME */
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsesnet.proc b/bse/bsesnet.proc
index 1128185..7477f6f 100644
--- a/bse/bsesnet.proc
+++ b/bse/bsesnet.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsesnet.h>
-#include <bse/bsemain.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsesnet.hh>
+#include <bse/bsemain.hh>
 
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsesnooper.cc b/bse/bsesnooper.cc
index d3e0dfc..4a7fa6f 100644
--- a/bse/bsesnooper.cc
+++ b/bse/bsesnooper.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesnooper.h"
+#include "bsesnooper.hh"
 
-#include <bse/bseengine.h>
-#include <bse/bseieee754.h>
-#include <bse/bsecategories.h>
+#include <bse/bseengine.hh>
+#include <bse/bseieee754.hh>
+#include <bse/bsecategories.hh>
 
 
 enum {
diff --git a/bse/bsesnooper.h b/bse/bsesnooper.hh
similarity index 98%
rename from bse/bsesnooper.h
rename to bse/bsesnooper.hh
index fde4e7a..b0b2df4 100644
--- a/bse/bsesnooper.h
+++ b/bse/bsesnooper.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SNOOPER_H__
 #define __BSE_SNOOPER_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsesong.cc b/bse/bsesong.cc
index 62534b3..2ae495b 100644
--- a/bse/bsesong.cc
+++ b/bse/bsesong.cc
@@ -14,20 +14,20 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesong.h"
-#include "bsemathsignal.h"
-#include "bsetrack.h"
-#include "bsepart.h"
-#include "bsebus.h"
-#include "bsepcmoutput.h"
-#include "bseproject.h"
-#include "bsemidireceiver.h"
-#include "bsestorage.h"
-#include "bsemain.h"
-#include "bsecsynth.h"
-#include "bsesequencer.h"
-#include "bsesubsynth.h"
-#include "bseengine.h"	// FIXME: for bse_engine_sample_freq()
+#include "bsesong.hh"
+#include "bsemathsignal.hh"
+#include "bsetrack.hh"
+#include "bsepart.hh"
+#include "bsebus.hh"
+#include "bsepcmoutput.hh"
+#include "bseproject.hh"
+#include "bsemidireceiver.hh"
+#include "bsestorage.hh"
+#include "bsemain.hh"
+#include "bsecsynth.hh"
+#include "bsesequencer.hh"
+#include "bsesubsynth.hh"
+#include "bseengine.hh"	// FIXME: for bse_engine_sample_freq()
 #include "bsecxxplugin.hh"
 #include <string.h>
 
diff --git a/bse/bsesong.h b/bse/bsesong.hh
similarity index 99%
rename from bse/bsesong.h
rename to bse/bsesong.hh
index 85de4d4..7bdf6d0 100644
--- a/bse/bsesong.h
+++ b/bse/bsesong.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SONG_H__
 #define __BSE_SONG_H__
 
-#include        <bse/bsesnet.h>
+#include        <bse/bsesnet.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsesong.proc b/bse/bsesong.proc
index 32c14cd..3d2f126 100644
--- a/bse/bsesong.proc
+++ b/bse/bsesong.proc
@@ -14,18 +14,18 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsemathsignal.h>
-#include <bse/bsesong.h>
-#include <bse/bsebus.h>
-#include <bse/bsepart.h>
-#include <bse/bsetrack.h>
-#include "bsemidireceiver.h"
-#include "bseundostack.h"
-#include "bseproject.h"
-#include "gslcommon.h"
-#include "bseengine.h"
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsemathsignal.hh>
+#include <bse/bsesong.hh>
+#include <bse/bsebus.hh>
+#include <bse/bsepart.hh>
+#include <bse/bsetrack.hh>
+#include "bsemidireceiver.hh"
+#include "bseundostack.hh"
+#include "bseproject.hh"
+#include "gslcommon.hh"
+#include "bseengine.hh"
 #include "bsecxxplugin.hh"
 #include <string.h>
 
diff --git a/bse/bsesource.cc b/bse/bsesource.cc
index 8dad64c..bed40c8 100644
--- a/bse/bsesource.cc
+++ b/bse/bsesource.cc
@@ -15,12 +15,12 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include <string.h>
-#include "bsesource.h"
+#include "bsesource.hh"
 
-#include "bsecontainer.h"
-#include "bsestorage.h"
-#include "gslcommon.h"
-#include "bseengine.h"
+#include "bsecontainer.hh"
+#include "bsestorage.hh"
+#include "gslcommon.hh"
+#include "bseengine.hh"
 
 
 /* --- macros --- */
diff --git a/bse/bsesource.h b/bse/bsesource.hh
similarity index 99%
rename from bse/bsesource.h
rename to bse/bsesource.hh
index 00b316e..04fe67f 100644
--- a/bse/bsesource.h
+++ b/bse/bsesource.hh
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  *
- * bsesource.h: sound source interface
+ * bsesource.hh: sound source interface
  */
 #ifndef __BSE_SOURCE_H__
 #define __BSE_SOURCE_H__
 
-#include <bse/bseitem.h>
-#include <bse/gsldefs.h>
+#include <bse/bseitem.hh>
+#include <bse/gsldefs.hh>
 #include <sfi/gbsearcharray.hh>
 
 G_BEGIN_DECLS
diff --git a/bse/bsesource.proc b/bse/bsesource.proc
index 159971b..20a3c28 100644
--- a/bse/bsesource.proc
+++ b/bse/bsesource.proc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsesource.h>
-#include <bse/bseundostack.h>
-#include <bse/bseieee754.h>
-#include <bse/bsemidievent.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsesource.hh>
+#include <bse/bseundostack.hh>
+#include <bse/bseieee754.hh>
+#include <bse/bsemidievent.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsestandardosc.cc b/bse/bsestandardosc.cc
index 09e21c5..8589fbd 100644
--- a/bse/bsestandardosc.cc
+++ b/bse/bsestandardosc.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsestandardosc.h"
-#include "bsecategories.h"
-#include "bseengine.h"
-#include "bsemathsignal.h"
+#include "bsestandardosc.hh"
+#include "bsecategories.hh"
+#include "bseengine.hh"
+#include "bsemathsignal.hh"
 
 
 #define	FRAC_N_BITS	(19)
diff --git a/bse/bsestandardosc.h b/bse/bsestandardosc.hh
similarity index 98%
rename from bse/bsestandardosc.h
rename to bse/bsestandardosc.hh
index 48c0fa0..fe777c3 100644
--- a/bse/bsestandardosc.h
+++ b/bse/bsestandardosc.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_STANDARD_OSC_H__
 #define __BSE_STANDARD_OSC_H__
 
-#include <bse/bsesource.h>
-#include <bse/gsloscillator.h>
+#include <bse/bsesource.hh>
+#include <bse/gsloscillator.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsestandardsynths.cc b/bse/bsestandardsynths.cc
index e02a203..b872ab8 100644
--- a/bse/bsestandardsynths.cc
+++ b/bse/bsestandardsynths.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsestandardsynths.h"
+#include "bsestandardsynths.hh"
 
-#include "bsesnet.h"
-#include "bsestandardosc.h"
+#include "bsesnet.hh"
+#include "bsestandardosc.hh"
 #include <zlib.h>
 #include <string.h>
 
diff --git a/bse/bsestandardsynths.h b/bse/bsestandardsynths.hh
similarity index 96%
rename from bse/bsestandardsynths.h
rename to bse/bsestandardsynths.hh
index 540e1cf..3b4a309 100644
--- a/bse/bsestandardsynths.h
+++ b/bse/bsestandardsynths.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_STANDARD_SYNTHS_H__
 #define __BSE_STANDARD_SYNTHS_H__
 
-#include        <bse/bseproject.h>
+#include        <bse/bseproject.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsestorage.cc b/bse/bsestorage.cc
index cfe9941..af964fe 100644
--- a/bse/bsestorage.cc
+++ b/bse/bsestorage.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsestorage.h"
-#include "bseitem.h"
-#include "gsldatahandle.h"
-#include "gsldatahandle-vorbis.h"
-#include "gsldatautils.h"
-#include "gslcommon.h"
-#include "bseproject.h"
-#include "bseparasite.h"
+#include "bsestorage.hh"
+#include "bseitem.hh"
+#include "gsldatahandle.hh"
+#include "gsldatahandle-vorbis.hh"
+#include "gsldatautils.hh"
+#include "gslcommon.hh"
+#include "bseproject.hh"
+#include "bseparasite.hh"
 #include "bsecxxplugin.hh"
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/bse/bsestorage.h b/bse/bsestorage.hh
similarity index 99%
rename from bse/bsestorage.h
rename to bse/bsestorage.hh
index 4851d16..b4ba447 100644
--- a/bse/bsestorage.h
+++ b/bse/bsestorage.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_STORAGE_H__
 #define __BSE_STORAGE_H__
 
-#include <bse/bseobject.h>
-#include <bse/gsldefs.h>
+#include <bse/bseobject.hh>
+#include <bse/gsldefs.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsesubiport.cc b/bse/bsesubiport.cc
index 28c8810..d75daf5 100644
--- a/bse/bsesubiport.cc
+++ b/bse/bsesubiport.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesubiport.h"
+#include "bsesubiport.hh"
 
-#include "bsecategories.h"
-#include "bsesnet.h"
+#include "bsecategories.hh"
+#include "bsesnet.hh"
 
 #include <string.h>
 
diff --git a/bse/bsesubiport.h b/bse/bsesubiport.hh
similarity index 96%
rename from bse/bsesubiport.h
rename to bse/bsesubiport.hh
index 9fbf949..8e5acd1 100644
--- a/bse/bsesubiport.h
+++ b/bse/bsesubiport.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_SUB_IPORT_H__
 #define __BSE_SUB_IPORT_H__
 
-#include <bse/bsesource.h>
-#include <bse/bseengine.h>
+#include <bse/bsesource.hh>
+#include <bse/bseengine.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsesuboport.cc b/bse/bsesuboport.cc
index d8b7229..abb0913 100644
--- a/bse/bsesuboport.cc
+++ b/bse/bsesuboport.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesuboport.h"
+#include "bsesuboport.hh"
 
-#include "bsecategories.h"
-#include "bsesnet.h"
+#include "bsecategories.hh"
+#include "bsesnet.hh"
 
 #include <string.h>
 
diff --git a/bse/bsesuboport.h b/bse/bsesuboport.hh
similarity index 96%
rename from bse/bsesuboport.h
rename to bse/bsesuboport.hh
index b586036..84a5127 100644
--- a/bse/bsesuboport.h
+++ b/bse/bsesuboport.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_SUB_OPORT_H__
 #define __BSE_SUB_OPORT_H__
 
-#include <bse/bsesource.h>
-#include <bse/bseengine.h>
+#include <bse/bsesource.hh>
+#include <bse/bseengine.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsesubsynth.cc b/bse/bsesubsynth.cc
index fa564d6..d9cdab1 100644
--- a/bse/bsesubsynth.cc
+++ b/bse/bsesubsynth.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsesubsynth.h"
+#include "bsesubsynth.hh"
 
-#include "bsecategories.h"
-#include "bsecsynth.h"
-#include "bseproject.h"
-#include "bsemidireceiver.h"
-#include "bseengine.h"
+#include "bsecategories.hh"
+#include "bsecsynth.hh"
+#include "bseproject.hh"
+#include "bsemidireceiver.hh"
+#include "bseengine.hh"
 
 #include <string.h>
 
diff --git a/bse/bsesubsynth.h b/bse/bsesubsynth.hh
similarity index 98%
rename from bse/bsesubsynth.h
rename to bse/bsesubsynth.hh
index e30b071..db95e89 100644
--- a/bse/bsesubsynth.h
+++ b/bse/bsesubsynth.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SUB_SYNTH_H__
 #define __BSE_SUB_SYNTH_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsesuper.cc b/bse/bsesuper.cc
index 27a2550..9a86631 100644
--- a/bse/bsesuper.cc
+++ b/bse/bsesuper.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"bsesuper.h"
+#include	"bsesuper.hh"
 
-#include	"bseproject.h"
+#include	"bseproject.hh"
 #include	<string.h>
 
 
diff --git a/bse/bsesuper.h b/bse/bsesuper.hh
similarity index 98%
rename from bse/bsesuper.h
rename to bse/bsesuper.hh
index b00bac8..538b324 100644
--- a/bse/bsesuper.h
+++ b/bse/bsesuper.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SUPER_H__
 #define __BSE_SUPER_H__
 
-#include        <bse/bsecontainer.h>
+#include        <bse/bsecontainer.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsetrack.cc b/bse/bsetrack.cc
index 00b3ead..40faf52 100644
--- a/bse/bsetrack.cc
+++ b/bse/bsetrack.cc
@@ -14,22 +14,22 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsetrack.h"
-
-#include "bseglobals.h"
-#include "bsestorage.h"
-#include "bsecsynth.h"
-#include "bsewave.h"
-#include "bsepart.h"
-#include "bsebus.h"
-#include "bsemain.h"
-#include "gslcommon.h"
-#include "bsesubsynth.h"
-#include "bseproject.h"
-#include "bsesong.h"
-#include "bsemidivoice.h"
-#include "bsemidireceiver.h"
-#include "bsewaverepo.h"
+#include "bsetrack.hh"
+
+#include "bseglobals.hh"
+#include "bsestorage.hh"
+#include "bsecsynth.hh"
+#include "bsewave.hh"
+#include "bsepart.hh"
+#include "bsebus.hh"
+#include "bsemain.hh"
+#include "gslcommon.hh"
+#include "bsesubsynth.hh"
+#include "bseproject.hh"
+#include "bsesong.hh"
+#include "bsemidivoice.hh"
+#include "bsemidireceiver.hh"
+#include "bsewaverepo.hh"
 #include "bsecxxplugin.hh"
 #include <string.h>
 
diff --git a/bse/bsetrack.h b/bse/bsetrack.hh
similarity index 97%
rename from bse/bsetrack.h
rename to bse/bsetrack.hh
index c215b2a..85bcdff 100644
--- a/bse/bsetrack.h
+++ b/bse/bsetrack.hh
@@ -17,9 +17,9 @@
 #ifndef __BSE_TRACK_H__
 #define __BSE_TRACK_H__
 
-#include <bse/bseitem.h>
-#include <bse/bsesnet.h>
-#include <bse/bsecontextmerger.h>
+#include <bse/bseitem.hh>
+#include <bse/bsesnet.hh>
+#include <bse/bsecontextmerger.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsetrack.proc b/bse/bsetrack.proc
index 6662a88..c2cbafe 100644
--- a/bse/bsetrack.proc
+++ b/bse/bsetrack.proc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsetrack.h>
-#include <bse/bsepart.h>
-#include <bse/bsesong.h>
-#include <bse/bsebus.h>
-#include <bse/bseundostack.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsetrack.hh>
+#include <bse/bsepart.hh>
+#include <bse/bsesong.hh>
+#include <bse/bsebus.hh>
+#include <bse/bseundostack.hh>
 #include "bsecxxplugin.hh"
 
 
diff --git a/bse/bsetype.cc b/bse/bsetype.cc
index b9c75a6..64d14a6 100644
--- a/bse/bsetype.cc
+++ b/bse/bsetype.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsetype.h"
+#include "bsetype.hh"
 
-#include "bseplugin.h"
+#include "bseplugin.hh"
 #include <string.h>
 #include <gobject/gvaluecollector.h>
 
diff --git a/bse/bsetype.h b/bse/bsetype.hh
similarity index 99%
rename from bse/bsetype.h
rename to bse/bsetype.hh
index 4799251..079ea87 100644
--- a/bse/bsetype.h
+++ b/bse/bsetype.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_TYPE_H__
 #define __BSE_TYPE_H__
 
-#include	<bse/bsedefs.h>
+#include	<bse/bsedefs.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseundostack.cc b/bse/bseundostack.cc
index 99e8022..50c047b 100644
--- a/bse/bseundostack.cc
+++ b/bse/bseundostack.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bseundostack.h"
-#include "bseproject.h"
-#include "bsecontainer.h"
+#include "bseundostack.hh"
+#include "bseproject.hh"
+#include "bsecontainer.hh"
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_undo, "undo", SFI_MSG_DEBUG, NULL);
diff --git a/bse/bseundostack.h b/bse/bseundostack.hh
similarity index 99%
rename from bse/bseundostack.h
rename to bse/bseundostack.hh
index 3e5f1b4..e262991 100644
--- a/bse/bseundostack.h
+++ b/bse/bseundostack.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_UNDO_STACK_H__
 #define __BSE_UNDO_STACK_H__
 
-#include <bse/bseitem.h>
+#include <bse/bseitem.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseutils.cc b/bse/bseutils.cc
index 202fd11..be3ca01 100644
--- a/bse/bseutils.cc
+++ b/bse/bseutils.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "topconfig.h"
-#include "bseutils.h"
-#include "gsldatautils.h"
+#include "bseutils.hh"
+#include "gsldatautils.hh"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/bse/bseutils.h b/bse/bseutils.hh
similarity index 98%
rename from bse/bseutils.h
rename to bse/bseutils.hh
index 76cc4e2..2abb9ad 100644
--- a/bse/bseutils.h
+++ b/bse/bseutils.hh
@@ -17,9 +17,9 @@
 #ifndef __BSE_UTILS_H__
 #define __BSE_UTILS_H__
 
-#include <bse/bseenums.h>
-#include <bse/bseglobals.h>
-#include <bse/bsecompat.h>
+#include <bse/bseenums.hh>
+#include <bse/bseglobals.hh>
+#include <bse/bsecompat.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsewave.cc b/bse/bsewave.cc
index f1e47c3..bf4c6b5 100644
--- a/bse/bsewave.cc
+++ b/bse/bsewave.cc
@@ -14,14 +14,14 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsewave.h"
-#include "bsemain.h"
-#include "bsestorage.h"
-#include "bseprocedure.h"
-#include "gslwavechunk.h"
-#include "gsldatahandle.h"
-#include "bseserver.h"
-#include "bseloader.h"
+#include "bsewave.hh"
+#include "bsemain.hh"
+#include "bsestorage.hh"
+#include "bseprocedure.hh"
+#include "gslwavechunk.hh"
+#include "gsldatahandle.hh"
+#include "bseserver.hh"
+#include "bseloader.hh"
 #include "topconfig.h"
 
 #include <string.h>
diff --git a/bse/bsewave.h b/bse/bsewave.hh
similarity index 99%
rename from bse/bsewave.h
rename to bse/bsewave.hh
index 9a57f0e..cb8c29c 100644
--- a/bse/bsewave.h
+++ b/bse/bsewave.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_WAVE_H__
 #define __BSE_WAVE_H__
 
-#include	<bse/bsesource.h>
+#include	<bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsewave.proc b/bse/bsewave.proc
index 5b635ed..ae938e6 100644
--- a/bse/bsewave.proc
+++ b/bse/bsewave.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsewave.h>
-#include <bse/bseeditablesample.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsewave.hh>
+#include <bse/bseeditablesample.hh>
 
 
 AUTHORS = "Tim Janik <timj gtk org>";
diff --git a/bse/bsewaveosc.cc b/bse/bsewaveosc.cc
index c1156dd..fd7bcdc 100644
--- a/bse/bsewaveosc.cc
+++ b/bse/bsewaveosc.cc
@@ -14,15 +14,15 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "bsewaveosc.h"
-#include <bse/bsemain.h>
-#include <bse/bsecategories.h>
-#include <bse/bseeditablesample.h>
-#include <bse/bsewaverepo.h>
-#include <bse/bseproject.h>
-#include <bse/bseengine.h>
-#include <bse/gslwavechunk.h>
-#include <bse/gslfilter.h>
+#include "bsewaveosc.hh"
+#include <bse/bsemain.hh>
+#include <bse/bsecategories.hh>
+#include <bse/bseeditablesample.hh>
+#include <bse/bsewaverepo.hh>
+#include <bse/bseproject.hh>
+#include <bse/bseengine.hh>
+#include <bse/gslwavechunk.hh>
+#include <bse/gslfilter.hh>
 
 
 
diff --git a/bse/bsewaveosc.h b/bse/bsewaveosc.hh
similarity index 96%
rename from bse/bsewaveosc.h
rename to bse/bsewaveosc.hh
index e2599b3..14461ff 100644
--- a/bse/bsewaveosc.h
+++ b/bse/bsewaveosc.hh
@@ -17,9 +17,9 @@
 #ifndef __BSE_WAVE_OSC_H__
 #define __BSE_WAVE_OSC_H__
 
-#include <bse/bsesource.h>
-#include <bse/bsewave.h>
-#include <bse/gslwaveosc.h>
+#include <bse/bsesource.hh>
+#include <bse/bsewave.hh>
+#include <bse/gslwaveosc.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bsewaveosc.proc b/bse/bsewaveosc.proc
index 65201a2..0a72aac 100644
--- a/bse/bsewaveosc.proc
+++ b/bse/bsewaveosc.proc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bsewaveosc.h>
-#include <bse/bseprocedure.h>
-#include <bse/bseeditablesample.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsewaveosc.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bseeditablesample.hh>
 #include "bsecxxplugin.hh"
 
 AUTHORS	= "Tim Janik <timj gtk org>";
diff --git a/bse/bsewaverepo.cc b/bse/bsewaverepo.cc
index 8bd92b5..396a211 100644
--- a/bse/bsewaverepo.cc
+++ b/bse/bsewaverepo.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include        "bsewaverepo.h"
+#include        "bsewaverepo.hh"
 
-#include        "bsewave.h"
+#include        "bsewave.hh"
 
 
 /* --- parameters --- */
diff --git a/bse/bsewaverepo.h b/bse/bsewaverepo.hh
similarity index 98%
rename from bse/bsewaverepo.h
rename to bse/bsewaverepo.hh
index 5aa41af..37e8afd 100644
--- a/bse/bsewaverepo.h
+++ b/bse/bsewaverepo.hh
@@ -17,7 +17,7 @@
 #ifndef	__BSE_WAVE_REPO_H__
 #define	__BSE_WAVE_REPO_H__
 
-#include	<bse/bsesuper.h>
+#include	<bse/bsesuper.hh>
 
 
 G_BEGIN_DECLS
diff --git a/bse/bsewaverepo.proc b/bse/bsewaverepo.proc
index cdbf27c..469b701 100644
--- a/bse/bsewaverepo.proc
+++ b/bse/bsewaverepo.proc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bseplugin.h>
-#include <bse/bseprocedure.h>
-#include <bse/bsewaverepo.h>
-#include <bse/bseloader.h>
-#include <bse/bsewave.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseprocedure.hh>
+#include <bse/bsewaverepo.hh>
+#include <bse/bseloader.hh>
+#include <bse/bsewave.hh>
 #include "bsecxxplugin.hh"
 
 #include <sys/types.h>
diff --git a/bse/gsl-fftconf.sh b/bse/gsl-fftconf.sh
index f4f97bf..a309821 100755
--- a/bse/gsl-fftconf.sh
+++ b/bse/gsl-fftconf.sh
@@ -17,7 +17,7 @@
 
 # include files
 echo "#include $2"
-echo "#include \"bsemath.h\""
+echo "#include \"bsemath.hh\""
 
 MKFFT="$1"
 IEEE_TYPE="double"
diff --git a/bse/gslcommon.cc b/bse/gslcommon.cc
index 08e2804..9c9ccaa 100644
--- a/bse/gslcommon.cc
+++ b/bse/gslcommon.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslcommon.h"
+#include "gslcommon.hh"
 
-#include "gsldatacache.h"
+#include "gsldatacache.hh"
 #include <unistd.h>
 #include <sys/utsname.h>
 #include <string.h>
diff --git a/bse/gslcommon.h b/bse/gslcommon.hh
similarity index 98%
rename from bse/gslcommon.h
rename to bse/gslcommon.hh
index 7897710..f824f13 100644
--- a/bse/gslcommon.h
+++ b/bse/gslcommon.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_COMMON_H__
 #define __GSL_COMMON_H__
 
-#include <bse/gsldefs.h>
-#include <bse/bseenums.h>
+#include <bse/gsldefs.hh>
+#include <bse/bseenums.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldatacache.cc b/bse/gsldatacache.cc
index a672ab6..90745e4 100644
--- a/bse/gsldatacache.cc
+++ b/bse/gsldatacache.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsldatacache.h"
-#include "bsemain.h"
-#include "gslcommon.h"
-#include "gsldatahandle.h"
+#include "gsldatacache.hh"
+#include "bsemain.hh"
+#include "gslcommon.hh"
+#include "gsldatahandle.hh"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/bse/gsldatacache.h b/bse/gsldatacache.hh
similarity index 98%
rename from bse/gsldatacache.h
rename to bse/gsldatacache.hh
index f2daa4f..de26fca 100644
--- a/bse/gsldatacache.h
+++ b/bse/gsldatacache.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_DATA_CACHE_H__
 #define __GSL_DATA_CACHE_H__
 
-#include <bse/gslcommon.h>
+#include <bse/gslcommon.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldatahandle-mad.cc b/bse/gsldatahandle-mad.cc
index 5f1d4d4..4172cf6 100644
--- a/bse/gsldatahandle-mad.cc
+++ b/bse/gsldatahandle-mad.cc
@@ -15,9 +15,9 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "topconfig.h"
-#include <bse/gsldatahandle-mad.h>
-#include "gslfilehash.h"
-#include <bse/gsldatautils.h>
+#include <bse/gsldatahandle-mad.hh>
+#include "gslfilehash.hh"
+#include <bse/gsldatautils.hh>
 #include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/bse/gsldatahandle-mad.h b/bse/gsldatahandle-mad.hh
similarity index 96%
rename from bse/gsldatahandle-mad.h
rename to bse/gsldatahandle-mad.hh
index 95eb829..ff5832d 100644
--- a/bse/gsldatahandle-mad.h
+++ b/bse/gsldatahandle-mad.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_DATA_HANDLE_MAD_H__
 #define __GSL_DATA_HANDLE_MAD_H__
 
-#include <bse/gslcommon.h>
-#include <bse/gsldatahandle.h>
+#include <bse/gslcommon.hh>
+#include <bse/gsldatahandle.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldatahandle-vorbis.cc b/bse/gsldatahandle-vorbis.cc
index 8695db1..1898ac3 100644
--- a/bse/gsldatahandle-vorbis.cc
+++ b/bse/gsldatahandle-vorbis.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsldatahandle-vorbis.h"
+#include "gsldatahandle-vorbis.hh"
 
-#include "gslfilehash.h"
+#include "gslfilehash.hh"
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
 #include <errno.h>
@@ -449,7 +449,7 @@ gsl_data_handle_new_ogg_vorbis_zoffset (const gchar *file_name,
 }
 
 /* --- writing vorbis files --- */
-#include "gslvorbis-cutter.h"
+#include "gslvorbis-cutter.hh"
 
 struct GslVorbis1Handle
 {
diff --git a/bse/gsldatahandle-vorbis.h b/bse/gsldatahandle-vorbis.hh
similarity index 97%
rename from bse/gsldatahandle-vorbis.h
rename to bse/gsldatahandle-vorbis.hh
index 27afa95..bbd515b 100644
--- a/bse/gsldatahandle-vorbis.h
+++ b/bse/gsldatahandle-vorbis.hh
@@ -18,8 +18,8 @@
 #define __GSL_DATA_HANDLE_VORBIS_H__
 
 
-#include <bse/gslcommon.h>
-#include <bse/gsldatahandle.h>
+#include <bse/gslcommon.hh>
+#include <bse/gsldatahandle.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldatahandle.cc b/bse/gsldatahandle.cc
index dcf79c0..b1a903b 100644
--- a/bse/gsldatahandle.cc
+++ b/bse/gsldatahandle.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsldatahandle.h"
+#include "gsldatahandle.hh"
 
-#include "gslcommon.h"
-#include "gsldatacache.h"
-#include "gsldatautils.h"
-#include "gslfilehash.h"
+#include "gslcommon.hh"
+#include "gsldatacache.hh"
+#include "gsldatautils.hh"
+#include "gslfilehash.hh"
 
 #include <string.h>
 #include <errno.h>
diff --git a/bse/gsldatahandle.h b/bse/gsldatahandle.hh
similarity index 99%
rename from bse/gsldatahandle.h
rename to bse/gsldatahandle.hh
index 5b6f615..5c8b08f 100644
--- a/bse/gsldatahandle.h
+++ b/bse/gsldatahandle.hh
@@ -18,7 +18,7 @@
 #ifndef __GSL_DATA_HANDLE_H__
 #define __GSL_DATA_HANDLE_H__
 
-#include <bse/bseutils.h>
+#include <bse/bseutils.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldatautils.cc b/bse/gsldatautils.cc
index f2b4131..a925401 100644
--- a/bse/gsldatautils.cc
+++ b/bse/gsldatautils.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsldatautils.h"
-#include "gsldatacache.h"
+#include "gsldatautils.hh"
+#include "gsldatacache.hh"
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/bse/gsldatautils.h b/bse/gsldatautils.hh
similarity index 99%
rename from bse/gsldatautils.h
rename to bse/gsldatautils.hh
index 908275c..f0a07ea 100644
--- a/bse/gsldatautils.h
+++ b/bse/gsldatautils.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_DATA_UTILS_H__
 #define __GSL_DATA_UTILS_H__
 
-#include <bse/bsemath.h>
-#include <bse/gsldatahandle.h>
+#include <bse/bsemath.hh>
+#include <bse/gsldatahandle.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gsldefs.h b/bse/gsldefs.hh
similarity index 100%
rename from bse/gsldefs.h
rename to bse/gsldefs.hh
diff --git a/bse/gslfft.h b/bse/gslfft.hh
similarity index 99%
rename from bse/gslfft.h
rename to bse/gslfft.hh
index f77a7f8..39e45c6 100644
--- a/bse/gslfft.h
+++ b/bse/gslfft.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_FFT_H__
 #define __GSL_FFT_H__
 
-#include <bse/gsldefs.h>
+#include <bse/gsldefs.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/gslfilehash.cc b/bse/gslfilehash.cc
index b5a618b..618a169 100644
--- a/bse/gslfilehash.cc
+++ b/bse/gslfilehash.cc
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslfilehash.h"
+#include "gslfilehash.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bse/gslfilehash.h b/bse/gslfilehash.hh
similarity index 97%
rename from bse/gslfilehash.h
rename to bse/gslfilehash.hh
index b115246..60880b6 100644
--- a/bse/gslfilehash.h
+++ b/bse/gslfilehash.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_FILE_HASH_H__
 #define __GSL_FILE_HASH_H__
 
-#include <bse/gsldefs.h>
-#include <bse/gslcommon.h>
+#include <bse/gsldefs.hh>
+#include <bse/gslcommon.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/gslfilter.cc b/bse/gslfilter.cc
index 266313b..89a71c6 100644
--- a/bse/gslfilter.cc
+++ b/bse/gslfilter.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslfilter.h"
-#include "gslfft.h"
-#include "bsemathsignal.h"
+#include "gslfilter.hh"
+#include "gslfft.hh"
+#include "bsemathsignal.hh"
 
 #include <string.h>
 
diff --git a/bse/gslfilter.h b/bse/gslfilter.hh
similarity index 99%
rename from bse/gslfilter.h
rename to bse/gslfilter.hh
index 294c584..b733aea 100644
--- a/bse/gslfilter.h
+++ b/bse/gslfilter.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_FILTER_H__
 #define __GSL_FILTER_H__
 
-#include <bse/bsemath.h>
+#include <bse/bsemath.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/gslincluder.h b/bse/gslincluder.hh
similarity index 100%
rename from bse/gslincluder.h
rename to bse/gslincluder.hh
diff --git a/bse/gslmagic.cc b/bse/gslmagic.cc
index 67f24bf..5540a84 100644
--- a/bse/gslmagic.cc
+++ b/bse/gslmagic.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include	"gslmagic.h"
+#include	"gslmagic.hh"
 
-#include	"gslcommon.h"
+#include	"gslcommon.hh"
 
 #include	<string.h>
 #include	<unistd.h>
diff --git a/bse/gslmagic.h b/bse/gslmagic.hh
similarity index 98%
rename from bse/gslmagic.h
rename to bse/gslmagic.hh
index 718c5d5..c0b3c19 100644
--- a/bse/gslmagic.h
+++ b/bse/gslmagic.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_MAGIC_H__
 #define __GSL_MAGIC_H__
 
-#include <bse/gsldefs.h>
+#include <bse/gsldefs.hh>
 
 
 #ifdef __cplusplus
diff --git a/bse/gsloscillator.cc b/bse/gsloscillator.cc
index 2c4d69d..7480998 100644
--- a/bse/gsloscillator.cc
+++ b/bse/gsloscillator.cc
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gsloscillator.h"
+#include "gsloscillator.hh"
 
-#include "bsemathsignal.h"
+#include "bsemathsignal.hh"
 
 #define	SIGNAL_LEVEL_INVAL	(-2.0)	/* trigger level-changed checks */
 
@@ -87,7 +87,7 @@ osc_update_pwm_offset (GslOscData *osc,
                                 const gfloat*,const gfloat*,const gfloat*, \
 		                const gfloat*,gfloat*,gfloat*)
 #define	GSL_INCLUDER_FILE	"gsloscillator-aux.cc"
-#include "gslincluder.h"
+#include "gslincluder.hh"
 #undef	OSC_INCLUDER_FLAGS
 
 /* pulse width modulation oscillator variants */
@@ -99,7 +99,7 @@ osc_update_pwm_offset (GslOscData *osc,
                                 const gfloat*,const gfloat*,const gfloat*, \
 		                const gfloat*,gfloat*,gfloat*)
 #define	GSL_INCLUDER_FILE	"gsloscillator-aux.cc"
-#include "gslincluder.h"
+#include "gslincluder.hh"
 #undef	OSC_INCLUDER_FLAGS
 
 
diff --git a/bse/gsloscillator.h b/bse/gsloscillator.hh
similarity index 97%
rename from bse/gsloscillator.h
rename to bse/gsloscillator.hh
index da32f8c..c6c6215 100644
--- a/bse/gsloscillator.h
+++ b/bse/gsloscillator.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_OSCILLATOR_H__
 #define __GSL_OSCILLATOR_H__
 
-#include <bse/gsldefs.h>
-#include <bse/gslosctable.h>
+#include <bse/gsldefs.hh>
+#include <bse/gslosctable.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/gslosctable.cc b/bse/gslosctable.cc
index a6b47ac..d5a765f 100644
--- a/bse/gslosctable.cc
+++ b/bse/gslosctable.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslosctable.h"
-#include "gslcommon.h"
-#include "bsemath.h"
-#include "gslfft.h"
+#include "gslosctable.hh"
+#include "gslcommon.hh"
+#include "bsemath.hh"
+#include "gslfft.hh"
 #include <string.h>
 
 
diff --git a/bse/gslosctable.h b/bse/gslosctable.hh
similarity index 99%
rename from bse/gslosctable.h
rename to bse/gslosctable.hh
index a7a0cd0..f2e0418 100644
--- a/bse/gslosctable.h
+++ b/bse/gslosctable.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_OSC_TABLE_H__
 #define __GSL_OSC_TABLE_H__
 
-#include <bse/gsldefs.h>
+#include <bse/gsldefs.hh>
 #include <sfi/gbsearcharray.hh>
 
 G_BEGIN_DECLS
diff --git a/bse/gslvorbis-cutter.cc b/bse/gslvorbis-cutter.cc
index 2312059..ba36b0a 100644
--- a/bse/gslvorbis-cutter.cc
+++ b/bse/gslvorbis-cutter.cc
@@ -14,7 +14,7 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslvorbis-cutter.h"
+#include "gslvorbis-cutter.hh"
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <string.h>
diff --git a/bse/gslvorbis-cutter.h b/bse/gslvorbis-cutter.hh
similarity index 98%
rename from bse/gslvorbis-cutter.h
rename to bse/gslvorbis-cutter.hh
index 2989ff1..fc75789 100644
--- a/bse/gslvorbis-cutter.h
+++ b/bse/gslvorbis-cutter.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_VORBIS_CUTTER_H__
 #define __GSL_VORBIS_CUTTER_H__
 
-#include <bse/gslcommon.h>
+#include <bse/gslcommon.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gslvorbis-enc.cc b/bse/gslvorbis-enc.cc
index 7f22bbc..a960939 100644
--- a/bse/gslvorbis-enc.cc
+++ b/bse/gslvorbis-enc.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslvorbis-enc.h"
-#include <bse/bseieee754.h>
+#include "gslvorbis-enc.hh"
+#include <bse/bseieee754.hh>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisenc.h>
diff --git a/bse/gslvorbis-enc.h b/bse/gslvorbis-enc.hh
similarity index 99%
rename from bse/gslvorbis-enc.h
rename to bse/gslvorbis-enc.hh
index 0c8cbaf..cc7bf03 100644
--- a/bse/gslvorbis-enc.h
+++ b/bse/gslvorbis-enc.hh
@@ -17,7 +17,7 @@
 #ifndef __GSL_VORBIS_ENC_H__
 #define __GSL_VORBIS_ENC_H__
 
-#include <bse/gslcommon.h>
+#include <bse/gslcommon.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gslwavechunk.cc b/bse/gslwavechunk.cc
index 904bf06..bf75953 100644
--- a/bse/gslwavechunk.cc
+++ b/bse/gslwavechunk.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslwavechunk.h"
-#include "bsemain.h"
-#include "gslcommon.h"
-#include "gsldatahandle.h"
-#include "bsemathsignal.h"
+#include "gslwavechunk.hh"
+#include "bsemain.hh"
+#include "gslcommon.hh"
+#include "gsldatahandle.hh"
+#include "bsemathsignal.hh"
 #include <string.h>
 
 
diff --git a/bse/gslwavechunk.h b/bse/gslwavechunk.hh
similarity index 97%
rename from bse/gslwavechunk.h
rename to bse/gslwavechunk.hh
index b94d954..f4020e7 100644
--- a/bse/gslwavechunk.h
+++ b/bse/gslwavechunk.hh
@@ -17,9 +17,9 @@
 #ifndef __GSL_WAVE_CHUNK_H__
 #define __GSL_WAVE_CHUNK_H__
 
-#include <bse/gsldefs.h>
-#include <bse/gsldatacache.h>
-#include <bse/gsldatahandle.h>
+#include <bse/gsldefs.hh>
+#include <bse/gsldatacache.hh>
+#include <bse/gsldatahandle.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/gslwaveosc.cc b/bse/gslwaveosc.cc
index 901ed3a..715425f 100644
--- a/bse/gslwaveosc.cc
+++ b/bse/gslwaveosc.cc
@@ -14,11 +14,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include "gslwaveosc.h"
-#include "gslfilter.h"
-#include "bsemathsignal.h"
-#include "bseengine.h"	/* for bse_engine_sample_freq() */
-#include "bsemain.h"
+#include "gslwaveosc.hh"
+#include "gslfilter.hh"
+#include "bsemathsignal.hh"
+#include "bseengine.hh"	/* for bse_engine_sample_freq() */
+#include "bsemain.hh"
 #include <string.h>
 
 static SFI_MSG_TYPE_DEFINE (debug_waveosc, "waveosc", SFI_MSG_DEBUG, NULL);
diff --git a/bse/gslwaveosc.h b/bse/gslwaveosc.hh
similarity index 98%
rename from bse/gslwaveosc.h
rename to bse/gslwaveosc.hh
index 38aff86..bf5f67f 100644
--- a/bse/gslwaveosc.h
+++ b/bse/gslwaveosc.hh
@@ -17,8 +17,8 @@
 #ifndef __GSL_WAVE_OSC_H__
 #define __GSL_WAVE_OSC_H__
 
-#include <bse/gsldefs.h>
-#include <bse/gslwavechunk.h>
+#include <bse/gsldefs.hh>
+#include <bse/gslwavechunk.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/bse/ladspa.h b/bse/ladspa.hh
similarity index 99%
rename from bse/ladspa.h
rename to bse/ladspa.hh
index 5c30a8a..273d365 100644
--- a/bse/ladspa.h
+++ b/bse/ladspa.hh
@@ -1,4 +1,4 @@
-/* ladspa.h
+/* ladspa.hh
 
    Linux Audio Developer's Simple Plugin API Version 1.1[LGPL].
    Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis,
diff --git a/bse/tests/blocktests.cc b/bse/tests/blocktests.cc
index c1e3be5..78fc497 100644
--- a/bse/tests/blocktests.cc
+++ b/bse/tests/blocktests.cc
@@ -18,7 +18,7 @@
 #include <bse/bseblockutils.hh>
 // #define TEST_VERBOSE
 #include <sfi/sfitests.hh>
-#include <bse/bsemain.h>
+#include <bse/bsemain.hh>
 #include "topconfig.h"
 
 template<typename T> static bool
diff --git a/bse/tests/filtertest.cc b/bse/tests/filtertest.cc
index 1e00cba..4378799 100644
--- a/bse/tests/filtertest.cc
+++ b/bse/tests/filtertest.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsedefs.h>
+#include <bse/bsedefs.hh>
 // #define TEST_VERBOSE
 #include <sfi/sfitests.hh>
-#include <bse/bsefilter.h>
-#include <bse/bsemain.h>
-#include <bse/gslfilter.h> // FIXME
-#include <bse/bseglobals.h> // FIXME
+#include <bse/bsefilter.hh>
+#include <bse/bsemain.hh>
+#include <bse/gslfilter.hh> // FIXME
+#include <bse/bseglobals.hh> // FIXME
 #include "topconfig.h"
 #include <math.h>
 #include <stdlib.h>
diff --git a/bse/tests/firhandle.cc b/bse/tests/firhandle.cc
index f82bdee..ebb7151 100644
--- a/bse/tests/firhandle.cc
+++ b/bse/tests/firhandle.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsedefs.h>
+#include <bse/bsedefs.hh>
 // #define TEST_VERBOSE
 #include <sfi/sfitests.hh>
-#include <bse/gsldatahandle.h>
-#include <bse/gsldatautils.h>
-#include <bse/bsemain.h>
+#include <bse/gsldatahandle.hh>
+#include <bse/gsldatautils.hh>
+#include <bse/bsemain.hh>
 #include "topconfig.h"
 #include <math.h>
 #include <stdlib.h>
diff --git a/bse/tests/loophandle.cc b/bse/tests/loophandle.cc
index 812cbae..a7a1eb5 100644
--- a/bse/tests/loophandle.cc
+++ b/bse/tests/loophandle.cc
@@ -15,10 +15,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/gsldatahandle.h>
-#include <bse/gsldatautils.h>
-#include <bse/bse.h>
-#include <bse/bsemain.h>
+#include <bse/gsldatahandle.hh>
+#include <bse/gsldatautils.hh>
+#include <bse/bse.hh>
+#include <bse/bsemain.hh>
 #include <stdlib.h>
 
 /* --- loop handle: reference code --- */
diff --git a/bse/tests/misctests.cc b/bse/tests/misctests.cc
index 0c4779b..a9a04a7 100644
--- a/bse/tests/misctests.cc
+++ b/bse/tests/misctests.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsemain.h>
+#include <bse/bsemain.hh>
 // #define TEST_VERBOSE
 #include <sfi/sfitests.hh>
-#include <bse/bsemathsignal.h>
+#include <bse/bsemathsignal.hh>
 #include <bse/bsecxxplugin.hh> // for generated types
 
 #define	FLF	"26.20"
diff --git a/bse/tests/resamplehandle.cc b/bse/tests/resamplehandle.cc
index d680979..f6e1dfe 100644
--- a/bse/tests/resamplehandle.cc
+++ b/bse/tests/resamplehandle.cc
@@ -15,11 +15,11 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsemathsignal.h>
-#include <bse/bsemain.h>
+#include <bse/bsemathsignal.hh>
+#include <bse/bsemain.hh>
 // #define TEST_VERBOSE
 #include <sfi/sfitests.hh>
-#include <bse/gsldatautils.h>
+#include <bse/gsldatautils.hh>
 #include <bse/bseblockutils.hh>
 #include <stdlib.h>
 #include <vector>
diff --git a/bse/tests/subnormals-aux.cc b/bse/tests/subnormals-aux.cc
index 4f81eee..be8e49c 100644
--- a/bse/tests/subnormals-aux.cc
+++ b/bse/tests/subnormals-aux.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bse.h>
-#include <bse/bseieee754.h>
+#include <bse/bse.hh>
+#include <bse/bseieee754.hh>
 
 float
 test1f (float v)
diff --git a/bse/tests/subnormals.cc b/bse/tests/subnormals.cc
index 294b5f2..954b814 100644
--- a/bse/tests/subnormals.cc
+++ b/bse/tests/subnormals.cc
@@ -15,9 +15,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bse.h>
-#include <bse/bseieee754.h>
-#include <bse/bsemain.h>
+#include <bse/bse.hh>
+#include <bse/bseieee754.hh>
+#include <bse/bsemain.hh>
 //#define TEST_VERBOSE
 #include <birnet/birnettests.h>
 #include <stdio.h>
diff --git a/bse/tests/testcxx.cc b/bse/tests/testcxx.cc
index 53632ad..b4d5431 100644
--- a/bse/tests/testcxx.cc
+++ b/bse/tests/testcxx.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include <bse/bsecxxbase.hh>
-#include <bse/bsemain.h>
+#include <bse/bsemain.hh>
 #include <bse/bsebusmodule.genidl.hh>
 
 namespace {
diff --git a/bse/tests/testfft.cc b/bse/tests/testfft.cc
index ee9848f..5ca6511 100644
--- a/bse/tests/testfft.cc
+++ b/bse/tests/testfft.cc
@@ -14,10 +14,10 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/gslcommon.h>
-#include <bse/bsemath.h>
-#include <bse/bsemain.h>
-#include <bse/gslfft.h>
+#include <bse/gslcommon.hh>
+#include <bse/bsemath.hh>
+#include <bse/bsemain.hh>
+#include <bse/gslfft.hh>
 // #define TEST_VERBOSE
 #include <birnet/birnettests.h>
 #include <sys/time.h>
diff --git a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
index 0a0d951..9e065ad 100644
--- a/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
+++ b/drivers/bse-portaudio/bsepcmdevice-portaudio.cc
@@ -18,7 +18,7 @@
 #include "configure.h"
 #include "bsepcmdevice-portaudio.hh"
 #include <portaudio.h>
-#include <bse/gsldatautils.h>
+#include <bse/gsldatautils.hh>
 #include <string.h>
 #include <errno.h>
 #include <string>
diff --git a/drivers/bse-portaudio/bsepcmdevice-portaudio.hh b/drivers/bse-portaudio/bsepcmdevice-portaudio.hh
index 1fb1e70..f546af8 100644
--- a/drivers/bse-portaudio/bsepcmdevice-portaudio.hh
+++ b/drivers/bse-portaudio/bsepcmdevice-portaudio.hh
@@ -18,8 +18,8 @@
 #ifndef __BSE_PCM_DEVICE_PORTAUDIO_H__
 #define __BSE_PCM_DEVICE_PORTAUDIO_H__
 
-#include <bse/bsepcmdevice.h>
-#include <bse/bseplugin.h>
+#include <bse/bsepcmdevice.hh>
+#include <bse/bseplugin.hh>
 
 G_BEGIN_DECLS
 
diff --git a/drivers/bsemididevice-alsa.cc b/drivers/bsemididevice-alsa.cc
index 5eea76d..9afafe9 100644
--- a/drivers/bsemididevice-alsa.cc
+++ b/drivers/bsemididevice-alsa.cc
@@ -17,8 +17,8 @@
 #include "configure.h"
 #include <bse/bsecxxplugin.hh>
 #include "bsemididevice-alsa.h"
-#include <bse/bsesequencer.h>
-#include <bse/bsemididecoder.h>
+#include <bse/bsesequencer.hh>
+#include <bse/bsemididecoder.hh>
 #include <alsa/asoundlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/drivers/bsemididevice-alsa.h b/drivers/bsemididevice-alsa.h
index 72cf477..1d62de2 100644
--- a/drivers/bsemididevice-alsa.h
+++ b/drivers/bsemididevice-alsa.h
@@ -17,8 +17,8 @@
 #ifndef __BSE_MIDI_DEVICE_ALSA_H__
 #define __BSE_MIDI_DEVICE_ALSA_H__
 
-#include <bse/bsemididevice.h>
-#include <bse/bseplugin.h>
+#include <bse/bsemididevice.hh>
+#include <bse/bseplugin.hh>
 
 G_BEGIN_DECLS
 
diff --git a/drivers/bsepcmdevice-alsa.cc b/drivers/bsepcmdevice-alsa.cc
index 2d7d66b..4bc6aed 100644
--- a/drivers/bsepcmdevice-alsa.cc
+++ b/drivers/bsepcmdevice-alsa.cc
@@ -17,7 +17,7 @@
 #include "configure.h"
 #include <bse/bsecxxplugin.hh>
 #include "bsepcmdevice-alsa.h"
-#include <bse/gsldatautils.h>
+#include <bse/gsldatautils.hh>
 #include <alsa/asoundlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/drivers/bsepcmdevice-alsa.h b/drivers/bsepcmdevice-alsa.h
index 3939013..1acf27b 100644
--- a/drivers/bsepcmdevice-alsa.h
+++ b/drivers/bsepcmdevice-alsa.h
@@ -17,8 +17,8 @@
 #ifndef __BSE_PCM_DEVICE_ALSA_H__
 #define __BSE_PCM_DEVICE_ALSA_H__
 
-#include <bse/bsepcmdevice.h>
-#include <bse/bseplugin.h>
+#include <bse/bsepcmdevice.hh>
+#include <bse/bseplugin.hh>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/artscompressor.cc b/plugins/artscompressor.cc
index 5e39571..bdca494 100644
--- a/plugins/artscompressor.cc
+++ b/plugins/artscompressor.cc
@@ -17,7 +17,7 @@
  */
 #include "artscompressor.genidl.hh"
 
-#include <bse/bsemath.h>
+#include <bse/bsemath.hh>
 #include <string.h>
 
 
diff --git a/plugins/bseadder.cc b/plugins/bseadder.cc
index 35d3888..0f9306d 100644
--- a/plugins/bseadder.cc
+++ b/plugins/bseadder.cc
@@ -16,7 +16,7 @@
  */
 #include "bseadder.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 #include <string.h>
diff --git a/plugins/bseadder.h b/plugins/bseadder.h
index 2e29af1..8cf4f19 100644
--- a/plugins/bseadder.h
+++ b/plugins/bseadder.h
@@ -19,8 +19,8 @@
 #ifndef __BSE_ADDER_H__
 #define __BSE_ADDER_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bseamplifier.cc b/plugins/bseamplifier.cc
index 602c1a3..5d84d37 100644
--- a/plugins/bseamplifier.cc
+++ b/plugins/bseamplifier.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseamplifier.genidl.hh"
-#include <bse/bsemathsignal.h>
+#include <bse/bsemathsignal.hh>
 
 namespace Bse {
 
@@ -156,7 +156,7 @@ class Amplifier : public AmplifierBase {
 #define BSE_INCLUDER_MATCH(n)   (n >= 0 && n <= 31 && (n & ACASE_MASK) != ACASE_A1n_A2n)
 #define BSE_INCLUDER_FUNC(n)    process_loop <n, false>
 #define BSE_INCLUDER_ARGS(n)    (n_values)
-#include <bse/bseincluder.h>
+#include <bse/bseincluder.hh>
           }
     }
   };
diff --git a/plugins/bseatandistort.cc b/plugins/bseatandistort.cc
index 99901a7..c341a68 100644
--- a/plugins/bseatandistort.cc
+++ b/plugins/bseatandistort.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseatandistort.h"
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 #include <bse/bsecxxplugin.hh>
 
 
diff --git a/plugins/bseatandistort.h b/plugins/bseatandistort.h
index 7e89e01..24d7309 100644
--- a/plugins/bseatandistort.h
+++ b/plugins/bseatandistort.h
@@ -17,8 +17,8 @@
 #ifndef __BSE_ATAN_DISTORT_H__
 #define __BSE_ATAN_DISTORT_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bsecontribsampleandhold.cc b/plugins/bsecontribsampleandhold.cc
index 31bee32..fbb2ac4 100644
--- a/plugins/bsecontribsampleandhold.cc
+++ b/plugins/bsecontribsampleandhold.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsecontribsampleandhold.genidl.hh"
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 
 namespace Bse { namespace Contrib {
 
diff --git a/plugins/bsefirfilter.h b/plugins/bsefirfilter.h
index f8461fd..150e95b 100644
--- a/plugins/bsefirfilter.h
+++ b/plugins/bsefirfilter.h
@@ -19,8 +19,8 @@
 #ifndef __BSE_FIR_FILTER_H__
 #define __BSE_FIR_FILTER_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bseiirfilter.cc b/plugins/bseiirfilter.cc
index 5c4369e..5272481 100644
--- a/plugins/bseiirfilter.cc
+++ b/plugins/bseiirfilter.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseiirfilter.h"
-#include <bse/bseengine.h>
-#include <bse/gslfilter.h>
+#include <bse/bseengine.hh>
+#include <bse/gslfilter.hh>
 #include <bse/bsecxxplugin.hh>
 
 #include <string.h>
diff --git a/plugins/bseiirfilter.h b/plugins/bseiirfilter.h
index 42b83a0..c569dae 100644
--- a/plugins/bseiirfilter.h
+++ b/plugins/bseiirfilter.h
@@ -17,7 +17,7 @@
 #ifndef __BSE_IIR_FILTER_H__
 #define __BSE_IIR_FILTER_H__
 
-#include <bse/bsesource.h>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bsemixer.cc b/plugins/bsemixer.cc
index 52868f1..a7627cd 100644
--- a/plugins/bsemixer.cc
+++ b/plugins/bsemixer.cc
@@ -16,7 +16,7 @@
  */
 #include "bsemixer.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 #include <string.h>
diff --git a/plugins/bsemixer.h b/plugins/bsemixer.h
index 921ea09..6101bf2 100644
--- a/plugins/bsemixer.h
+++ b/plugins/bsemixer.h
@@ -19,8 +19,8 @@
 #ifndef __BSE_MIXER_H__
 #define __BSE_MIXER_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bsemult.cc b/plugins/bsemult.cc
index f34d834..499be0e 100644
--- a/plugins/bsemult.cc
+++ b/plugins/bsemult.cc
@@ -16,7 +16,7 @@
  */
 #include "bsemult.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 #include <string.h>
diff --git a/plugins/bsemult.h b/plugins/bsemult.h
index 70e4220..fa4c067 100644
--- a/plugins/bsemult.h
+++ b/plugins/bsemult.h
@@ -19,8 +19,8 @@
 #ifndef __BSE_MULT_H__
 #define __BSE_MULT_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bsenoise.cc b/plugins/bsenoise.cc
index dc76537..b4986f9 100644
--- a/plugins/bsenoise.cc
+++ b/plugins/bsenoise.cc
@@ -16,7 +16,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsenoise.genidl.hh"
-#include <bse/bsemain.h>
+#include <bse/bsemain.hh>
 #include <vector>
 
 using namespace std;
diff --git a/plugins/bsequantizer.cc b/plugins/bsequantizer.cc
index fa5f005..41a7bcd 100644
--- a/plugins/bsequantizer.cc
+++ b/plugins/bsequantizer.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsequantizer.genidl.hh"
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 
 namespace Bse { namespace Standard {
 using namespace Birnet;
diff --git a/plugins/bsesequencer.cc b/plugins/bsesequencer.cc
index c41cbb5..4ef8887 100644
--- a/plugins/bsesequencer.cc
+++ b/plugins/bsesequencer.cc
@@ -16,7 +16,7 @@
  */
 #include "bsesequencer.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 
diff --git a/plugins/bsesequencer.h b/plugins/bsesequencer.h
index fff112e..c0ea34a 100644
--- a/plugins/bsesequencer.h
+++ b/plugins/bsesequencer.h
@@ -17,8 +17,8 @@
 #ifndef __BSE_SEQUENCER_H__
 #define __BSE_SEQUENCER_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/bsesimpleadsr.cc b/plugins/bsesimpleadsr.cc
index 5fef822..7a8282f 100644
--- a/plugins/bsesimpleadsr.cc
+++ b/plugins/bsesimpleadsr.cc
@@ -16,7 +16,7 @@
  */
 #include "bsesimpleadsr.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 #define	TIME_EPSILON	(0.00001)
diff --git a/plugins/bsesimpleadsr.h b/plugins/bsesimpleadsr.h
index c43828a..487baca 100644
--- a/plugins/bsesimpleadsr.h
+++ b/plugins/bsesimpleadsr.h
@@ -17,8 +17,8 @@
 #ifndef __BSE_SIMPLE_ADSR_H__
 #define __BSE_SIMPLE_ADSR_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/davcanyondelay.cc b/plugins/davcanyondelay.cc
index b0444cc..3071623 100644
--- a/plugins/davcanyondelay.cc
+++ b/plugins/davcanyondelay.cc
@@ -17,9 +17,9 @@
  */
 #include "davcanyondelay.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
-#include <bse/bsemathsignal.h>
+#include <bse/bsemathsignal.hh>
 #include <string.h>
 
 
diff --git a/plugins/davcanyondelay.h b/plugins/davcanyondelay.h
index a15211e..3bd059f 100644
--- a/plugins/davcanyondelay.h
+++ b/plugins/davcanyondelay.h
@@ -17,8 +17,8 @@
 #ifndef __DAV_CANYON_DELAY_H__
 #define __DAV_CANYON_DELAY_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/davguitar.h b/plugins/davguitar.h
index 4cef86c..c5f094c 100644
--- a/plugins/davguitar.h
+++ b/plugins/davguitar.h
@@ -17,8 +17,8 @@
 #ifndef __DAV_GUITAR_H__
 #define __DAV_GUITAR_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/davorgan.cc b/plugins/davorgan.cc
index 5b34063..336545e 100644
--- a/plugins/davorgan.cc
+++ b/plugins/davorgan.cc
@@ -16,8 +16,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "davorgan.genidl.hh"
-#include <bse/bsemathsignal.h>
-#include <bse/bsemain.h>
+#include <bse/bsemathsignal.hh>
+#include <bse/bsemain.hh>
 #include <vector>
 
 namespace Bse {
diff --git a/plugins/davsyndrum.cc b/plugins/davsyndrum.cc
index 25c7ff2..1d5a9c6 100644
--- a/plugins/davsyndrum.cc
+++ b/plugins/davsyndrum.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "davsyndrum.h"
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 #include <bse/bsecxxplugin.hh>
 
 /* --- parameters --- */
diff --git a/plugins/davsyndrum.h b/plugins/davsyndrum.h
index ada9b9b..89426e1 100644
--- a/plugins/davsyndrum.h
+++ b/plugins/davsyndrum.h
@@ -17,8 +17,8 @@
 #ifndef __DAV_SYNDRUM_H__
 #define __DAV_SYNDRUM_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/davxtalstrings.cc b/plugins/davxtalstrings.cc
index 704862d..cc0d999 100644
--- a/plugins/davxtalstrings.cc
+++ b/plugins/davxtalstrings.cc
@@ -24,9 +24,9 @@
  */
 #include "davxtalstrings.h"
 #include <bse/bsecxxplugin.hh>
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
-#include <bse/bsemain.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
+#include <bse/bsemain.hh>
 
 #include <string.h>
 
diff --git a/plugins/davxtalstrings.h b/plugins/davxtalstrings.h
index 23a6033..4bbc6a1 100644
--- a/plugins/davxtalstrings.h
+++ b/plugins/davxtalstrings.h
@@ -17,8 +17,8 @@
 #ifndef __DAV_XTAL_STRINGS_H__
 #define __DAV_XTAL_STRINGS_H__
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/freeverb/bsefreeverb.cc b/plugins/freeverb/bsefreeverb.cc
index 4c6d6fb..74a2ef3 100644
--- a/plugins/freeverb/bsefreeverb.cc
+++ b/plugins/freeverb/bsefreeverb.cc
@@ -16,7 +16,7 @@
  */
 #include "bsefreeverb.h"
 
-#include <bse/bseengine.h>
+#include <bse/bseengine.hh>
 #include <bse/bsecxxplugin.hh>
 
 
diff --git a/plugins/freeverb/bsefreeverb.h b/plugins/freeverb/bsefreeverb.h
index 52a6e4b..5a74190 100644
--- a/plugins/freeverb/bsefreeverb.h
+++ b/plugins/freeverb/bsefreeverb.h
@@ -19,8 +19,8 @@
 
 #define  BSE_PLUGIN_NAME  "BseFreeVerb"
 
-#include <bse/bseplugin.h>
-#include <bse/bsesource.h>
+#include <bse/bseplugin.hh>
+#include <bse/bsesource.hh>
 #include "bsefreeverbcpp.h"
 
 G_BEGIN_DECLS
diff --git a/plugins/freeverb/denormals.h b/plugins/freeverb/denormals.h
index a43a9ff..c42cc89 100644
--- a/plugins/freeverb/denormals.h
+++ b/plugins/freeverb/denormals.h
@@ -4,8 +4,8 @@
 // http://www.dreampoint.co.uk
 // Based on IS_DENORMAL macro by Jon Watte
 // This code is public domain
-#include <bse/bseplugin.h>
-#include <bse/bseieee754.h>
+#include <bse/bseplugin.hh>
+#include <bse/bseieee754.hh>
 
 #ifndef _denormals_
 #define _denormals_
diff --git a/plugins/standardguspatchenvelope.cc b/plugins/standardguspatchenvelope.cc
index b28cb29..7aad1e0 100644
--- a/plugins/standardguspatchenvelope.cc
+++ b/plugins/standardguspatchenvelope.cc
@@ -15,10 +15,10 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include <bse/bsecxxplugin.hh>
-#include <bse/bsewave.h>
+#include <bse/bsewave.hh>
 #include "standardguspatchenvelope.genidl.hh"
-#include <bse/gslwavechunk.h>
-#include <bse/bsemathsignal.h>
+#include <bse/gslwavechunk.hh>
+#include <bse/bsemathsignal.hh>
 
 using namespace std;
 using namespace Sfi;
diff --git a/plugins/standardsaturator.cc b/plugins/standardsaturator.cc
index ad348e5..352f22c 100644
--- a/plugins/standardsaturator.cc
+++ b/plugins/standardsaturator.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "standardsaturator.genidl.hh"
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 
 #define TEST_GNUPLOT    0
 
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index 649c41a..fbfde31 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -18,8 +18,8 @@
 #include <errno.h>
 #include <unistd.h>
 #include <guile/gh.h>
-#include <bse/bse.h>
-#include <bse/bsemain.h>  /* for bse_init_textdomain_only() */
+#include <bse/bse.hh>
+#include <bse/bsemain.hh>  /* for bse_init_textdomain_only() */
 #include <sfi/sfistore.hh> /* no bin-compat */
 #include <sys/time.h>
 #include <libintl.h>
diff --git a/shell/bsescminterp.cc b/shell/bsescminterp.cc
index 87ece37..e339442 100644
--- a/shell/bsescminterp.cc
+++ b/shell/bsescminterp.cc
@@ -18,7 +18,7 @@
 #include <errno.h>
 #include "bsescminterp.hh"
 #include <sfi/sficomwire.hh>
-#include <bse/bseglue.h>
+#include <bse/bseglue.hh>
 
 /* Data types:
  * SCM
diff --git a/shell/bsescminterp.hh b/shell/bsescminterp.hh
index 1f54492..c8dcde7 100644
--- a/shell/bsescminterp.hh
+++ b/shell/bsescminterp.hh
@@ -17,7 +17,7 @@
 #ifndef __BSE_SCM_INTERP_H__
 #define __BSE_SCM_INTERP_H__
 
-#include <bse/bse.h>
+#include <bse/bse.hh>
 #include <guile/gh.h>
 
 G_BEGIN_DECLS
diff --git a/tests/bse/cxxbinding.cc b/tests/bse/cxxbinding.cc
index db634e3..d383e2d 100644
--- a/tests/bse/cxxbinding.cc
+++ b/tests/bse/cxxbinding.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsecxxapi.hh"
-#include <bse/bse.h>
+#include <bse/bse.hh>
 #include <unistd.h>
 #include <stdio.h>
 
diff --git a/tests/bse/filtertest.cc b/tests/bse/filtertest.cc
index 02d7f0a..6553119 100644
--- a/tests/bse/filtertest.cc
+++ b/tests/bse/filtertest.cc
@@ -18,10 +18,10 @@
 #include <vector>
 #include <set>
 #include <complex>
-#include <bse/bsemain.h>
-#include <bse/bsemath.h>
-#include <bse/bsemathsignal.h>
-#include <bse/gslfilter.h>
+#include <bse/bsemain.hh>
+#include <bse/bsemath.hh>
+#include <bse/bsemathsignal.hh>
+#include <bse/gslfilter.hh>
 //#define TEST_VERBOSE
 #include <birnet/birnettests.h>
 #include "topconfig.h"
diff --git a/tests/perftest.cc b/tests/perftest.cc
index 2768d4d..05752aa 100644
--- a/tests/perftest.cc
+++ b/tests/perftest.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bsecxxapi.hh"
-#include <bse/bse.h>
+#include <bse/bse.hh>
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
diff --git a/tests/testresampler.cc b/tests/testresampler.cc
index 3474703..0927993 100644
--- a/tests/testresampler.cc
+++ b/tests/testresampler.cc
@@ -18,10 +18,10 @@
 #include <bse/bseresamplerimpl.hh>
 #include <bse/bseblockutils.hh>
 #include <birnet/birnettests.h>
-#include <bse/bsemain.h>
-#include <bse/bsemath.h>
-#include <bse/bsemathsignal.h>
-#include <bse/gslfft.h>
+#include <bse/bsemain.hh>
+#include <bse/bsemath.hh>
+#include <bse/bsemathsignal.hh>
+#include <bse/gslfft.hh>
 #include "topconfig.h"
 
 #include <stdio.h>
diff --git a/tests/testresamplerq.cc b/tests/testresamplerq.cc
index 59ae379..99efbf5 100644
--- a/tests/testresamplerq.cc
+++ b/tests/testresamplerq.cc
@@ -16,10 +16,10 @@
  */
 
 #include <bse/bseresampler.hh>
-#include <bse/bsemathsignal.h>
-#include <bse/bsemain.h>
+#include <bse/bsemathsignal.hh>
+#include <bse/bsemain.hh>
 #include <bse/bseblockutils.hh>
-#include <bse/gslfft.h>
+#include <bse/gslfft.hh>
 #include <sfi/sfitests.hh>
 #include <birnet/birnet.hh>
 #include <stdlib.h>
diff --git a/tests/testwavechunk.c b/tests/testwavechunk.c
index d864ec9..2c4b103 100644
--- a/tests/testwavechunk.c
+++ b/tests/testwavechunk.c
@@ -14,9 +14,9 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/gslwavechunk.h>
-#include <bse/gsldatahandle.h>
-#include <bse/bsemain.h>
+#include <bse/gslwavechunk.hh>
+#include <bse/gsldatahandle.hh>
+#include <bse/bsemain.hh>
 #include <sfi/sfitests.hh>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/bsefcompare.cc b/tools/bsefcompare.cc
index ed1d8a0..6f440e0 100644
--- a/tools/bsefcompare.cc
+++ b/tools/bsefcompare.cc
@@ -15,11 +15,11 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
 
-#include <bse/gsldatautils.h>
-#include <bse/gslfft.h>
+#include <bse/gsldatautils.hh>
+#include <bse/gslfft.hh>
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
diff --git a/tools/bsefextract.cc b/tools/bsefextract.cc
index a6006be..646805c 100644
--- a/tools/bsefextract.cc
+++ b/tools/bsefextract.cc
@@ -14,13 +14,13 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsemain.h>
-#include <bse/bseengine.h>
-#include <bse/bsemathsignal.h>
-#include <bse/gsldatautils.h>
-#include <bse/bseloader.h>
-#include <bse/gslfft.h>
-#include <bse/gslfilter.h>
+#include <bse/bsemain.hh>
+#include <bse/bseengine.hh>
+#include <bse/bsemathsignal.hh>
+#include <bse/gsldatautils.hh>
+#include <bse/bseloader.hh>
+#include <bse/gslfft.hh>
+#include <bse/gslfilter.hh>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/tools/bseloopfuncs.cc b/tools/bseloopfuncs.cc
index 743297d..81bc0f0 100644
--- a/tools/bseloopfuncs.cc
+++ b/tools/bseloopfuncs.cc
@@ -15,7 +15,7 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bseloopfuncs.hh"
-#include <bse/gsldatacache.h>
+#include <bse/gsldatacache.hh>
 #include <string.h>
 #include <signal.h>    /* G_BREAKPOINT() */
 #include <stdio.h>
diff --git a/tools/bseloopfuncs.hh b/tools/bseloopfuncs.hh
index bf85b84..cc3e8d5 100644
--- a/tools/bseloopfuncs.hh
+++ b/tools/bseloopfuncs.hh
@@ -17,8 +17,8 @@
 #ifndef __BSE_LOOPFUNCS_H__
 #define __BSE_LOOPFUNCS_H__
 
-#include <bse/gsldatautils.h>
-#include <bse/gslcommon.h>
+#include <bse/gsldatautils.hh>
+#include <bse/gslcommon.hh>
 
 G_BEGIN_DECLS
 
diff --git a/tools/bsewavetool.cc b/tools/bsewavetool.cc
index 0c2d604..926ced4 100644
--- a/tools/bsewavetool.cc
+++ b/tools/bsewavetool.cc
@@ -18,10 +18,10 @@
 #include "bsewavetool.hh"
 #include "topconfig.h"
 #include "bwtwave.hh"
-#include <bse/bsemain.h>	/* for bse_init_intern() */
-#include <bse/bseloader.h>
-#include <bse/gslvorbis-enc.h>
-#include <bse/gsldatahandle-vorbis.h>
+#include <bse/bsemain.hh>	/* for bse_init_intern() */
+#include <bse/bseloader.hh>
+#include <bse/gslvorbis-enc.hh>
+#include <bse/gsldatahandle-vorbis.hh>
 #include <bse/bseresamplerimpl.hh>
 #include <birnet/birnettests.h>
 #include <stdlib.h>
diff --git a/tools/bsewavetool.hh b/tools/bsewavetool.hh
index 6e50f2d..25f5a83 100644
--- a/tools/bsewavetool.hh
+++ b/tools/bsewavetool.hh
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/gsldatahandle.h>
-#include <bse/gslwavechunk.h>
+#include <bse/gsldatahandle.hh>
+#include <bse/gslwavechunk.hh>
 #include "bseloopfuncs.hh"
 #include "bwtwave.hh"
 #include <unistd.h>
diff --git a/tools/bwtwave.cc b/tools/bwtwave.cc
index 9d23f1e..ffc1588 100644
--- a/tools/bwtwave.cc
+++ b/tools/bwtwave.cc
@@ -15,10 +15,10 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "bwtwave.hh"
-#include <bse/bsemath.h>
-#include <bse/gsldatautils.h>
-#include <bse/gsldatahandle-vorbis.h>
-#include <bse/bseloader.h>
+#include <bse/bsemath.hh>
+#include <bse/gsldatautils.hh>
+#include <bse/gsldatahandle-vorbis.hh>
+#include <bse/bseloader.hh>
 #include <bse/bsecxxutils.hh>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/tools/bwtwave.hh b/tools/bwtwave.hh
index 0e6daf5..ba408c3 100644
--- a/tools/bwtwave.hh
+++ b/tools/bwtwave.hh
@@ -17,9 +17,9 @@
 #ifndef __BWT_WAVE_H__
 #define __BWT_WAVE_H__
 
-#include <bse/gsldatahandle.h>
-#include <bse/gslwavechunk.h>
-#include <bse/bseenums.h>
+#include <bse/gsldatahandle.hh>
+#include <bse/gslwavechunk.hh>
+#include <bse/bseenums.hh>
 #include <string>
 #include <list>
 #include <vector>
diff --git a/tools/cutvorbis.cc b/tools/cutvorbis.cc
index a122cfa..56e2136 100644
--- a/tools/cutvorbis.cc
+++ b/tools/cutvorbis.cc
@@ -14,8 +14,8 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/gslvorbis-cutter.h>
-#include <bse/bsemain.h>
+#include <bse/gslvorbis-cutter.hh>
+#include <bse/bsemain.hh>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/tools/magictest.cc b/tools/magictest.cc
index da74535..51d06c3 100644
--- a/tools/magictest.cc
+++ b/tools/magictest.cc
@@ -14,12 +14,12 @@
  * A copy of the GNU Lesser General Public License should ship along
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
-#include <bse/bsemain.h>
+#include <bse/bsemain.hh>
 #include "topconfig.h"
-#include <bse/gslmagic.h>
-#include <bse/gslcommon.h>
-#include <bse/bseloader.h>
-#include <bse/gsldatahandle.h>
+#include <bse/gslmagic.hh>
+#include <bse/gslcommon.hh>
+#include <bse/bseloader.hh>
+#include <bse/gsldatahandle.hh>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/tools/mathtool.cc b/tools/mathtool.cc
index da72a1c..dfbce6d 100644
--- a/tools/mathtool.cc
+++ b/tools/mathtool.cc
@@ -15,11 +15,11 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #define GSL_EXTENSIONS
-#include <bse/bsemain.h>
-#include <bse/gslcommon.h>
-#include <bse/gslfilter.h>
-#include <bse/bseloader.h>
-#include <bse/bsemathsignal.h>
+#include <bse/bsemain.hh>
+#include <bse/gslcommon.hh>
+#include <bse/gslfilter.hh>
+#include <bse/bseloader.hh>
+#include <bse/bsemathsignal.hh>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/sfiutils.cc b/tools/sfiutils.cc
index 53d6beb..a42871f 100644
--- a/tools/sfiutils.cc
+++ b/tools/sfiutils.cc
@@ -15,8 +15,8 @@
  * with this library; if not, see http://www.gnu.org/copyleft/.
  */
 #include "sfiutils.h"
-#include <bse/gslcommon.h>
-#include <bse/bsemath.h>
+#include <bse/gslcommon.hh>
+#include <bse/bsemath.hh>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/tools/sfiutils.hh b/tools/sfiutils.hh
index a488b56..9aefe92 100644
--- a/tools/sfiutils.hh
+++ b/tools/sfiutils.hh
@@ -18,7 +18,7 @@
 #define	__SFI_UTILS_H__
 
 #include <math.h>
-#include <bse/gsldefs.h>
+#include <bse/gsldefs.hh>
 #include <sfi/sfi.hh>
 
 G_BEGIN_DECLS



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]