5 files changed, 13 insertions, 8 deletions
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index 2b9c6766..a90979ff 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -20,17 +20,16 @@
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
 
+#include "ClientBroadcaster.hpp"
 #include "CreateNode.hpp"
-#include "PatchImpl.hpp"
-#include "NodeImpl.hpp"
-#include "PluginImpl.hpp"
+#include "Driver.hpp"
 #include "Engine.hpp"
-#include "PatchImpl.hpp"
-#include "NodeFactory.hpp"
-#include "ClientBroadcaster.hpp"
 #include "EngineStore.hpp"
+#include "NodeFactory.hpp"
+#include "NodeImpl.hpp"
+#include "PatchImpl.hpp"
+#include "PluginImpl.hpp"
 #include "PortImpl.hpp"
-#include "Driver.hpp"
 
 namespace Ingen {
 namespace Server {
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 872b79c4..92121fb8 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -14,6 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <utility>
+
 #include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/Array.hpp"
@@ -29,7 +31,6 @@
 #include "Engine.hpp"
 #include "EngineStore.hpp"
 #include "PatchImpl.hpp"
-#include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
 
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 6d3ae31f..9396d1fe 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -14,6 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <list>
+
 #include <glibmm/thread.h>
 
 #include "raul/Maid.hpp"
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 5d447895..842d7cdf 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -15,6 +15,7 @@
 */
 
 #include <string>
+#include <vector>
 
 #include <boost/format.hpp>
 
diff --git a/src/server/events/SetMetadata.hpp b/src/server/events/SetMetadata.hpp
index e1bc0c55..7f5d82b4 100644
--- a/src/server/events/SetMetadata.hpp
+++ b/src/server/events/SetMetadata.hpp
@@ -17,6 +17,8 @@
 #ifndef INGEN_EVENTS_SETMETADATA_HPP
 #define INGEN_EVENTS_SETMETADATA_HPP
 
+#include <string>
+
 #include <glibmm/thread.h>
 
 #include <vector>