6 files changed, 9 insertions, 4 deletions
diff --git a/src/server/EngineStore.cpp b/src/server/EngineStore.cpp
index 00856ee5..a492c471 100644
--- a/src/server/EngineStore.cpp
+++ b/src/server/EngineStore.cpp
@@ -109,7 +109,7 @@ EngineStore::remove(const Raul::Path& path)
  * including the object itself, in lexicographically sorted order by Path.
  */
 SharedPtr<EngineStore::Objects>
-EngineStore::remove(iterator object)
+EngineStore::remove(Objects::iterator object)
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
 
@@ -142,7 +142,7 @@ EngineStore::remove_children(const Raul::Path& path)
  * in lexicographically sorted order by Path.
  */
 SharedPtr<EngineStore::Objects>
-EngineStore::remove_children(iterator object)
+EngineStore::remove_children(Objects::iterator object)
 {
 	if (object != end()) {
 		iterator descendants_end = find_descendants_end(object);
diff --git a/src/server/EngineStore.hpp b/src/server/EngineStore.hpp
index e6e05f00..ccac2b74 100644
--- a/src/server/EngineStore.hpp
+++ b/src/server/EngineStore.hpp
@@ -55,7 +55,7 @@ public:
 	PortImpl*        find_port(const Raul::Path& path);
 	GraphObjectImpl* find_object(const Raul::Path& path);
 
-	void add(Ingen::GraphObject* o);
+	void add(GraphObject* o);
 	void add(const Objects& family);
 
 	SharedPtr<Objects> remove(const Raul::Path& path);
diff --git a/src/server/PortType.hpp b/src/server/PortType.hpp
index cef47703..c84cefb4 100644
--- a/src/server/PortType.hpp
+++ b/src/server/PortType.hpp
@@ -17,6 +17,8 @@
 #ifndef INGEN_INTERFACE_PORTTYPE_HPP
 #define INGEN_INTERFACE_PORTTYPE_HPP
 
+#include <cassert>
+
 #include "raul/URI.hpp"
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
diff --git a/src/server/PostProcessor.hpp b/src/server/PostProcessor.hpp
index 38a7d43d..31f49ad4 100644
--- a/src/server/PostProcessor.hpp
+++ b/src/server/PostProcessor.hpp
@@ -25,8 +25,9 @@
 namespace Ingen {
 namespace Server {
 
-class Event;
 class Engine;
+class Event;
+class ProcessContext;
 
 /** Processor for Events after leaving the audio thread.
  *
diff --git a/src/server/PreProcessor.hpp b/src/server/PreProcessor.hpp
index bcfcb432..fd886139 100644
--- a/src/server/PreProcessor.hpp
+++ b/src/server/PreProcessor.hpp
@@ -19,6 +19,7 @@
 
 #include <glibmm/thread.h>
 
+#include "raul/AtomicPtr.hpp"
 #include "raul/Slave.hpp"
 
 namespace Ingen {
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index c68b0710..f0a14d79 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -20,6 +20,7 @@
 #include "ingen/shared/URIs.hpp"
 #include "raul/log.hpp"
 
+#include "AudioBuffer.hpp"
 #include "Buffer.hpp"
 #include "Context.hpp"