10 files changed, 114 insertions, 16 deletions
diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index cd9dbf9b..682438cc 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -16,15 +16,20 @@
 
 #include "internals/BlockDelay.hpp"
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
+#include "BufferFactory.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
+#include "PortType.hpp"
 
 #include "ingen/Forge.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
+#include "raul/Symbol.hpp"
 
 #include <memory>
 
diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp
index ed8073c8..2b523e37 100644
--- a/src/server/internals/BlockDelay.hpp
+++ b/src/server/internals/BlockDelay.hpp
@@ -21,13 +21,22 @@
 #include "InternalBlock.hpp"
 #include "types.hpp"
 
+namespace Raul {
+class Symbol;
+} // namespace Raul
+
 namespace ingen {
+
+class URIs;
+
 namespace server {
 
+class BufferFactory;
+class GraphImpl;
 class InputPort;
-class OutputPort;
 class InternalPlugin;
-class BufferFactory;
+class OutputPort;
+class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 22549ae4..12786dac 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -14,20 +14,27 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
-#include "Engine.hpp"
+#include "BufferFactory.hpp"
+#include "BufferRef.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
-#include "PostProcessor.hpp"
+#include "PortType.hpp"
 #include "RunContext.hpp"
-#include "util.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Forge.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
 #include "internals/Controller.hpp"
+#include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
+#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Symbol.hpp"
 
 #include <cassert>
 #include <cmath>
@@ -36,6 +43,9 @@
 
 namespace ingen {
 namespace server {
+
+class GraphImpl;
+
 namespace internals {
 
 InternalPlugin* ControllerNode::internal_plugin(URIs& uris) {
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index bb3c8369..383ce152 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -18,15 +18,26 @@
 #define INGEN_INTERNALS_CONTROLLER_HPP
 
 #include "InternalBlock.hpp"
+#include "types.hpp"
 
 #include <cstdint>
 
+namespace Raul {
+class Symbol;
+} // namespace Raul
+
 namespace ingen {
+
+class URIs;
+
 namespace server {
 
+class BufferFactory;
+class GraphImpl;
 class InputPort;
-class OutputPort;
 class InternalPlugin;
+class OutputPort;
+class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 76dde8af..d2e03a56 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -16,18 +16,26 @@
 
 #include "internals/Note.hpp"
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
+#include "BufferFactory.hpp"
+#include "BufferRef.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
+#include "PortType.hpp"
 #include "RunContext.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Forge.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
+#include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
+#include "raul/Symbol.hpp"
 
 #include <cassert>
 #include <cmath>
@@ -37,6 +45,9 @@
 
 namespace ingen {
 namespace server {
+
+class GraphImpl;
+
 namespace internals {
 
 InternalPlugin* NoteNode::internal_plugin(URIs& uris) {
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index cb41c37c..945ae99c 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -20,17 +20,28 @@
 #include "InternalBlock.hpp"
 #include "types.hpp"
 
+#include "raul/Array.hpp"
 #include "raul/Maid.hpp"
 
 #include <cstdint>
 #include <memory>
 
+namespace Raul {
+class Symbol;
+} // namespace Raul
+
 namespace ingen {
+
+class URIs;
+
 namespace server {
 
+class BufferFactory;
+class GraphImpl;
 class InputPort;
-class OutputPort;
 class InternalPlugin;
+class OutputPort;
+class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index d81ca04d..47f85867 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -16,23 +16,33 @@
 
 #include "internals/Time.hpp"
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
+#include "BufferFactory.hpp"
+#include "BufferRef.hpp"
 #include "Driver.hpp"
 #include "Engine.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
+#include "PortType.hpp"
 #include "RunContext.hpp"
-#include "util.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Forge.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
-#include "lv2/atom/util.h"
-#include "lv2/midi/midi.h"
+#include "lv2/atom/atom.h"
+#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Symbol.hpp"
 
 #include <memory>
 
 namespace ingen {
 namespace server {
+
+class GraphImpl;
+
 namespace internals {
 
 InternalPlugin* TimeNode::internal_plugin(URIs& uris) {
diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp
index 85d5199e..ec0f5528 100644
--- a/src/server/internals/Time.hpp
+++ b/src/server/internals/Time.hpp
@@ -18,13 +18,23 @@
 #define INGEN_INTERNALS_TIME_HPP
 
 #include "InternalBlock.hpp"
+#include "types.hpp"
+
+namespace Raul {
+class Symbol;
+} // namespace Raul
 
 namespace ingen {
+
+class URIs;
+
 namespace server {
 
-class InputPort;
-class OutputPort;
+class BufferFactory;
+class GraphImpl;
 class InternalPlugin;
+class OutputPort;
+class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index cc966eb3..450a7040 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -16,19 +16,26 @@
 
 #include "internals/Trigger.hpp"
 
+#include "BlockImpl.hpp"
 #include "Buffer.hpp"
-#include "Engine.hpp"
+#include "BufferFactory.hpp"
+#include "BufferRef.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
+#include "PortType.hpp"
 #include "RunContext.hpp"
-#include "ingen_config.h"
-#include "util.hpp"
 
+#include "ingen/Atom.hpp"
 #include "ingen/Forge.hpp"
+#include "ingen/URI.hpp"
 #include "ingen/URIs.hpp"
+#include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
+#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
+#include "raul/Symbol.hpp"
 
 #include <cassert>
 #include <cmath>
@@ -36,6 +43,9 @@
 
 namespace ingen {
 namespace server {
+
+class GraphImpl;
+
 namespace internals {
 
 InternalPlugin* TriggerNode::internal_plugin(URIs& uris) {
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index 17671098..ba14db68 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -18,15 +18,26 @@
 #define INGEN_INTERNALS_TRIGGER_HPP
 
 #include "InternalBlock.hpp"
+#include "types.hpp"
 
 #include <cstdint>
 
+namespace Raul {
+class Symbol;
+} // namespace Raul
+
 namespace ingen {
+
+class URIs;
+
 namespace server {
 
+class BufferFactory;
+class GraphImpl;
 class InputPort;
-class OutputPort;
 class InternalPlugin;
+class OutputPort;
+class RunContext;
 
 namespace internals {