From 20af728fdf07478b5a146370b59f902a70b85a68 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 8 Mar 2019 10:53:07 +0100
Subject: Clean up includes and forward declarations

---
 src/server/internals/BlockDelay.cpp | 18 +++++++++---------
 src/server/internals/Controller.cpp | 17 ++++++++++-------
 src/server/internals/Controller.hpp |  2 ++
 src/server/internals/Note.cpp       | 21 +++++++++++----------
 src/server/internals/Note.hpp       |  2 ++
 src/server/internals/Time.cpp       | 10 ++++++----
 src/server/internals/Trigger.cpp    | 15 +++++++++------
 src/server/internals/Trigger.hpp    |  2 ++
 8 files changed, 51 insertions(+), 36 deletions(-)

(limited to 'src/server/internals')

diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index 5c7ad147..0176c9b1 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -14,23 +14,23 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <climits>
-
-#include <cmath>
-
-#include "ingen/URIs.hpp"
-#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
+#include "internals/BlockDelay.hpp"
 
 #include "Buffer.hpp"
 #include "InputPort.hpp"
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
-#include "RunContext.hpp"
-#include "internals/BlockDelay.hpp"
+
+#include "ingen/Forge.hpp"
+#include "ingen/URIs.hpp"
+#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
 
 namespace ingen {
 namespace server {
+
+class RunContext;
+
 namespace internals {
 
 InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) {
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 4b5735d7..b8738e1e 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -14,13 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cmath>
-
-#include "ingen/URIs.hpp"
-#include "internals/Controller.hpp"
-#include "lv2/atom/util.h"
-#include "lv2/midi/midi.h"
-
 #include "Buffer.hpp"
 #include "Engine.hpp"
 #include "InputPort.hpp"
@@ -30,6 +23,16 @@
 #include "RunContext.hpp"
 #include "util.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/URIs.hpp"
+#include "internals/Controller.hpp"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
+
+#include <cassert>
+#include <cmath>
+#include <initializer_list>
+
 namespace ingen {
 namespace server {
 namespace internals {
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index d138e690..0a62b235 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -19,6 +19,8 @@
 
 #include "InternalBlock.hpp"
 
+#include <cstdint>
+
 namespace ingen {
 namespace server {
 
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 9d39f345..cfc0c157 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -14,23 +14,24 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cmath>
+#include "internals/Note.hpp"
+
+#include "Buffer.hpp"
+#include "InputPort.hpp"
+#include "InternalPlugin.hpp"
+#include "OutputPort.hpp"
+#include "RunContext.hpp"
 
+#include "ingen/Forge.hpp"
 #include "ingen/URIs.hpp"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
 
-#include "Buffer.hpp"
-#include "GraphImpl.hpp"
-#include "InputPort.hpp"
-#include "InternalPlugin.hpp"
-#include "OutputPort.hpp"
-#include "RunContext.hpp"
-#include "ingen_config.h"
-#include "internals/Note.hpp"
-#include "util.hpp"
+#include <cassert>
+#include <cmath>
+#include <utility>
 
 // #define NOTE_DEBUG 1
 
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index fb935179..2911f55b 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -20,6 +20,8 @@
 #include "InternalBlock.hpp"
 #include "types.hpp"
 
+#include <cstdint>
+
 namespace ingen {
 namespace server {
 
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index c35aa02b..3b6f12ba 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -14,9 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/URIs.hpp"
-#include "lv2/atom/util.h"
-#include "lv2/midi/midi.h"
+#include "internals/Time.hpp"
 
 #include "Buffer.hpp"
 #include "Driver.hpp"
@@ -24,9 +22,13 @@
 #include "InternalPlugin.hpp"
 #include "OutputPort.hpp"
 #include "RunContext.hpp"
-#include "internals/Time.hpp"
 #include "util.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/URIs.hpp"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
+
 namespace ingen {
 namespace server {
 namespace internals {
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 793e508d..4ceae3c8 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -14,11 +14,7 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <cmath>
-
-#include "ingen/URIs.hpp"
-#include "lv2/atom/util.h"
-#include "lv2/midi/midi.h"
+#include "internals/Trigger.hpp"
 
 #include "Buffer.hpp"
 #include "Engine.hpp"
@@ -27,9 +23,16 @@
 #include "OutputPort.hpp"
 #include "RunContext.hpp"
 #include "ingen_config.h"
-#include "internals/Trigger.hpp"
 #include "util.hpp"
 
+#include "ingen/Forge.hpp"
+#include "ingen/URIs.hpp"
+#include "lv2/atom/util.h"
+#include "lv2/midi/midi.h"
+
+#include <cassert>
+#include <cmath>
+
 namespace ingen {
 namespace server {
 namespace internals {
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index 98d50f2c..0508b615 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -19,6 +19,8 @@
 
 #include "InternalBlock.hpp"
 
+#include <cstdint>
+
 namespace ingen {
 namespace server {
 
-- 
cgit v1.2.1