Cleanup headers

gui/Patchage.hpp

@@ -28,12 +28,9 @@
 #ifndef PATCHAGE_PATCHAGE_HPP
 #define PATCHAGE_PATCHAGE_HPP
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <libgnomecanvasmm.h>
-#include <libglademm/xml.h>
+#include "common.h"
 #include "Widget.hpp"
-
+#include <gtkmm.h>
 #include "PatchagePort.hpp"
 
 class PatchageCanvas;

gui/PatchageCanvas.hpp

@@ -28,7 +28,6 @@
 #define PATCHAGE_PATCHAGECANVAS_HPP
 
 #include "common.h"
-#include "StateManager.hpp"
 
 class Patchage;
 class PatchageModule;

gui/PatchageModule.hpp

@@ -27,11 +27,8 @@
 #ifndef PATCHAGE_PATCHAGEMODULE_HPP
 #define PATCHAGE_PATCHAGEMODULE_HPP
 
-#include <string>
-#include <libgnomecanvasmm.h>
+#include "common.h"
 #include "PatchageCanvas.hpp"
-#include "StateManager.hpp"
-#include "PatchagePort.hpp"
 
 class PatchageModule
 {

gui/PatchagePort.hpp

@@ -28,12 +28,9 @@
 #define PATCHAGE_PATCHAGEPORT_HPP
 
 #include "common.h"
-#include <string>
-#include <boost/shared_ptr.hpp>
 
 enum PortType { JACK_AUDIO, JACK_MIDI };
 
-
 /** A Port on a PatchageModule
  *
  * \ingroup OmGtk

gui/StateManager.cpp

@@ -24,6 +24,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <stdexcept>
 #include <stdlib.h>
 #include <iostream>

gui/StateManager.hpp

@@ -27,14 +27,9 @@
 #ifndef PATCHAGE_STATEMANAGER_HPP
 #define PATCHAGE_STATEMANAGER_HPP
 
-#include <string>
-#include <list>
-#include <map>
-#include <iostream>
-#include <boost/optional.hpp>
+#include "common.h"
 #include "PatchagePort.hpp"
-
-enum ModuleType { Input, Output, InputOutput };
+#include <map>
 
 struct Coord {
   Coord(double x_=0, double y_=0) : x(x_), y(y_) {}

gui/Widget.hpp

@@ -27,7 +27,7 @@
 #ifndef PATCHAGE_WIDGET_HPP
 #define PATCHAGE_WIDGET_HPP
 
-#include <string>
+#include <libglademm/xml.h>
 #include <boost/utility.hpp>
 
 template <typename W>

gui/canvas.h

@@ -33,6 +33,8 @@ typedef struct canvas_tag { int unused; } * canvas_handle;
 typedef struct canvas_module_tag { int unused; } * canvas_module_handle;
 typedef struct canvas_port_tag { int unused; } * canvas_port_handle;
 
+enum ModuleType { Input, Output, InputOutput };
+
 #ifdef __cplusplus
 extern "C" {
 #endif