8 files changed, 3 insertions, 11 deletions
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 7b18366d..1fb3cf76 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -16,8 +16,6 @@
 
 #include <math.h>
 
-#include <string>
-
 #include "ingen/URIs.hpp"
 #include "internals/Controller.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp
index 31e5f306..4a366b08 100644
--- a/src/server/internals/Controller.hpp
+++ b/src/server/internals/Controller.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_INTERNALS_CONTROLLER_HPP
 #define INGEN_INTERNALS_CONTROLLER_HPP
 
-#include <string>
 #include "NodeImpl.hpp"
 
 namespace Ingen {
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 0ee0e56d..d64f7a8f 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -17,7 +17,6 @@
 #include <limits.h>
 
 #include <cmath>
-#include <string>
 
 #include "ingen/URIs.hpp"
 #include "raul/Array.hpp"
diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp
index 047fa41e..3c512d2c 100644
--- a/src/server/internals/Delay.hpp
+++ b/src/server/internals/Delay.hpp
@@ -17,10 +17,10 @@
 #ifndef INGEN_INTERNALS_DELAY_HPP
 #define INGEN_INTERNALS_DELAY_HPP
 
-#include <string>
 #include <math.h>
-#include "types.hpp"
+
 #include "NodeImpl.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 5f509859..81562f83 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <cmath>
-#include <string>
 
 #include "ingen/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp
index 9cf07a05..6c7d9a13 100644
--- a/src/server/internals/Note.hpp
+++ b/src/server/internals/Note.hpp
@@ -17,9 +17,8 @@
 #ifndef INGEN_INTERNALS_NOTE_HPP
 #define INGEN_INTERNALS_NOTE_HPP
 
-#include <string>
-#include "types.hpp"
 #include "NodeImpl.hpp"
+#include "types.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index f938718f..81361bb8 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <cmath>
-#include <string>
 
 #include "ingen/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp
index f9953718..59badc70 100644
--- a/src/server/internals/Trigger.hpp
+++ b/src/server/internals/Trigger.hpp
@@ -17,7 +17,6 @@
 #ifndef INGEN_INTERNALS_TRIGGER_HPP
 #define INGEN_INTERNALS_TRIGGER_HPP
 
-#include <string>
 #include "NodeImpl.hpp"
 
 namespace Ingen {