1 files changed, 14 insertions, 9 deletions
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index d9b4e7ad..61123c43 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -17,24 +17,29 @@
 #ifndef INGEN_ENGINE_BUFFER_HPP
 #define INGEN_ENGINE_BUFFER_HPP
 
-#include <atomic>
-#include <cassert>
+#include "BufferFactory.hpp"
+#include "BufferRef.hpp"
+#include "PortType.hpp"
+#include "types.hpp"
 
-#include "ingen/types.hpp"
+#include "ingen/Atom.hpp"
+#include "ingen/URIs.hpp"
 #include "ingen/ingen.h"
+#include "ingen/types.hpp"
 #include "lv2/atom/atom.h"
 #include "lv2/urid/urid.h"
-#include "raul/Deletable.hpp"
 
-#include "BufferFactory.hpp"
-#include "PortType.hpp"
-#include "types.hpp"
+#include <atomic>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
 
 namespace ingen {
+
+class Atom;
+
 namespace server {
 
-class BufferFactory;
-class Engine;
 class RunContext;
 
 class INGEN_API Buffer