diff --git a/include/AutomationPattern.h b/include/AutomationPattern.h
index 1d144d9bd..3c403cd17 100644
--- a/include/AutomationPattern.h
+++ b/include/AutomationPattern.h
@@ -27,6 +27,7 @@
 #ifndef _AUTOMATION_PATTERN_H
 #define _AUTOMATION_PATTERN_H
 
+#include <QtCore/QMap>
 #include <QtCore/QPointer>
 
 #include "track.h"
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
index 1be811d20..3f6e47a82 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -25,14 +25,11 @@
 #ifndef _JOURNALLING_OBJECT_H
 #define _JOURNALLING_OBJECT_H
 
-#include "lmms_basics.h"
-#include "export.h"
-#include "SerializingObject.h"
-
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
 #include <QtCore/QStack>
 
+#include "lmms_basics.h"
+#include "SerializingObject.h"
+
 
 class EXPORT JournallingObject : public SerializingObject
 {
diff --git a/include/MidiPort.h b/include/MidiPort.h
index a5b1aee0e..f1a1a3e83 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -2,7 +2,7 @@
  * MidiPort.h - abstraction of MIDI ports which are part of LMMS's MIDI-
  *              sequencing system
  *
- * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -28,7 +28,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QtCore/QMap>
 
 #include "midi.h"
 #include "AutomatableModel.h"
diff --git a/plugins/vst_base/VstPlugin.h b/plugins/vst_base/VstPlugin.h
index 992e59ff0..705c61511 100644
--- a/plugins/vst_base/VstPlugin.h
+++ b/plugins/vst_base/VstPlugin.h
@@ -25,6 +25,7 @@
 #ifndef _VST_PLUGIN_H
 #define _VST_PLUGIN_H
 
+#include <QtCore/QMap>
 #include <QtCore/QMutex>
 #include <QtCore/QPointer>
 #include <QtCore/QString>