Clean up includes and forward declarations

1 files changed, 15 insertions, 9 deletions

diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index ea170f81..9ac08a7a 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -17,24 +17,30 @@
 #ifndef INGEN_ENGINE_CONTROLBINDINGS_HPP
 #define INGEN_ENGINE_CONTROLBINDINGS_HPP
 
-#include <atomic>
-#include <cstdint>
-#include <vector>
-
-#include <boost/intrusive/options.hpp>
-#include <boost/intrusive/set.hpp>
+#include "BufferRef.hpp"
 
-#include "ingen/Atom.hpp"
 #include "ingen/types.hpp"
 #include "lv2/atom/forge.h"
 #include "raul/Maid.hpp"
-#include "raul/Path.hpp"
 
-#include "BufferFactory.hpp"
+#include <boost/intrusive/options.hpp>
+#include <boost/intrusive/set.hpp>
+#include <boost/intrusive/set_hook.hpp>
+
+#include <atomic>
+#include <cstdint>
+#include <utility>
+#include <vector>
+
+namespace Raul { class Path; }
 
 namespace ingen {
+
+class Atom;
+
 namespace server {
 
+class Buffer;
 class Engine;
 class RunContext;
 class PortImpl;