[beast: 7/10] BSE: fix includes to separate serverapi from clientapi

[Tim Janik <timj src gnome org>]

commit 37b93be67a6ddf8a27a7dd7c09e812e075e4db00
Author: Tim Janik <timj gnu org>
Date:   Thu Jun 11 02:43:54 2015 +0200

    BSE: fix includes to separate serverapi from clientapi

 bse/Makefile.am                   |    4 ++--
 bse/bse-internals.hh              |    1 -
 bse/bse.hh                        |    5 ++---
 bse/bseengine.cc                  |    2 +-
 bse/bseenginemaster.cc            |    1 +
 bse/bsemain.cc                    |    2 +-
 bse/bsemain.hh                    |    1 -
 bse/bseplugin.hh                  |    2 +-
 bse/bsesequencer.cc               |    1 +
 bse/{bsecore.cc => bsestartup.cc} |    5 ++++-
 bse/{bsecore.hh => bsestartup.hh} |    4 ++--
 bse/bseutils.cc                   |    3 +--
 bse/bseutils.hh                   |    1 -
 13 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 146856b..dd5262f 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -28,7 +28,7 @@ bse_public_headers = $(strip \
        \
        bse.hh  bsedefs.hh      bseexports.hh   bseconfig.h     bsegenclosures.hh \
        bseincluder.hh  ladspa.hh       bseenginenode.hh bseieee754.hh \
-       bsecore.hh              \
+       bsestartup.hh           \
        bseengine.hh            bseenginemaster.hh      bseengineschedule.hh            bseengineutils.hh \
        bsebus.hh               bsecategories.hh        \
        bsefilter.hh                    bsebiquadfilter.hh      \
@@ -63,7 +63,7 @@ bse_sources = $(strip \
        gsldatahandle-vorbis.cc gslvorbis-enc.cc        gsldatacache.cc gslvorbis-cutter.cc \
        gsldatahandle-mad.cc                    gslfilehash.cc  gsldatautils.cc \
        gslwaveosc.cc           gslosctable.cc  gslmagic.cc                      \
-       bsecore.cc              \
+       bsestartup.cc           \
        bseengine.cc            bseenginemaster.cc      bseengineschedule.cc            bseengineutils.cc \
        bsebus.cc               bsecategories.cc        \
        bsefilter.cc            bsebiquadfilter.cc      bsefilter-ellf.cc       \
diff --git a/bse/bse-internals.hh b/bse/bse-internals.hh
index 5fd0e1f..11458e7 100644
--- a/bse/bse-internals.hh
+++ b/bse/bse-internals.hh
@@ -2,7 +2,6 @@
 #ifndef __BSE_INTERNALS_HH__
 #define __BSE_INTERNALS_HH__
 
-#include <bse/bse.hh>
 #include <bse/bseenums.hh>
 #include <bse/bsemathsignal.hh>
 #include <bse/bseblockutils.hh>
diff --git a/bse/bse.hh b/bse/bse.hh
index 6107de6..b1d6f39 100644
--- a/bse/bse.hh
+++ b/bse/bse.hh
@@ -2,9 +2,8 @@
 #ifndef __BSE_H__
 #define __BSE_H__
 
-#include <sfi/sfi.hh>
-#include <bse/bseconfig.h>
-#include <bse/bsecore.hh>
+#include <bse/bsestartup.hh>
+#include <bse/bseclientapi.hh>
 
 G_BEGIN_DECLS
 
diff --git a/bse/bseengine.cc b/bse/bseengine.cc
index 1cf33b7..9a32370 100644
--- a/bse/bseengine.cc
+++ b/bse/bseengine.cc
@@ -1,10 +1,10 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bseengine.hh"
-#include "bsecore.hh"
 #include "bsemain.hh"
 #include "gslcommon.hh"
 #include "bseengineutils.hh"
 #include "bseenginemaster.hh"
+#include "bsestartup.hh"        // for TaskRegistry
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/bse/bseenginemaster.cc b/bse/bseenginemaster.cc
index cd3cf53..84bad2b 100644
--- a/bse/bseenginemaster.cc
+++ b/bse/bseenginemaster.cc
@@ -7,6 +7,7 @@
 #include "bseengineutils.hh"
 #include "bseengineschedule.hh"
 #include "bseieee754.hh"
+#include "bsestartup.hh"        // for TaskRegistry
 #include <string.h>
 #include <unistd.h>
 #include <sys/poll.h>
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index d9f4299..98a863f 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bsemain.hh"
-#include "bsecore.hh"
+#include "bsestartup.hh"
 #include "topconfig.h"
 #include "bseserver.hh"
 #include "bsesequencer.hh"
diff --git a/bse/bsemain.hh b/bse/bsemain.hh
index 62104ed..d40ef11 100644
--- a/bse/bsemain.hh
+++ b/bse/bsemain.hh
@@ -1,7 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #ifndef __BSE_MAIN_H__
 #define __BSE_MAIN_H__
-#include       <bse/bse.hh>    /* initialization */
 #include        <bse/bsetype.hh>
 G_BEGIN_DECLS
 
diff --git a/bse/bseplugin.hh b/bse/bseplugin.hh
index 4cec43c..abfa9cb 100644
--- a/bse/bseplugin.hh
+++ b/bse/bseplugin.hh
@@ -2,7 +2,7 @@
 #ifndef __BSE_PLUGIN_H__
 #define __BSE_PLUGIN_H__
 
-#include       <bse/bse.hh>    /* for bse_check_version() */
+#include       <bse/bsestartup.hh>     // for bse_check_version()
 #include       <bse/bseexports.hh>
 
 G_BEGIN_DECLS
diff --git a/bse/bsesequencer.cc b/bse/bsesequencer.cc
index 088911f..5144049 100644
--- a/bse/bsesequencer.cc
+++ b/bse/bsesequencer.cc
@@ -9,6 +9,7 @@
 #include "bsemidireceiver.hh"
 #include "bsemain.hh"
 #include "bseieee754.hh"
+#include "bsestartup.hh"        // for TaskRegistry
 #include <sys/poll.h>
 #include <errno.h>
 #include <string.h>
diff --git a/bse/bsecore.cc b/bse/bsestartup.cc
similarity index 96%
rename from bse/bsecore.cc
rename to bse/bsestartup.cc
index 046fd55..18e23ac 100644
--- a/bse/bsecore.cc
+++ b/bse/bsestartup.cc
@@ -1,5 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include "bsecore.hh"
+#include "bsestartup.hh"
+#include "bseclientapi.hh"
 #include "bsemain.hh"
 
 namespace Bse {
@@ -122,3 +123,5 @@ AidaGlibSource::create (Rapicorn::Aida::BaseConnection *connection)
 }
 
 } // Bse
+
+#include "bseclientapi.cc"      // build IDL client interface
diff --git a/bse/bsecore.hh b/bse/bsestartup.hh
similarity index 96%
rename from bse/bsecore.hh
rename to bse/bsestartup.hh
index 7a3e190..6ff5f08 100644
--- a/bse/bsecore.hh
+++ b/bse/bsestartup.hh
@@ -2,8 +2,8 @@
 #ifndef __BSE_CORE_HH__
 #define __BSE_CORE_HH__
 
-#include <bse/bse.hh>
-#include <bse/bseclientapi.hh>
+#include <sfi/sfi.hh>
+#include <bse/bseconfig.h>
 
 /// The Bse namespace contains all functions of the synthesis engine.
 namespace Bse {
diff --git a/bse/bseutils.cc b/bse/bseutils.cc
index a2132db..f96cf03 100644
--- a/bse/bseutils.cc
+++ b/bse/bseutils.cc
@@ -670,5 +670,4 @@ bse_string_equals (gconstpointer string1,
     return string1 == string2;
 }
 
-#include "bseclientapi.cc"
-#include "bseserverapi.cc"      // build AIDA IDL stubs
+#include "bseserverapi.cc"      // build IDL server interface
diff --git a/bse/bseutils.hh b/bse/bseutils.hh
index 4c34452..8f818dc 100644
--- a/bse/bseutils.hh
+++ b/bse/bseutils.hh
@@ -2,7 +2,6 @@
 #ifndef __BSE_UTILS_H__
 #define __BSE_UTILS_H__
 
-#include <bse/bseclientapi.hh>
 #include <rapicorn-core.hh>
 #include <bse/bseserverapi.hh>