diff --git a/CMakeLists.txt b/CMakeLists.txt
index f45f994cf..0bbabeecd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,8 +128,6 @@ ENDIF()
 
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
-CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
 CHECK_INCLUDE_FILES(semaphore.h LMMS_HAVE_SEMAPHORE_H)
 CHECK_INCLUDE_FILES(unistd.h LMMS_HAVE_UNISTD_H)
diff --git a/include/AudioDevice.h b/include/AudioDevice.h
index d635efa09..627ba470c 100644
--- a/include/AudioDevice.h
+++ b/include/AudioDevice.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_DEVICE_H
 #define AUDIO_DEVICE_H
 
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <samplerate.h>
 
 #include "lmms_basics.h"
diff --git a/include/AudioEngine.h b/include/AudioEngine.h
index 51cc05171..9cf010426 100644
--- a/include/AudioEngine.h
+++ b/include/AudioEngine.h
@@ -25,16 +25,15 @@
 #ifndef AUDIO_ENGINE_H
 #define AUDIO_ENGINE_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QVector>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QThread>
+#include <QVector>
+#include <QWaitCondition>
 #include <samplerate.h>
 
 
 #include "lmms_basics.h"
 #include "LocklessList.h"
-#include "Note.h"
 #include "FifoBuffer.h"
 #include "AudioEngineProfiler.h"
 #include "PlayHandle.h"
diff --git a/include/AudioEngineWorkerThread.h b/include/AudioEngineWorkerThread.h
index 546a963b3..f86d41c9a 100644
--- a/include/AudioEngineWorkerThread.h
+++ b/include/AudioEngineWorkerThread.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_ENGINE_WORKER_THREAD_H
 #define AUDIO_ENGINE_WORKER_THREAD_H
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include <atomic>
 
diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h
index cdcd407e1..c21a55c4c 100644
--- a/include/AudioFileDevice.h
+++ b/include/AudioFileDevice.h
@@ -26,7 +26,7 @@
 #ifndef AUDIO_FILE_DEVICE_H
 #define AUDIO_FILE_DEVICE_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "AudioDevice.h"
 #include "OutputSettings.h"
diff --git a/include/AudioJack.h b/include/AudioJack.h
index ca65b0f96..e74ac4782 100644
--- a/include/AudioJack.h
+++ b/include/AudioJack.h
@@ -35,9 +35,7 @@
 #endif
 
 #include <atomic>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QMap>
+#include <QVector>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
diff --git a/include/AudioPort.h b/include/AudioPort.h
index 6c926f948..0f6c931d9 100644
--- a/include/AudioPort.h
+++ b/include/AudioPort.h
@@ -26,9 +26,8 @@
 #define AUDIO_PORT_H
 
 #include <memory>
-#include <QtCore/QString>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QString>
+#include <QMutex>
 
 #include "MemoryManager.h"
 #include "PlayHandle.h"
diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h
index 763703c33..2d78af1c4 100644
--- a/include/AudioPortAudio.h
+++ b/include/AudioPortAudio.h
@@ -25,7 +25,7 @@
 #ifndef AUDIO_PORTAUDIO_H
 #define AUDIO_PORTAUDIO_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmmsconfig.h"
 #include "ComboBoxModel.h"
@@ -48,7 +48,6 @@ public:
 
 #include <portaudio.h>
 
-#include <QtCore/QSemaphore>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h
index 76cb7e1a4..f5d5985c1 100644
--- a/include/AudioSampleRecorder.h
+++ b/include/AudioSampleRecorder.h
@@ -26,8 +26,8 @@
 #ifndef AUDIO_SAMPLE_RECORDER_H
 #define AUDIO_SAMPLE_RECORDER_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QList>
+#include <QPair>
 
 #include "AudioDevice.h"
 
diff --git a/include/AudioSdl.h b/include/AudioSdl.h
index 1e6c03358..307973013 100644
--- a/include/AudioSdl.h
+++ b/include/AudioSdl.h
@@ -30,7 +30,6 @@
 #ifdef LMMS_HAVE_SDL
 
 #ifdef LMMS_HAVE_SDL2
-#include <SDL2/SDL.h>
 #include <SDL2/SDL_audio.h>
 #else
 #include <SDL/SDL.h>
diff --git a/include/AudioSoundIo.h b/include/AudioSoundIo.h
index 171022032..082c4bfdb 100644
--- a/include/AudioSoundIo.h
+++ b/include/AudioSoundIo.h
@@ -25,10 +25,8 @@
 #ifndef AUDIO_SOUNDIO_H
 #define AUDIO_SOUNDIO_H
 
-#include <QtCore/QObject>
 
 #include "lmmsconfig.h"
-#include "ComboBoxModel.h"
 
 #ifdef LMMS_HAVE_SOUNDIO
 
diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h
index 88faeb4be..2f4b31467 100644
--- a/include/AutomatableModel.h
+++ b/include/AutomatableModel.h
@@ -25,8 +25,8 @@
 #ifndef AUTOMATABLE_MODEL_H
 #define AUTOMATABLE_MODEL_H
 
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
+#include <QMap>
+#include <QMutex>
 
 #include "JournallingObject.h"
 #include "Model.h"
diff --git a/include/AutomationClip.h b/include/AutomationClip.h
index 521fc1aac..22af90ed1 100644
--- a/include/AutomationClip.h
+++ b/include/AutomationClip.h
@@ -27,8 +27,8 @@
 #ifndef AUTOMATION_CLIP_H
 #define AUTOMATION_CLIP_H
 
-#include <QtCore/QMap>
-#include <QtCore/QPointer>
+#include <QMap>
+#include <QPointer>
 
 #include "AutomationNode.h"
 #include "Clip.h"
diff --git a/include/AutomationClipView.h b/include/AutomationClipView.h
index 61e028899..641a58699 100644
--- a/include/AutomationClipView.h
+++ b/include/AutomationClipView.h
@@ -27,11 +27,10 @@
 
 #include <QStaticText>
 
-#include "AutomationClip.h"
-#include "Song.h"
-#include "SongEditor.h"
 #include "ClipView.h"
 
+class AutomationClip;
+
 
 class AutomationClipView : public ClipView
 {
diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
index dea531043..c655ffcdf 100644
--- a/include/AutomationEditor.h
+++ b/include/AutomationEditor.h
@@ -26,7 +26,6 @@
 #ifndef AUTOMATION_EDITOR_H
 #define AUTOMATION_EDITOR_H
 
-#include <QVector>
 #include <QWidget>
 
 #include "Editor.h"
@@ -36,13 +35,13 @@
 #include "TimePos.h"
 #include "AutomationClip.h"
 #include "ComboBoxModel.h"
-#include "Knob.h"
 
 class QPainter;
 class QPixmap;
 class QScrollBar;
 
 class ComboBox;
+class Knob;
 class NotePlayHandle;
 class TimeLineWidget;
 
diff --git a/include/AutomationTrackView.h b/include/AutomationTrackView.h
index 148c05b6f..5ed993213 100644
--- a/include/AutomationTrackView.h
+++ b/include/AutomationTrackView.h
@@ -26,9 +26,10 @@
 #ifndef AUTOMATION_TRACK_VIEW_H
 #define AUTOMATION_TRACK_VIEW_H
 
-#include "AutomationTrack.h"
 #include "TrackView.h"
 
+class AutomationTrack;
+
 
 class AutomationTrackView : public TrackView
 {
diff --git a/include/BasicFilters.h b/include/BasicFilters.h
index 180a5c8af..07cdda06b 100644
--- a/include/BasicFilters.h
+++ b/include/BasicFilters.h
@@ -36,7 +36,7 @@
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include "lmms_basics.h"
 #include "lmms_constants.h"
diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h
index 2bc41283b..a5da11663 100644
--- a/include/CPULoadWidget.h
+++ b/include/CPULoadWidget.h
@@ -27,7 +27,7 @@
 #ifndef CPULOAD_WIDGET_H
 #define CPULOAD_WIDGET_H
 
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QPixmap>
 #include <QWidget>
 
diff --git a/include/Clip.h b/include/Clip.h
index 836e7cc9c..7b42fc91b 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -28,7 +28,6 @@
 #include <QColor>
 
 #include "AutomatableModel.h"
-#include "lmms_basics.h"
 
 
 class Track;
diff --git a/include/ClipView.h b/include/ClipView.h
index 149774c0a..b3fd20920 100644
--- a/include/ClipView.h
+++ b/include/ClipView.h
@@ -26,7 +26,7 @@
 #define TRACK_CONTENT_OBJECT_VIEW_H
 
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "ModelView.h"
 #include "Rubberband.h"
@@ -61,6 +61,8 @@ class ClipView : public selectableObject, public ModelView
 	Q_PROPERTY( QSize mouseHotspotKnife MEMBER m_mouseHotspotKnife )
 
 public:
+	const static int BORDER_WIDTH = 2;
+
 	ClipView( Clip * clip, TrackView * tv );
 	virtual ~ClipView();
 
diff --git a/include/Clipboard.h b/include/Clipboard.h
index f78e14321..168134e9d 100644
--- a/include/Clipboard.h
+++ b/include/Clipboard.h
@@ -25,7 +25,7 @@
 #ifndef CLIPBOARD_H
 #define CLIPBOARD_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QDomElement>
 
 class QMimeData;
diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h
index 09ad1238a..a3c2a082b 100644
--- a/include/ComboBoxModel.h
+++ b/include/ComboBoxModel.h
@@ -25,7 +25,6 @@
 #ifndef COMBOBOX_MODEL_H
 #define COMBOBOX_MODEL_H
 
-#include <cassert>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index 8630ef236..e9b2783ab 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -28,11 +28,11 @@
 
 #include "lmmsconfig.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QObject>
+#include <QMap>
+#include <QPair>
+#include <QStringList>
+#include <QVector>
+#include <QObject>
 
 #include "lmms_export.h"
 
diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
index 4c5673c8d..68fd2dc89 100644
--- a/include/ControllerConnection.h
+++ b/include/ControllerConnection.h
@@ -30,8 +30,8 @@
 #ifndef CONTROLLER_CONNECTION_H
 #define CONTROLLER_CONNECTION_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QVector>
 
 #include "Controller.h"
 #include "JournallingObject.h"
diff --git a/include/Controls.h b/include/Controls.h
index 236abbc11..414258368 100644
--- a/include/Controls.h
+++ b/include/Controls.h
@@ -26,7 +26,6 @@
 #define CONTROLS_H
 
 
-#include "Model.h"
 
 // headers only required for covariance
 #include "AutomatableModel.h"
diff --git a/include/DataFile.h b/include/DataFile.h
index 3c1dfd50b..0600e85d4 100644
--- a/include/DataFile.h
+++ b/include/DataFile.h
@@ -32,8 +32,8 @@
 
 #include "lmms_export.h"
 #include "MemoryManager.h"
-#include "ProjectVersion.h"
 
+class ProjectVersion;
 class QTextStream;
 
 class LMMS_EXPORT DataFile : public QDomDocument
diff --git a/include/DummyEffect.h b/include/DummyEffect.h
index 92bfd5bdd..6bb8c873e 100644
--- a/include/DummyEffect.h
+++ b/include/DummyEffect.h
@@ -25,10 +25,14 @@
 #ifndef DUMMY_EFFECT_H
 #define DUMMY_EFFECT_H
 
+#include <QDomElement>
+
 #include "Effect.h"
 #include "EffectControls.h"
 #include "EffectControlDialog.h"
 
+class Knob;
+
 
 class DummyEffectControlDialog : public EffectControlDialog
 {
diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h
index bbc112f96..ebfcfbefe 100644
--- a/include/DummyInstrument.h
+++ b/include/DummyInstrument.h
@@ -30,7 +30,7 @@
 #include "InstrumentView.h"
 #include "Engine.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "AudioEngine.h"
 
diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
index 3e81653dd..19e0ca05f 100644
--- a/include/EffectSelectDialog.h
+++ b/include/EffectSelectDialog.h
@@ -29,7 +29,6 @@
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 
-#include "EffectChain.h"
 #include "Effect.h"
 
 
diff --git a/include/Engine.h b/include/Engine.h
index 32b1ee419..531e24220 100644
--- a/include/Engine.h
+++ b/include/Engine.h
@@ -26,8 +26,8 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QString>
+#include <QObject>
 
 
 #include "lmmsconfig.h"
diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h
index 0f691adb0..42502800e 100644
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -25,7 +25,7 @@
 #ifndef ENVELOPE_AND_LFO_PARAMETERS_H
 #define ENVELOPE_AND_LFO_PARAMETERS_H
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "JournallingObject.h"
 #include "AutomatableModel.h"
diff --git a/include/ExportFilter.h b/include/ExportFilter.h
index 91c1bcc7e..e60faef3a 100644
--- a/include/ExportFilter.h
+++ b/include/ExportFilter.h
@@ -26,7 +26,7 @@
 #ifndef EXPORT_FILTER_H
 #define EXPORT_FILTER_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "TrackContainer.h"
 #include "Plugin.h"
diff --git a/include/FifoBuffer.h b/include/FifoBuffer.h
index e41d5caac..5bbf8b702 100644
--- a/include/FifoBuffer.h
+++ b/include/FifoBuffer.h
@@ -25,7 +25,7 @@
 #ifndef FIFO_BUFFER_H
 #define FIFO_BUFFER_H
 
-#include <QtCore/QSemaphore>
+#include <QSemaphore>
 
 
 template<typename T>
diff --git a/include/FileBrowser.h b/include/FileBrowser.h
index 2e26199fc..d99c619e9 100644
--- a/include/FileBrowser.h
+++ b/include/FileBrowser.h
@@ -27,8 +27,8 @@
 #define FILE_BROWSER_H
 
 #include <QCheckBox>
-#include <QtCore/QDir>
-#include <QtCore/QMutex>
+#include <QDir>
+#include <QMutex>
 #include <QTreeWidget>
 
 
diff --git a/include/GuiApplication.h b/include/GuiApplication.h
index 6c48c5bc6..ee5e83e2b 100644
--- a/include/GuiApplication.h
+++ b/include/GuiApplication.h
@@ -25,7 +25,7 @@
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmms_export.h"
 #include "lmmsconfig.h"
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index ccefd3db2..ef58cce24 100644
--- a/include/ImportFilter.h
+++ b/include/ImportFilter.h
@@ -26,7 +26,7 @@
 #ifndef IMPORT_FILTER_H
 #define IMPORT_FILTER_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "Plugin.h"
 
diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h
index 252c59603..952884829 100644
--- a/include/InstrumentTrack.h
+++ b/include/InstrumentTrack.h
@@ -35,10 +35,8 @@
 #include "MidiPort.h"
 #include "NotePlayHandle.h"
 #include "Piano.h"
-#include "Pitch.h"
 #include "Plugin.h"
 #include "Track.h"
-#include "TrackView.h"
 
 
 class Instrument;
diff --git a/include/InstrumentTrackView.h b/include/InstrumentTrackView.h
index d5e82689d..d863d6c19 100644
--- a/include/InstrumentTrackView.h
+++ b/include/InstrumentTrackView.h
@@ -28,11 +28,11 @@
 #include "TrackView.h"
 
 #include "InstrumentTrack.h"
-#include "MidiCCRackView.h"
 
 
 class InstrumentTrackWindow;
 class Knob;
+class MidiCCRackView;
 class TrackContainerView;
 class TrackLabelButton;
 
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
index f4755994b..9e0322591 100644
--- a/include/JournallingObject.h
+++ b/include/JournallingObject.h
@@ -25,7 +25,7 @@
 #ifndef JOURNALLING_OBJECT_H
 #define JOURNALLING_OBJECT_H
 
-#include <QtCore/QStack>
+#include <QStack>
 
 #include "lmms_basics.h"
 #include "SerializingObject.h"
diff --git a/include/Keymap.h b/include/Keymap.h
index 692860343..08a27c473 100644
--- a/include/Keymap.h
+++ b/include/Keymap.h
@@ -29,7 +29,6 @@
 #include <QObject>
 #include <QString>
 
-#include "Note.h"
 #include "SerializingObject.h"
 
 class Keymap : public QObject, public SerializingObject
diff --git a/include/Knob.h b/include/Knob.h
index 91aa6b478..f27328aa9 100644
--- a/include/Knob.h
+++ b/include/Knob.h
@@ -29,7 +29,7 @@
 #include <memory>
 #include <QPixmap>
 #include <QWidget>
-#include <QtCore/QPoint>
+#include <QPoint>
 #include <QTextDocument>
 
 #include "AutomatableModelView.h"
diff --git a/include/LadspaManager.h b/include/LadspaManager.h
index f9ac76eae..b345578d4 100644
--- a/include/LadspaManager.h
+++ b/include/LadspaManager.h
@@ -30,10 +30,10 @@
 
 #include <ladspa.h>
 
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QMap>
+#include <QPair>
+#include <QString>
+#include <QStringList>
 
 
 #include "lmms_export.h"
diff --git a/include/LcdWidget.h b/include/LcdWidget.h
index 7dc2e2a28..a04e7ae91 100644
--- a/include/LcdWidget.h
+++ b/include/LcdWidget.h
@@ -26,7 +26,7 @@
 #ifndef LCD_WIDGET_H
 #define LCD_WIDGET_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QWidget>
 
 #include "lmms_export.h"
diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h
index 935853054..4f3f4ecbb 100644
--- a/include/LeftRightNav.h
+++ b/include/LeftRightNav.h
@@ -27,7 +27,6 @@
 
 #include "PixmapButton.h"
 
-#include <QLayout>
 
 class LeftRightNav : public QWidget
 {
diff --git a/include/LinkedModelGroupViews.h b/include/LinkedModelGroupViews.h
index 46ba4c3ab..a70480d5c 100644
--- a/include/LinkedModelGroupViews.h
+++ b/include/LinkedModelGroupViews.h
@@ -28,7 +28,6 @@
 
 #include <cstddef>
 #include <memory>
-#include <vector>
 #include <QWidget>
 
 
diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h
index 686f09cba..770518076 100644
--- a/include/LinkedModelGroups.h
+++ b/include/LinkedModelGroups.h
@@ -27,8 +27,6 @@
 
 
 #include <cstddef>
-#include <memory>
-#include <vector>
 
 #include "Model.h"
 
diff --git a/include/LocklessAllocator.h b/include/LocklessAllocator.h
index e7e265680..d7977480e 100644
--- a/include/LocklessAllocator.h
+++ b/include/LocklessAllocator.h
@@ -26,7 +26,7 @@
 #define LOCKLESS_ALLOCATOR_H
 
 #include <atomic>
-#include <stddef.h>
+#include <cstddef>
 
 class LocklessAllocator
 {
diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h
index de90960dc..6b72bec5d 100644
--- a/include/Lv2ControlBase.h
+++ b/include/Lv2ControlBase.h
@@ -30,6 +30,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <lilv/lilv.h>
+#include <memory>
 
 #include "DataFile.h"
 #include "LinkedModelGroups.h"
diff --git a/include/Lv2Features.h b/include/Lv2Features.h
index f036c6d1f..272bb3a4d 100644
--- a/include/Lv2Features.h
+++ b/include/Lv2Features.h
@@ -29,7 +29,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2.h>
 #include <map>
 #include <vector>
 #include "Lv2Manager.h"
diff --git a/include/Lv2Proc.h b/include/Lv2Proc.h
index a80c10e3f..06185a9ac 100644
--- a/include/Lv2Proc.h
+++ b/include/Lv2Proc.h
@@ -31,18 +31,17 @@
 
 #include <lilv/lilv.h>
 #include <memory>
-#include <QObject>
 
 #include "Lv2Basics.h"
 #include "Lv2Features.h"
 #include "Lv2Options.h"
 #include "LinkedModelGroups.h"
-#include "MidiEvent.h"
 #include "Plugin.h"
-#include "PluginIssue.h"
 #include "../src/3rdparty/ringbuffer/include/ringbuffer/ringbuffer.h"
 #include "TimePos.h"
 
+class PluginIssue;
+
 // forward declare port structs/enums
 namespace Lv2Ports
 {
diff --git a/include/Lv2UridCache.h b/include/Lv2UridCache.h
index 1921bdfd7..e50fd4bab 100644
--- a/include/Lv2UridCache.h
+++ b/include/Lv2UridCache.h
@@ -29,7 +29,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <QtGlobal>
 #include <cstdint>
 
 //! Cached URIDs for fast access (for use in real-time code)
diff --git a/include/Lv2ViewBase.h b/include/Lv2ViewBase.h
index 5ccbbb75b..6eafbde88 100644
--- a/include/Lv2ViewBase.h
+++ b/include/Lv2ViewBase.h
@@ -30,8 +30,6 @@
 #ifdef LMMS_HAVE_LV2
 
 
-#include <QString>
-#include <QVector>
 
 #include "LinkedModelGroupViews.h"
 #include "lmms_export.h"
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 3af16e7f5..dab2483e4 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -25,13 +25,12 @@
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTimer>
-#include <QtCore/QList>
+#include <QBasicTimer>
+#include <QTimer>
+#include <QList>
 #include <QMainWindow>
 
 #include "ConfigManager.h"
-#include "SubWindow.h"
 
 class QAction;
 class QDomElement;
@@ -40,6 +39,7 @@ class QMdiArea;
 
 class ConfigManager;
 class PluginView;
+class SubWindow;
 class ToolButton;
 
 
diff --git a/include/Microtuner.h b/include/Microtuner.h
index 93998369c..9ac732817 100644
--- a/include/Microtuner.h
+++ b/include/Microtuner.h
@@ -28,8 +28,6 @@
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
 #include "JournallingObject.h"
-#include "lmms_constants.h"
-#include "Note.h"
 
 class LMMS_EXPORT Microtuner : public Model, public JournallingObject
 {
diff --git a/include/MicrotunerConfig.h b/include/MicrotunerConfig.h
index 00783af4b..58752026c 100644
--- a/include/MicrotunerConfig.h
+++ b/include/MicrotunerConfig.h
@@ -25,17 +25,16 @@
 #ifndef MICROTUNER_CONFIG_H
 #define MICROTUNER_CONFIG_H
 
-#include <QCloseEvent>
-#include <QLineEdit>
-#include <QMainWindow>
-#include <QPlainTextEdit>
+
+#include <QWidget>
 
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
-#include "LcdFloatSpinBox.h"
-#include "LcdSpinBox.h"
 #include "SerializingObject.h"
 
+class QLineEdit;
+class QPlainTextEdit;
+
 class LMMS_EXPORT MicrotunerConfig : public QWidget, public SerializingObject
 {
 	Q_OBJECT
diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h
index 69f9366f1..60bf1e685 100644
--- a/include/MidiAlsaRaw.h
+++ b/include/MidiAlsaRaw.h
@@ -31,7 +31,8 @@
 
 #include <alsa/asoundlib.h>
 
-#include <QtCore/QThread>
+#include <QMap>
+#include <QThread>
 
 #include "MidiClient.h"
 
diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h
index 5db5357d8..bbb3f7242 100644
--- a/include/MidiAlsaSeq.h
+++ b/include/MidiAlsaSeq.h
@@ -30,9 +30,10 @@
 #ifdef LMMS_HAVE_ALSA
 #include <alsa/asoundlib.h>
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QMap>
+#include <QMutex>
+#include <QThread>
+#include <QTimer>
 
 
 #include "MidiClient.h"
diff --git a/include/MidiCCRackView.h b/include/MidiCCRackView.h
index 9d015e4e8..982e06048 100644
--- a/include/MidiCCRackView.h
+++ b/include/MidiCCRackView.h
@@ -3,12 +3,12 @@
 
 #include <QWidget>
 
-#include "GroupBox.h"
-#include "Knob.h"
 #include "Midi.h"
 #include "SerializingObject.h"
 
+class GroupBox;
 class InstrumentTrack;
+class Knob;
 
 class MidiCCRackView : public QWidget, public SerializingObject
 {
diff --git a/include/MidiClient.h b/include/MidiClient.h
index ff441e24f..384a664ce 100644
--- a/include/MidiClient.h
+++ b/include/MidiClient.h
@@ -25,16 +25,16 @@
 #ifndef MIDI_CLIENT_H
 #define MIDI_CLIENT_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QStringList>
+#include <QVector>
 
 
 #include "MidiEvent.h"
-#include "MidiEventProcessor.h"
-#include "TabWidget.h"
 
 
 class MidiPort;
+class QObject;
+class TimePos;
 
 
 // base-class for all MIDI-clients
diff --git a/include/MidiClip.h b/include/MidiClip.h
index 8bf07a9b9..036f2771c 100644
--- a/include/MidiClip.h
+++ b/include/MidiClip.h
@@ -26,11 +26,9 @@
 #ifndef MIDI_CLIP_H
 #define MIDI_CLIP_H
 
-#include <QStaticText>
 
+#include "Clip.h"
 #include "Note.h"
-#include "MidiClipView.h"
-#include "ClipView.h"
 
 
 class InstrumentTrack;
diff --git a/include/MidiClipView.h b/include/MidiClipView.h
index e18b8d2b0..82e552a8c 100644
--- a/include/MidiClipView.h
+++ b/include/MidiClipView.h
@@ -25,7 +25,8 @@
 #ifndef MIDI_CLIP_VIEW_H
 #define MIDI_CLIP_VIEW_H
  
-#include "MidiClip.h"
+#include <QStaticText>
+
 #include "ClipView.h"
 
 class MidiClip;
diff --git a/include/MidiJack.h b/include/MidiJack.h
index 66525c3a9..f12f9cebf 100644
--- a/include/MidiJack.h
+++ b/include/MidiJack.h
@@ -35,15 +35,13 @@
 #include "weak_libjack.h"
 #endif
 
-#include <QtCore/QThread>
-#include <QMutex>
-#include <QtCore/QFile>
+#include <QThread>
 
 #include "MidiClient.h"
-#include "AudioJack.h"
 
 constexpr size_t JACK_MIDI_BUFFER_MAX = 64; /* events */
 
+class AudioJack;
 class QLineEdit;
 
 class MidiJack : public QThread, public MidiClientRaw
diff --git a/include/MidiOss.h b/include/MidiOss.h
index 7e1f179ef..68b970bc5 100644
--- a/include/MidiOss.h
+++ b/include/MidiOss.h
@@ -29,8 +29,8 @@
 
 #ifdef LMMS_HAVE_OSS
 
-#include <QtCore/QThread>
-#include <QtCore/QFile>
+#include <QThread>
+#include <QFile>
 
 #include "MidiClient.h"
 
diff --git a/include/MidiPort.h b/include/MidiPort.h
index d5797a3e6..b057f5d6c 100644
--- a/include/MidiPort.h
+++ b/include/MidiPort.h
@@ -26,9 +26,9 @@
 #ifndef MIDI_PORT_H
 #define MIDI_PORT_H
 
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QMap>
+#include <QString>
+#include <QList>
+#include <QMap>
 
 #include "Midi.h"
 #include "TimePos.h"
diff --git a/include/MidiSetupWidget.h b/include/MidiSetupWidget.h
index d740c0290..fcaa29408 100644
--- a/include/MidiSetupWidget.h
+++ b/include/MidiSetupWidget.h
@@ -25,7 +25,6 @@
 #ifndef MIDISETUPWIDGET_H
 #define MIDISETUPWIDGET_H
 
-#include <QLabel>
 
 #include "TabWidget.h"
 
diff --git a/include/MidiSndio.h b/include/MidiSndio.h
index 14ecfa0e9..2042a16ad 100644
--- a/include/MidiSndio.h
+++ b/include/MidiSndio.h
@@ -30,10 +30,8 @@
 
 #ifdef LMMS_HAVE_SNDIO
 
-#include <QtCore/QThread>
-#include <QtCore/QFile>
+#include <QThread>
 
-#include <sndio.h>
 
 #include "MidiClient.h"
 
diff --git a/include/MixerLine.h b/include/MixerLine.h
index 47c3ccf5e..4f7f7242f 100644
--- a/include/MixerLine.h
+++ b/include/MixerLine.h
@@ -26,18 +26,15 @@
 #ifndef MIXER_LINE_H
 #define MIXER_LINE_H
 
-#include <QColorDialog>
-#include <QGraphicsView>
-#include <QLineEdit>
 #include <QWidget>
 
-#include "ColorChooser.h"
-#include "Knob.h"
-#include "LcdWidget.h"
-#include "SendButtonIndicator.h"
 
 
 
+class QGraphicsView;
+class QLineEdit;
+class Knob;
+class LcdWidget;
 class MixerView;
 class SendButtonIndicator;
 
diff --git a/include/Model.h b/include/Model.h
index b40c21029..623d3a9f9 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -25,8 +25,8 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QString>
+#include <QObject>
 
 #include "lmms_export.h"
 
diff --git a/include/ModelView.h b/include/ModelView.h
index 04229ed0d..7aad9ce7f 100644
--- a/include/ModelView.h
+++ b/include/ModelView.h
@@ -25,7 +25,7 @@
 #ifndef MODEL_VIEW_H
 #define MODEL_VIEW_H
 
-#include <QtCore/QPointer>
+#include <QPointer>
 #include "Model.h"
 
 
diff --git a/include/NStateButton.h b/include/NStateButton.h
index 95d36c253..10cb151ae 100644
--- a/include/NStateButton.h
+++ b/include/NStateButton.h
@@ -27,8 +27,8 @@
 #define NSTATE_BUTTON_H
 
 #include <QPixmap>
-#include <QtCore/QVector>
-#include <QtCore/QPair>
+#include <QVector>
+#include <QPair>
 
 #include "ToolButton.h"
 
diff --git a/include/Note.h b/include/Note.h
index 219884471..31ba6995e 100644
--- a/include/Note.h
+++ b/include/Note.h
@@ -26,7 +26,7 @@
 #ifndef NOTE_H
 #define NOTE_H
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "volume.h"
 #include "panning.h"
diff --git a/include/Oscillator.h b/include/Oscillator.h
index 4b1db9787..da9bea4eb 100644
--- a/include/Oscillator.h
+++ b/include/Oscillator.h
@@ -28,11 +28,7 @@
 
 #include <cassert>
 #include <fftw3.h>
-#include <math.h>
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+#include <cstdlib>
 
 #include "Engine.h"
 #include "lmms_constants.h"
diff --git a/include/PatternClip.h b/include/PatternClip.h
index 84805f296..a6543267b 100644
--- a/include/PatternClip.h
+++ b/include/PatternClip.h
@@ -26,8 +26,7 @@
 #ifndef PATTERN_CLIP_H
 #define PATTERN_CLIP_H
 
-#include "ClipView.h"
-
+#include "Clip.h"
 
 /*! \brief Dummy clip for PatternTracks
  *
diff --git a/include/PatternClipView.h b/include/PatternClipView.h
index c23715a12..9cda17688 100644
--- a/include/PatternClipView.h
+++ b/include/PatternClipView.h
@@ -26,10 +26,13 @@
 #ifndef PATTERN_CLIP_VIEW_H
 #define PATTERN_CLIP_VIEW_H
 
-#include "PatternClip.h"
 
 #include <QStaticText>
 
+#include "ClipView.h"
+
+class PatternClip;
+
 
 class PatternClipView : public ClipView
 {
diff --git a/include/PatternTrack.h b/include/PatternTrack.h
index cf399d86b..c594b4cf5 100644
--- a/include/PatternTrack.h
+++ b/include/PatternTrack.h
@@ -27,9 +27,8 @@
 #define PATTERN_TRACK_H
 
 
-#include <QtCore/QMap>
+#include <QMap>
 
-#include "PatternClipView.h"
 #include "Track.h"
 
 class TrackLabelButton;
diff --git a/include/PatternTrackView.h b/include/PatternTrackView.h
index 3009aa02a..ecc209f04 100644
--- a/include/PatternTrackView.h
+++ b/include/PatternTrackView.h
@@ -26,11 +26,12 @@
 #ifndef PATTERN_TRACK_VIEW_H
 #define PATTERN_TRACK_VIEW_H
 
-#include <QtCore/QObject>
 
-#include "PatternTrack.h"
 #include "TrackView.h"
 
+class PatternTrack;
+class TrackLabelButton;
+
 
 class PatternTrackView : public TrackView
 {
diff --git a/include/PeakController.h b/include/PeakController.h
index df3902ab2..341d4f47a 100644
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -25,7 +25,6 @@
 #ifndef PEAK_CONTROLLER_H
 #define PEAK_CONTROLLER_H
 
-#include "Model.h"
 #include "Controller.h"
 #include "ControllerDialog.h"
 
diff --git a/include/PerfLog.h b/include/PerfLog.h
index f9790113d..5d1efc14c 100644
--- a/include/PerfLog.h
+++ b/include/PerfLog.h
@@ -26,7 +26,7 @@
 #define PERFLOG_H
 
 #include <ctime>
-#include <QtCore/QString>
+#include <QString>
 
 /// \brief CPU time point
 ///
diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index a288b9adc..f00e8a79c 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -29,7 +29,6 @@
 
 #include <QVector>
 #include <QWidget>
-#include <QInputDialog>
 
 #include "Editor.h"
 #include "ComboBoxModel.h"
@@ -37,13 +36,12 @@
 #include "Note.h"
 #include "lmms_basics.h"
 #include "Song.h"
-#include "ToolTip.h"
 #include "StepRecorder.h"
 #include "StepRecorderWidget.h"
-#include "PositionLine.h"
 
 class QPainter;
 class QPixmap;
+class QPushButton;
 class QScrollBar;
 class QString;
 class QMenu;
@@ -52,6 +50,8 @@ class QToolButton;
 class ComboBox;
 class NotePlayHandle;
 class MidiClip;
+class PositionLine;
+class TextFloat;
 class TimeLineWidget;
 
 class PianoRoll : public QWidget
diff --git a/include/PlayHandle.h b/include/PlayHandle.h
index 1ddd632d1..6de358acd 100644
--- a/include/PlayHandle.h
+++ b/include/PlayHandle.h
@@ -25,12 +25,11 @@
 #ifndef PLAY_HANDLE_H
 #define PLAY_HANDLE_H
 
-#include <QtCore/QList>
-#include <QtCore/QMutex>
+#include <QList>
+#include <QMutex>
 
 #include "lmms_export.h"
 
-#include "MemoryManager.h"
 
 #include "ThreadableJob.h"
 #include "lmms_basics.h"
diff --git a/include/Plugin.h b/include/Plugin.h
index fb7e592bd..fb9ebd567 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -25,9 +25,8 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
-#include <QtXml/QDomDocument>
+#include <QStringList>
+#include <QMap>
 
 #include "JournallingObject.h"
 #include "Model.h"
diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h
index fa13f2469..67467edbb 100644
--- a/include/PluginBrowser.h
+++ b/include/PluginBrowser.h
@@ -25,7 +25,6 @@
 #ifndef PLUGIN_BROWSER_H
 #define PLUGIN_BROWSER_H
 
-#include <QtCore/QTimer>
 #include <QPixmap>
 
 #include "SideBarWidget.h"
diff --git a/include/PluginFactory.h b/include/PluginFactory.h
index a1f84f8d1..80627f351 100644
--- a/include/PluginFactory.h
+++ b/include/PluginFactory.h
@@ -28,11 +28,10 @@
 #include <memory>
 #include <string>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QFileInfo>
+#include <QList>
+#include <QString>
+#include <QVector>
 
 #include "lmms_export.h"
 #include "Plugin.h"
diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h
index d19d02d7e..f8b9e642b 100644
--- a/include/ProjectJournal.h
+++ b/include/ProjectJournal.h
@@ -25,8 +25,8 @@
 #ifndef PROJECT_JOURNAL_H
 #define PROJECT_JOURNAL_H
 
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QHash>
+#include <QStack>
 
 #include "lmms_basics.h"
 #include "DataFile.h"
diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h
index fc97a8844..03add4b04 100644
--- a/include/ProjectNotes.h
+++ b/include/ProjectNotes.h
@@ -27,7 +27,6 @@
 #define PROJECT_NOTES_H
 
 #include <QMainWindow>
-#include <QCloseEvent>
 
 #include "SerializingObject.h"
 
diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h
index 94ee9c6ba..d72704ba3 100644
--- a/include/ProjectVersion.h
+++ b/include/ProjectVersion.h
@@ -27,8 +27,8 @@
 #ifndef PROJECT_VERSION_H
 #define PROJECT_VERSION_H
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 
 #include <limits>
 
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index fd3ef5e09..282f2b4d2 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -45,8 +45,8 @@
 #include <process.h>
 #endif
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QSystemSemaphore>
+#include <QtGlobal>
+#include <QSystemSemaphore>
 #endif
 
 
@@ -59,8 +59,8 @@
 #else
 #define USE_QT_SHMEM
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QSharedMemory>
+#include <QtGlobal>
+#include <QSharedMemory>
 
 #if !defined(LMMS_HAVE_SYS_TYPES_H) || defined(LMMS_BUILD_WIN32)
 typedef int32_t key_t;
@@ -69,7 +69,7 @@ typedef int32_t key_t;
 
 
 #ifdef LMMS_HAVE_LOCALE_H
-#include <locale.h>
+#include <clocale>
 #endif
 
 #ifdef LMMS_HAVE_PTHREAD_H
@@ -89,10 +89,10 @@ typedef int32_t key_t;
 
 #else
 #include "lmms_export.h"
-#include <QtCore/QMutex>
-#include <QtCore/QProcess>
-#include <QtCore/QThread>
-#include <QtCore/QString>
+#include <QMutex>
+#include <QProcess>
+#include <QThread>
+#include <QString>
 
 #ifndef SYNC_WITH_SHM_FIFO
 #include <poll.h>
@@ -1012,7 +1012,7 @@ private:
 #ifdef COMPILE_REMOTE_PLUGIN_BASE
 
 #ifndef BUILD_REMOTE_PLUGIN_CLIENT
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #endif
 
 
diff --git a/include/RingBuffer.h b/include/RingBuffer.h
index c7e91bd33..46539c0ea 100644
--- a/include/RingBuffer.h
+++ b/include/RingBuffer.h
@@ -27,9 +27,9 @@
 #ifndef RINGBUFFER_H
 #define RINGBUFFER_H
 
+#include <cmath>
 #include <QObject>
 #include "lmms_basics.h"
-#include "lmms_math.h"
 #include "MemoryManager.h"
 
 /** \brief A basic LMMS ring buffer for single-thread use. For thread and realtime safe alternative see LocklessRingBuffer.
diff --git a/include/Rubberband.h b/include/Rubberband.h
index d1d67d631..21e699d85 100644
--- a/include/Rubberband.h
+++ b/include/Rubberband.h
@@ -28,7 +28,7 @@
 #define RUBBERBAND_H
 
 #include <QRubberBand>
-#include <QtCore/QVector>
+#include <QVector>
 
 
 class selectableObject : public QWidget
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index d1e594b2c..991d9d140 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -27,8 +27,8 @@
 #define SAMPLE_BUFFER_H
 
 #include <memory>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QObject>
+#include <QReadWriteLock>
+#include <QObject>
 
 #include <samplerate.h>
 
diff --git a/include/SampleClip.h b/include/SampleClip.h
index bf9eb6aae..7c4f9cf60 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -25,10 +25,10 @@
 #ifndef SAMPLE_CLIP_H
 #define SAMPLE_CLIP_H
 
-#include "SampleBuffer.h"
-#include "SampleTrack.h"
 #include "Clip.h"
- 
+
+class SampleBuffer;
+
 
 class SampleClip : public Clip
 {
diff --git a/include/SampleClipView.h b/include/SampleClipView.h
index 045e2822d..c18e6ab5a 100644
--- a/include/SampleClipView.h
+++ b/include/SampleClipView.h
@@ -25,11 +25,10 @@
 #ifndef SAMPLE_CLIP_VIEW_H
 #define SAMPLE_CLIP_VIEW_H
 
-#include "SampleClipView.h"
-
-#include "SampleClip.h"
 #include "ClipView.h"
 
+class SampleClip;
+
 class SampleClipView : public ClipView
 {
 	Q_OBJECT
@@ -62,4 +61,4 @@ private:
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h
index 9cb6bb8a7..f5ebb2201 100644
--- a/include/SampleRecordHandle.h
+++ b/include/SampleRecordHandle.h
@@ -26,8 +26,8 @@
 #ifndef SAMPLE_RECORD_HANDLE_H
 #define SAMPLE_RECORD_HANDLE_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QList>
+#include <QPair>
 
 #include "PlayHandle.h"
 #include "TimePos.h"
diff --git a/include/SampleTrack.h b/include/SampleTrack.h
index 54ba92953..5ca5741b8 100644
--- a/include/SampleTrack.h
+++ b/include/SampleTrack.h
@@ -25,13 +25,8 @@
 #ifndef SAMPLE_TRACK_H
 #define SAMPLE_TRACK_H
 
-#include <QLayout>
 
 #include "AudioPort.h"
-#include "FadeButton.h"
-#include "Mixer.h"
-#include "SampleClip.h"
-#include "SampleTrackView.h"
 #include "Track.h"
 
 
diff --git a/include/SampleTrackView.h b/include/SampleTrackView.h
index 13127308c..7d3e550c2 100644
--- a/include/SampleTrackView.h
+++ b/include/SampleTrackView.h
@@ -25,7 +25,6 @@
 #ifndef SAMPLE_TRACK_VIEW_H
 #define SAMPLE_TRACK_VIEW_H
 
-#include "SampleTrack.h"
 
 #include "TrackView.h"
 
diff --git a/include/SampleTrackWindow.h b/include/SampleTrackWindow.h
index c5b3648db..85c175564 100644
--- a/include/SampleTrackWindow.h
+++ b/include/SampleTrackWindow.h
@@ -26,12 +26,19 @@
 #ifndef SAMPLE_TRACK_WINDOW_H
 #define SAMPLE_TRACK_WINDOW_H
 
-#include "MixerLineLcdSpinBox.h"
 
-#include <QLineEdit>
 
-#include "EffectRackView.h"
+#include <QWidget>
+
+#include "ModelView.h"
 #include "SampleTrack.h"
+#include "SerializingObject.h"
+
+class EffectRackView;
+class Knob;
+class MixerLineLcdSpinBox;
+class QLineEdit;
+class SampleTrackView;
  
 
 class SampleTrackWindow : public QWidget, public ModelView, public SerializingObjectHook
@@ -89,4 +96,4 @@ private:
 
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/Scale.h b/include/Scale.h
index 5d3715022..a9321fe40 100644
--- a/include/Scale.h
+++ b/include/Scale.h
@@ -25,7 +25,6 @@
 #ifndef SCALE_H
 #define SCALE_H
 
-#include <cmath>
 #include <cstdint>
 #include <vector>
 #include <QObject>
diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h
index e8181f45d..33d8cac64 100644
--- a/include/SendButtonIndicator.h
+++ b/include/SendButtonIndicator.h
@@ -1,13 +1,10 @@
 #ifndef SENDBUTTONINDICATOR_H
 #define SENDBUTTONINDICATOR_H
 
-#include <QDebug>
 #include <QLabel>
-#include <QPixmap>
 
-#include "MixerLine.h"
-#include "MixerView.h"
 
+class FloatModel;
 class MixerLine;
 class MixerView;
 
diff --git a/include/SerializingObject.h b/include/SerializingObject.h
index fbcda9187..aba8c7b0f 100644
--- a/include/SerializingObject.h
+++ b/include/SerializingObject.h
@@ -25,7 +25,7 @@
 #ifndef SERIALIZING_OBJECT_H
 #define SERIALIZING_OBJECT_H
 
-#include <QtCore/QString>
+#include <QString>
 
 #include "lmms_export.h"
 
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
index 760d86fbc..c0581dffd 100644
--- a/include/SetupDialog.h
+++ b/include/SetupDialog.h
@@ -27,7 +27,7 @@
 #define SETUP_DIALOG_H
 
 #include <QDialog>
-#include <QtCore/QMap>
+#include <QMap>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
diff --git a/include/SideBar.h b/include/SideBar.h
index aab126ae3..7ed52efc3 100644
--- a/include/SideBar.h
+++ b/include/SideBar.h
@@ -25,7 +25,7 @@
 #ifndef SIDE_BAR_H
 #define SIDE_BAR_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QButtonGroup>
 #include <QToolBar>
 
diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h
index 9972daa7c..95c6ab9ed 100644
--- a/include/SideBarWidget.h
+++ b/include/SideBarWidget.h
@@ -28,7 +28,8 @@
 #include <QPixmap>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <QPushButton>
+
+class QPushButton;
 
 
 class SideBarWidget : public QWidget
diff --git a/include/Song.h b/include/Song.h
index d7fcf4720..ae8c697b5 100644
--- a/include/Song.h
+++ b/include/Song.h
@@ -26,25 +26,22 @@
 #define SONG_H
 
 #include <memory>
-#include <utility>
 
-#include <QtCore/QSharedMemory>
-#include <QtCore/QVector>
 #include <QHash>
 #include <QString>
 
 #include "TrackContainer.h"
 #include "AudioEngine.h"
 #include "Controller.h"
-#include "Keymap.h"
 #include "lmms_constants.h"
 #include "MeterModel.h"
-#include "Scale.h"
 #include "VstSyncController.h"
 
 
 class AutomationTrack;
+class Keymap;
 class MidiClip;
+class Scale;
 class TimeLineWidget;
 
 
diff --git a/include/SongEditor.h b/include/SongEditor.h
index 35eae2b7d..db52f7352 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -27,22 +27,20 @@
 #ifndef SONG_EDITOR_H
 #define SONG_EDITOR_H
 
-#include <QVector>
-#include <QLinearGradient>
 
-#include "ActionGroup.h"
 #include "Editor.h"
 #include "TrackContainerView.h"
-#include "PositionLine.h"
 
 class QLabel;
 class QScrollBar;
 
+class ActionGroup;
 class AutomatableSlider;
 class ComboBox;
 class ComboBoxModel;
 class LcdSpinBox;
 class MeterDialog;
+class PositionLine;
 class Song;
 class TextFloat;
 class TimeLineWidget;
diff --git a/include/StepRecorder.h b/include/StepRecorder.h
index 99b008bd1..864faef4b 100644
--- a/include/StepRecorder.h
+++ b/include/StepRecorder.h
@@ -21,16 +21,17 @@
 #ifndef STEP_RECORDER_H
 #define STEP_RECORDER_H
 
+#include <QColor>
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QObject>
-#include <QKeyEvent>
 
 #include "Note.h"
-#include "lmms_basics.h"
-#include "MidiClip.h"
 
+class MidiClip;
 class PianoRoll;
+class QKeyEvent;
+class QMouseEvent;
 class StepRecorderWidget;
 
 class StepRecorder : public QObject
diff --git a/include/StepRecorderWidget.h b/include/StepRecorderWidget.h
index dfaeaed0a..512ab5b35 100644
--- a/include/StepRecorderWidget.h
+++ b/include/StepRecorderWidget.h
@@ -22,12 +22,11 @@
 #ifndef STEP_RECOREDER_WIDGET_H
 #define STEP_RECOREDER_WIDGET_H
 
-#include "lmms_basics.h"
-#include "Note.h"
 
 #include <QWidget>
 #include <QColor>
-#include <QPainter>
+
+#include "TimePos.h"
 
 class StepRecorderWidget : public QWidget
 {
diff --git a/include/SubWindow.h b/include/SubWindow.h
index e2b1a9a37..113db636a 100644
--- a/include/SubWindow.h
+++ b/include/SubWindow.h
@@ -26,16 +26,15 @@
 #ifndef SUBWINDOW_H
 #define SUBWINDOW_H
 
-#include <QEvent>
-#include <QGraphicsDropShadowEffect>
 #include <QMdiSubWindow>
-#include <QLabel>
-#include <QPushButton>
 #include <QString>
 
 #include "lmms_export.h"
 
+class QGraphicsDropShadowEffect;
+class QLabel;
 class QMoveEvent;
+class QPushButton;
 class QResizeEvent;
 class QWidget;
 
diff --git a/include/TabBar.h b/include/TabBar.h
index 48b429bd5..46226618b 100644
--- a/include/TabBar.h
+++ b/include/TabBar.h
@@ -26,8 +26,8 @@
 #ifndef TAB_BAR_H
 #define TAB_BAR_H
 
-#include <QtCore/QMap>
-#include <QLayout>
+#include <QBoxLayout>
+#include <QMap>
 #include <QWidget>
 
 #include "lmms_export.h"
diff --git a/include/TabWidget.h b/include/TabWidget.h
index 4442ef643..d4a3ec3c9 100644
--- a/include/TabWidget.h
+++ b/include/TabWidget.h
@@ -27,7 +27,7 @@
 #define TAB_WIDGET_H
 
 #include <QWidget>
-#include <QtCore/QMap>
+#include <QMap>
 
 const int TEXT_TAB_HEIGHT = 14;
 const int GRAPHIC_TAB_HEIGHT = 17;
diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h
index 12851f6e5..3e9fc9738 100644
--- a/include/TempoSyncKnob.h
+++ b/include/TempoSyncKnob.h
@@ -27,7 +27,7 @@
 #define TEMPO_SYNC_KNOB_H
 
 #include <QPixmap>
-#include <QtCore/QPointer>
+#include <QPointer>
 
 #include "Knob.h"
 #include "TempoSyncKnobModel.h"
diff --git a/include/TimePos.h b/include/TimePos.h
index 675416c42..8b758d9b4 100644
--- a/include/TimePos.h
+++ b/include/TimePos.h
@@ -27,7 +27,6 @@
 #ifndef TIME_POS_H
 #define TIME_POS_H
 
-#include <QtGlobal>
 
 #include "lmms_export.h"
 #include "lmms_basics.h"
diff --git a/include/ToolButton.h b/include/ToolButton.h
index 196ec48f0..2f64d45b8 100644
--- a/include/ToolButton.h
+++ b/include/ToolButton.h
@@ -27,7 +27,6 @@
 #define TOOL_BUTTON_H
 
 #include <QToolButton>
-#include <QColor>
 
 
 class ToolButton : public QToolButton
diff --git a/include/Track.h b/include/Track.h
index 73295459c..d00ac3783 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -26,7 +26,7 @@
 #define TRACK_H
 
 
-#include <QtCore/QVector>
+#include <QVector>
 #include <QColor>
 
 #include "AutomatableModel.h"
diff --git a/include/TrackContainer.h b/include/TrackContainer.h
index a07f9c9ef..18139a0da 100644
--- a/include/TrackContainer.h
+++ b/include/TrackContainer.h
@@ -26,7 +26,7 @@
 #ifndef TRACK_CONTAINER_H
 #define TRACK_CONTAINER_H
 
-#include <QtCore/QReadWriteLock>
+#include <QReadWriteLock>
 
 #include "Track.h"
 #include "JournallingObject.h"
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index f6ad177b9..00267bfe8 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -26,7 +26,7 @@
 #ifndef TRACK_CONTAINER_VIEW_H
 #define TRACK_CONTAINER_VIEW_H
 
-#include <QtCore/QVector>
+#include <QVector>
 #include <QScrollArea>
 #include <QWidget>
 #include <QThread>
@@ -34,13 +34,15 @@
 #include "JournallingObject.h"
 #include "ModelView.h"
 #include "Rubberband.h"
-#include "TrackView.h"
+#include "TimePos.h"
 
 
 class QVBoxLayout;
 
 class InstrumentTrack;
+class Track;
 class TrackContainer;
+class TrackView;
 
 
 class TrackContainerView : public QWidget, public ModelView,
diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h
index 7d9726feb..a46f418e9 100644
--- a/include/TrackLabelButton.h
+++ b/include/TrackLabelButton.h
@@ -27,7 +27,6 @@
 #define TRACK_LABEL_BUTTON_H
 
 #include <QToolButton>
-#include <QLineEdit>
 
 class TrackView;
 
diff --git a/include/TrackView.h b/include/TrackView.h
index eff541308..4467ecbdb 100644
--- a/include/TrackView.h
+++ b/include/TrackView.h
@@ -50,8 +50,6 @@ const int TRACK_OP_WIDTH = 78;
 const int DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT = 96;
 const int TRACK_OP_WIDTH_COMPACT = 62;
 
-const int CLIP_BORDER_WIDTH = 2;
-
 
 class TrackView : public QWidget, public ModelView, public JournallingObject
 {
diff --git a/include/VstSyncController.h b/include/VstSyncController.h
index 33f2ee036..7ed0e4999 100644
--- a/include/VstSyncController.h
+++ b/include/VstSyncController.h
@@ -26,8 +26,8 @@
 #ifndef VST_SYNC_CONTROLLER_H
 #define VST_SYNC_CONTROLLER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QSharedMemory>
+#include <QObject>
+#include <QSharedMemory>
 
 #include "VstSyncData.h"
 
diff --git a/include/base64.h b/include/base64.h
index 688a12ef8..a0557fe0d 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -26,9 +26,9 @@
 #ifndef _BASE64_H
 #define _BASE64_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
-#include <QtCore/QVariant>
+#include <QByteArray>
+#include <QString>
+#include <QVariant>
 
 
 namespace base64
diff --git a/include/embed.h b/include/embed.h
index aa224580e..ea3e3417e 100644
--- a/include/embed.h
+++ b/include/embed.h
@@ -26,7 +26,7 @@
 #define EMBED_H
 
 #include <QPixmap>
-#include <QtCore/QString>
+#include <QString>
 
 #include "lmms_export.h"
 #include "lmms_basics.h"
diff --git a/include/endian_handling.h b/include/endian_handling.h
index 06e9d8244..09953a0ac 100644
--- a/include/endian_handling.h
+++ b/include/endian_handling.h
@@ -25,7 +25,7 @@
 #ifndef ENDIAN_HANDLING_H
 #define ENDIAN_HANDLING_H
 
-#include <QtCore/QSysInfo>
+#include <QSysInfo>
 
 #include "lmms_basics.h"
 
diff --git a/include/interpolation.h b/include/interpolation.h
index c2bc8421d..cb324cd76 100644
--- a/include/interpolation.h
+++ b/include/interpolation.h
@@ -30,7 +30,7 @@
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
+#include <cmath>
 #include "lmms_constants.h"
 #include "lmms_math.h"
 
diff --git a/include/lmms_basics.h b/include/lmms_basics.h
index 46b88eae1..cda591c0d 100644
--- a/include/lmms_basics.h
+++ b/include/lmms_basics.h
@@ -31,10 +31,8 @@
 
 #include "lmmsconfig.h"
 
-#ifdef LMMS_HAVE_STDINT_H
 #include <cstdint>
 #include <array>
-#endif
 
 
 typedef int32_t bar_t;
diff --git a/include/lmms_math.h b/include/lmms_math.h
index a64bbd3d4..aa043170c 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -29,7 +29,7 @@
 #include <cstdint>
 #include "lmms_constants.h"
 #include "lmmsconfig.h"
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 #include <cmath>
 
diff --git a/plugins/Amplifier/Amplifier.h b/plugins/Amplifier/Amplifier.h
index a5e85aa8b..843c25bdb 100644
--- a/plugins/Amplifier/Amplifier.h
+++ b/plugins/Amplifier/Amplifier.h
@@ -29,7 +29,6 @@
 
 #include "Effect.h"
 #include "AmplifierControls.h"
-#include "ValueBuffer.h"
 
 class AmplifierEffect : public Effect
 {
diff --git a/plugins/Amplifier/AmplifierControlDialog.cpp b/plugins/Amplifier/AmplifierControlDialog.cpp
index 53ab6a576..ad2846edb 100644
--- a/plugins/Amplifier/AmplifierControlDialog.cpp
+++ b/plugins/Amplifier/AmplifierControlDialog.cpp
@@ -23,11 +23,11 @@
  *
  */
 
-#include <QLayout>
 
 #include "AmplifierControlDialog.h"
 #include "AmplifierControls.h"
 #include "embed.h"
+#include "Knob.h"
 
 
 
diff --git a/plugins/Amplifier/AmplifierControls.cpp b/plugins/Amplifier/AmplifierControls.cpp
index 43b7545a3..70876be11 100644
--- a/plugins/Amplifier/AmplifierControls.cpp
+++ b/plugins/Amplifier/AmplifierControls.cpp
@@ -28,8 +28,6 @@
 
 #include "AmplifierControls.h"
 #include "Amplifier.h"
-#include "Engine.h"
-#include "Song.h"
 
 
 AmplifierControls::AmplifierControls( AmplifierEffect* effect ) :
diff --git a/plugins/Amplifier/AmplifierControls.h b/plugins/Amplifier/AmplifierControls.h
index 3cf0321c5..f0f950fd1 100644
--- a/plugins/Amplifier/AmplifierControls.h
+++ b/plugins/Amplifier/AmplifierControls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "AmplifierControlDialog.h"
-#include "Knob.h"
 
 
 class AmplifierEffect;
diff --git a/plugins/BassBooster/BassBoosterControlDialog.cpp b/plugins/BassBooster/BassBoosterControlDialog.cpp
index 248860989..f7513e13e 100644
--- a/plugins/BassBooster/BassBoosterControlDialog.cpp
+++ b/plugins/BassBooster/BassBoosterControlDialog.cpp
@@ -22,11 +22,14 @@
  *
  */
 
-#include <QLayout>
+
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "BassBoosterControlDialog.h"
 #include "BassBoosterControls.h"
 #include "embed.h"
+#include "Knob.h"
 
 
 
diff --git a/plugins/BassBooster/BassBoosterControls.h b/plugins/BassBooster/BassBoosterControls.h
index 133c1456c..e7b61348a 100644
--- a/plugins/BassBooster/BassBoosterControls.h
+++ b/plugins/BassBooster/BassBoosterControls.h
@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "BassBoosterControlDialog.h"
-#include "Knob.h"
 
 
 class BassBoosterEffect;
diff --git a/plugins/Bitcrush/Bitcrush.h b/plugins/Bitcrush/Bitcrush.h
index c80ff3bc7..f309021e1 100644
--- a/plugins/Bitcrush/Bitcrush.h
+++ b/plugins/Bitcrush/Bitcrush.h
@@ -29,8 +29,6 @@
 
 #include "Effect.h"
 #include "BitcrushControls.h"
-#include "ValueBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class BitcrushEffect : public Effect
diff --git a/plugins/Bitcrush/BitcrushControlDialog.cpp b/plugins/Bitcrush/BitcrushControlDialog.cpp
index 083a7bedb..9c793fde5 100755
--- a/plugins/Bitcrush/BitcrushControlDialog.cpp
+++ b/plugins/Bitcrush/BitcrushControlDialog.cpp
@@ -24,12 +24,11 @@
  */
 
 
-#include <QLayout>
 #include <QLabel>
 
+#include "embed.h"
 #include "BitcrushControlDialog.h"
 #include "BitcrushControls.h"
-#include "embed.h"
 #include "ToolTip.h"
 #include "LedCheckbox.h"
 #include "Knob.h"
diff --git a/plugins/Bitcrush/BitcrushControls.cpp b/plugins/Bitcrush/BitcrushControls.cpp
index f572b83eb..19886aa75 100644
--- a/plugins/Bitcrush/BitcrushControls.cpp
+++ b/plugins/Bitcrush/BitcrushControls.cpp
@@ -28,7 +28,6 @@
 
 #include "BitcrushControls.h"
 #include "Bitcrush.h"
-#include "lmms_math.h"
 
 
 BitcrushControls::BitcrushControls( BitcrushEffect * eff ) :
diff --git a/plugins/Compressor/Compressor.h b/plugins/Compressor/Compressor.h
index be9cd0662..374f3f8b6 100755
--- a/plugins/Compressor/Compressor.h
+++ b/plugins/Compressor/Compressor.h
@@ -29,8 +29,6 @@
 #include "CompressorControls.h"
 
 #include "Effect.h"
-#include "ValueBuffer.h"
-#include "RmsHelper.h"
 
 
 constexpr float COMP_LOG = -2.2;
diff --git a/plugins/Compressor/CompressorControlDialog.cpp b/plugins/Compressor/CompressorControlDialog.cpp
index 2e8ea835a..2511e3915 100755
--- a/plugins/Compressor/CompressorControlDialog.cpp
+++ b/plugins/Compressor/CompressorControlDialog.cpp
@@ -27,14 +27,17 @@
 #include "CompressorControls.h"
 
 #include <QLabel>
-#include <QLayout>
 #include <QPainter>
+#include <QWheelEvent>
 
+#include "AutomatableButton.h"
 #include "embed.h"
+#include "../Eq/EqFader.h"
 #include "GuiApplication.h"
-#include "gui_templates.h"
 #include "interpolation.h"
+#include "Knob.h"
 #include "MainWindow.h"
+#include "PixmapButton.h"
 #include "ToolTip.h"
 
 CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) :
diff --git a/plugins/Compressor/CompressorControlDialog.h b/plugins/Compressor/CompressorControlDialog.h
index 7eb19c5b9..f20a1d220 100755
--- a/plugins/Compressor/CompressorControlDialog.h
+++ b/plugins/Compressor/CompressorControlDialog.h
@@ -26,17 +26,10 @@
 #define COMPRESSOR_CONTROL_DIALOG_H
 
 #include <QBasicTimer>
-#include <QLabel>
-#include <QMouseEvent>
+#include <QElapsedTimer>
 #include <QPainter>
-#include <QTime>
 
-#include "../Eq/EqFader.h"
 #include "EffectControlDialog.h"
-#include "GuiApplication.h"
-#include "Knob.h"
-#include "MainWindow.h"
-#include "PixmapButton.h"
 
 
 constexpr int COMP_MILLI_PER_PIXEL = 6;
@@ -58,7 +51,12 @@ constexpr float COMP_NOISE_FLOOR = 0.000001;// -120 dbFs
 
 
 
+class automatableButtonGroup;
 class CompressorControls;
+class EqFader;
+class Knob;
+class PixmapButton;
+class QLabel;
 
 class CompressorControlDialog : public EffectControlDialog
 {
diff --git a/plugins/Compressor/CompressorControls.cpp b/plugins/Compressor/CompressorControls.cpp
index 772fb5261..01d44c245 100755
--- a/plugins/Compressor/CompressorControls.cpp
+++ b/plugins/Compressor/CompressorControls.cpp
@@ -28,8 +28,6 @@
 
 #include <QDomElement>
 
-#include "Engine.h"
-#include "Song.h"
 
 
 CompressorControls::CompressorControls(CompressorEffect* effect) :
diff --git a/plugins/Compressor/CompressorControls.h b/plugins/Compressor/CompressorControls.h
index 775a3be89..233b89ddf 100755
--- a/plugins/Compressor/CompressorControls.h
+++ b/plugins/Compressor/CompressorControls.h
@@ -28,7 +28,6 @@
 #include "CompressorControlDialog.h"
 
 #include "EffectControls.h"
-#include "Knob.h"
 
 
 class CompressorEffect;
diff --git a/plugins/CrossoverEQ/CrossoverEQ.h b/plugins/CrossoverEQ/CrossoverEQ.h
index 36d619c3b..d1f76c1e6 100644
--- a/plugins/CrossoverEQ/CrossoverEQ.h
+++ b/plugins/CrossoverEQ/CrossoverEQ.h
@@ -29,8 +29,6 @@
 
 #include "Effect.h"
 #include "CrossoverEQControls.h"
-#include "ValueBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class CrossoverEQEffect : public Effect
diff --git a/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp b/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp
index eec318a93..5ef7423ed 100644
--- a/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp
+++ b/plugins/CrossoverEQ/CrossoverEQControlDialog.cpp
@@ -24,8 +24,6 @@
  *
  */
  
-#include <QLayout>
-#include <QLabel>
 
 #include "CrossoverEQControlDialog.h"
 #include "CrossoverEQControls.h"
diff --git a/plugins/Delay/DelayControls.cpp b/plugins/Delay/DelayControls.cpp
index 35e8f869e..d4b3220a9 100644
--- a/plugins/Delay/DelayControls.cpp
+++ b/plugins/Delay/DelayControls.cpp
@@ -22,12 +22,11 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "DelayControls.h"
 #include "DelayEffect.h"
 #include "Engine.h"
-#include "Song.h"
 
 DelayControls::DelayControls( DelayEffect* effect ):
 	EffectControls( effect ),
diff --git a/plugins/Delay/DelayControls.h b/plugins/Delay/DelayControls.h
index 8c9b2eb1a..c912a453e 100644
--- a/plugins/Delay/DelayControls.h
+++ b/plugins/Delay/DelayControls.h
@@ -26,7 +26,6 @@
 #define DELAYCONTROLS_H
 
 #include "EffectControls.h"
-#include "Knob.h"
 #include "DelayControlsDialog.h"
 
 
diff --git a/plugins/Delay/DelayControlsDialog.cpp b/plugins/Delay/DelayControlsDialog.cpp
index efc8a7169..db59b3f39 100755
--- a/plugins/Delay/DelayControlsDialog.cpp
+++ b/plugins/Delay/DelayControlsDialog.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "AutomatableModel.h"
 #include "DelayControlsDialog.h"
 #include "DelayControls.h"
 #include "embed.h"
diff --git a/plugins/Delay/DelayControlsDialog.h b/plugins/Delay/DelayControlsDialog.h
index 9bd50b4a7..4b2c0af41 100644
--- a/plugins/Delay/DelayControlsDialog.h
+++ b/plugins/Delay/DelayControlsDialog.h
@@ -26,9 +26,9 @@
 #define DELAYCONTROLSDIALOG_H
 
 #include "EffectControlDialog.h"
-#include "AutomatableModel.h"
 
 class DelayControls;
+class FloatModel;
 
 class DelayControlsDialog : public EffectControlDialog
 {
diff --git a/plugins/Delay/DelayEffect.cpp b/plugins/Delay/DelayEffect.cpp
index fc12cb820..1377498b0 100644
--- a/plugins/Delay/DelayEffect.cpp
+++ b/plugins/Delay/DelayEffect.cpp
@@ -25,8 +25,10 @@
 #include "DelayEffect.h"
 #include "Engine.h"
 #include "embed.h"
-#include "interpolation.h"
+#include "Lfo.h"
+#include "lmms_math.h"
 #include "plugin_export.h"
+#include "StereoDelay.h"
 
 extern "C"
 {
diff --git a/plugins/Delay/DelayEffect.h b/plugins/Delay/DelayEffect.h
index 3c89b567a..c409458ed 100644
--- a/plugins/Delay/DelayEffect.h
+++ b/plugins/Delay/DelayEffect.h
@@ -27,9 +27,9 @@
 
 #include "Effect.h"
 #include "DelayControls.h"
-#include "Lfo.h"
-#include "StereoDelay.h"
-#include "ValueBuffer.h"
+
+class Lfo;
+class StereoDelay;
 
 class DelayEffect : public Effect
 {
diff --git a/plugins/Delay/Lfo.cpp b/plugins/Delay/Lfo.cpp
index c12452038..0360263ef 100644
--- a/plugins/Delay/Lfo.cpp
+++ b/plugins/Delay/Lfo.cpp
@@ -23,7 +23,8 @@
  */
 
 #include "Lfo.h"
-#include "lmms_math.h"
+
+#include <cmath>
 
 
 
diff --git a/plugins/Delay/Lfo.h b/plugins/Delay/Lfo.h
index 02d9ed25e..10b7e2fc0 100644
--- a/plugins/Delay/Lfo.h
+++ b/plugins/Delay/Lfo.h
@@ -25,7 +25,8 @@
 #ifndef LFO_H
 #define LFO_H
 
-#include "lmms_math.h"
+#include "lmms_constants.h"
+
 
 class Lfo
 {
diff --git a/plugins/Delay/StereoDelay.cpp b/plugins/Delay/StereoDelay.cpp
index f240b9354..bdbd63404 100644
--- a/plugins/Delay/StereoDelay.cpp
+++ b/plugins/Delay/StereoDelay.cpp
@@ -23,10 +23,7 @@
  */
 
 #include "StereoDelay.h"
-#include <cstdlib>
 #include "lmms_basics.h"
-#include "interpolation.h"
-#include "lmms_math.h"
 
 
 StereoDelay::StereoDelay( int maxTime, int sampleRate )
diff --git a/plugins/DualFilter/DualFilterControlDialog.cpp b/plugins/DualFilter/DualFilterControlDialog.cpp
index 0c7732bc6..653af3e7b 100755
--- a/plugins/DualFilter/DualFilterControlDialog.cpp
+++ b/plugins/DualFilter/DualFilterControlDialog.cpp
@@ -23,11 +23,10 @@
  *
  */
 
-#include <QLayout>
 
 #include "DualFilterControlDialog.h"
 #include "DualFilterControls.h"
-#include "embed.h"
+#include "Knob.h"
 #include "LedCheckbox.h"
 #include "ComboBox.h"
 #include "ToolTip.h"
diff --git a/plugins/DualFilter/DualFilterControls.cpp b/plugins/DualFilter/DualFilterControls.cpp
index 575a62152..7d54c7c78 100644
--- a/plugins/DualFilter/DualFilterControls.cpp
+++ b/plugins/DualFilter/DualFilterControls.cpp
@@ -31,7 +31,6 @@
 #include "DualFilter.h"
 #include "embed.h"
 #include "Engine.h"
-#include "Song.h"
 
 DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
 	EffectControls( effect ),
diff --git a/plugins/DualFilter/DualFilterControls.h b/plugins/DualFilter/DualFilterControls.h
index 4392b8896..9713f657a 100644
--- a/plugins/DualFilter/DualFilterControls.h
+++ b/plugins/DualFilter/DualFilterControls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "DualFilterControlDialog.h"
-#include "Knob.h"
 #include "ComboBoxModel.h"
 
 class DualFilterEffect;
diff --git a/plugins/Eq/EqControls.cpp b/plugins/Eq/EqControls.cpp
index 9c6ecbf76..f33a64675 100644
--- a/plugins/Eq/EqControls.cpp
+++ b/plugins/Eq/EqControls.cpp
@@ -24,7 +24,7 @@
 
 #include "EqControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "EqControlsDialog.h"
 #include "EqEffect.h"
diff --git a/plugins/Eq/EqControlsDialog.cpp b/plugins/Eq/EqControlsDialog.cpp
index 3dfa21715..fae7e8718 100644
--- a/plugins/Eq/EqControlsDialog.cpp
+++ b/plugins/Eq/EqControlsDialog.cpp
@@ -25,15 +25,11 @@
 
 #include "EqControlsDialog.h"
 
-#include <QGraphicsView>
-#include <QLayout>
 #include <QWidget>
 
 #include "AutomatableButton.h"
 #include "embed.h"
-#include "Engine.h"
 #include "Knob.h"
-#include "Fader.h"
 #include "LedCheckbox.h"
 #include "PixmapButton.h"
 
diff --git a/plugins/Eq/EqControlsDialog.h b/plugins/Eq/EqControlsDialog.h
index b28d38687..b79354355 100644
--- a/plugins/Eq/EqControlsDialog.h
+++ b/plugins/Eq/EqControlsDialog.h
@@ -25,8 +25,6 @@
 #ifndef EQCONTROLSDIALOG_H
 #define EQCONTROLSDIALOG_H
 
-#include <QLabel>
-#include <QPushButton>
 
 #include "EffectControlDialog.h"
 
diff --git a/plugins/Eq/EqCurve.cpp b/plugins/Eq/EqCurve.cpp
index b066871fa..be664b774 100644
--- a/plugins/Eq/EqCurve.cpp
+++ b/plugins/Eq/EqCurve.cpp
@@ -23,9 +23,15 @@
  */
 #include "EqCurve.h"
 
-#include "Effect.h"
+#include <cmath>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+
+#include "AudioEngine.h"
 #include "embed.h"
-#include "lmms_math.h"
+#include "Engine.h"
+#include "lmms_constants.h"
+
 
 EqHandle::EqHandle( int num, int x, int y ):
 	m_numb( num ),
diff --git a/plugins/Eq/EqCurve.h b/plugins/Eq/EqCurve.h
index 58dfa2ac9..6bc3f8871 100644
--- a/plugins/Eq/EqCurve.h
+++ b/plugins/Eq/EqCurve.h
@@ -25,11 +25,8 @@
 #ifndef EQCURVE_H
 #define EQCURVE_H
 
-#include <QGraphicsItem>
-#include <QPainter>
-#include <QGraphicsSceneWheelEvent>
-#include "lmms_math.h"
-#include "AutomatableModelView.h"
+#include <QGraphicsObject>
+
 
 
 enum{
diff --git a/plugins/Eq/EqEffect.cpp b/plugins/Eq/EqEffect.cpp
index f871596ec..3b46143e6 100644
--- a/plugins/Eq/EqEffect.cpp
+++ b/plugins/Eq/EqEffect.cpp
@@ -25,8 +25,6 @@
 #include "EqEffect.h"
 
 #include "Engine.h"
-#include "EqFader.h"
-#include "interpolation.h"
 #include "lmms_math.h"
 
 #include "embed.h"
diff --git a/plugins/Eq/EqEffect.h b/plugins/Eq/EqEffect.h
index 614e92146..b94ddef26 100644
--- a/plugins/Eq/EqEffect.h
+++ b/plugins/Eq/EqEffect.h
@@ -24,11 +24,9 @@
 #ifndef EQEFFECT_H
 #define EQEFFECT_H
 
-#include "BasicFilters.h"
 #include "Effect.h"
 #include "EqControls.h"
 #include "EqFilter.h"
-#include "lmms_math.h"
 
 
 
diff --git a/plugins/Eq/EqParameterWidget.cpp b/plugins/Eq/EqParameterWidget.cpp
index be2174a2b..a919f2773 100644
--- a/plugins/Eq/EqParameterWidget.cpp
+++ b/plugins/Eq/EqParameterWidget.cpp
@@ -25,13 +25,18 @@
 
 #include "EqParameterWidget.h"
 
+#include <cmath>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QMouseEvent>
+#include <QPainter>
+#include <QPen>
 #include <QWidget>
 
-#include "EqControls.h"
-#include "lmms_math.h"
+#include "AutomatableModel.h"
+#include "EqCurve.h"
+#include "EqParameterWidget.h"
+#include "lmms_constants.h"
+
 
 
 EqParameterWidget::EqParameterWidget( QWidget *parent, EqControls * controls ) :
diff --git a/plugins/Eq/EqParameterWidget.h b/plugins/Eq/EqParameterWidget.h
index 231256bf0..28d01efbe 100644
--- a/plugins/Eq/EqParameterWidget.h
+++ b/plugins/Eq/EqParameterWidget.h
@@ -29,11 +29,12 @@
 
 #include <QWidget>
 
-#include "EffectControls.h"
-#include "EqCurve.h"
-#include "TextFloat.h"
 
+class BoolModel;
 class EqControls;
+class EqCurve;
+class EqHandle;
+class FloatModel;
 
 class EqBand
 {
diff --git a/plugins/Eq/EqSpectrumView.cpp b/plugins/Eq/EqSpectrumView.cpp
index 27c320dfb..e65a12ea9 100644
--- a/plugins/Eq/EqSpectrumView.cpp
+++ b/plugins/Eq/EqSpectrumView.cpp
@@ -22,11 +22,16 @@
 
 #include "EqSpectrumView.h"
 
+#include <cmath>
+#include <QPainter>
+#include <QPen>
+
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "EqCurve.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "lmms_constants.h"
 
 EqAnalyser::EqAnalyser() :
 	m_framesFilledUp ( 0 ),
diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
index 84feeff13..40a24868d 100644
--- a/plugins/Eq/EqSpectrumView.h
+++ b/plugins/Eq/EqSpectrumView.h
@@ -23,13 +23,11 @@
 #ifndef EQSPECTRUMVIEW_H
 #define EQSPECTRUMVIEW_H
 
-#include <QPainter>
 #include <QPainterPath>
 #include <QWidget>
 
 #include "fft_helpers.h"
 #include "lmms_basics.h"
-#include "lmms_math.h"
 
 
 const int MAX_BANDS = 2048;
diff --git a/plugins/Flanger/FlangerControls.cpp b/plugins/Flanger/FlangerControls.cpp
index 81e9268c7..1b4007b38 100644
--- a/plugins/Flanger/FlangerControls.cpp
+++ b/plugins/Flanger/FlangerControls.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "FlangerControls.h"
 #include "FlangerEffect.h"
diff --git a/plugins/Flanger/FlangerControls.h b/plugins/Flanger/FlangerControls.h
index 8397a69fa..54ef38a1c 100644
--- a/plugins/Flanger/FlangerControls.h
+++ b/plugins/Flanger/FlangerControls.h
@@ -26,7 +26,6 @@
 #define FLANGERCONTROLS_H
 
 #include "EffectControls.h"
-#include "Knob.h"
 #include "FlangerControlsDialog.h"
 
 
diff --git a/plugins/Flanger/FlangerControlsDialog.cpp b/plugins/Flanger/FlangerControlsDialog.cpp
index 8b7fdcf10..b3b49e661 100644
--- a/plugins/Flanger/FlangerControlsDialog.cpp
+++ b/plugins/Flanger/FlangerControlsDialog.cpp
@@ -23,8 +23,9 @@
  */
 
 #include "FlangerControlsDialog.h"
-#include "FlangerControls.h"
+
 #include "embed.h"
+#include "FlangerControls.h"
 #include "LedCheckbox.h"
 #include "TempoSyncKnob.h"
 
diff --git a/plugins/Flanger/FlangerEffect.h b/plugins/Flanger/FlangerEffect.h
index a70e87827..630513ade 100644
--- a/plugins/Flanger/FlangerEffect.h
+++ b/plugins/Flanger/FlangerEffect.h
@@ -28,9 +28,13 @@
 
 #include "Effect.h"
 #include "FlangerControls.h"
-#include "QuadratureLfo.h"
 #include "MonoDelay.h"
 #include "Noise.h"
+#include "QuadratureLfo.h"
+
+class MonoDelay;
+class Noise;
+class QuadratureLfo;
 
 
 class FlangerEffect : public Effect
diff --git a/plugins/Flanger/MonoDelay.cpp b/plugins/Flanger/MonoDelay.cpp
index fc63d57d1..d43e5b99d 100644
--- a/plugins/Flanger/MonoDelay.cpp
+++ b/plugins/Flanger/MonoDelay.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "MonoDelay.h"
-#include "interpolation.h"
-#include "lmms_math.h"
 #include "string.h"
 
 MonoDelay::MonoDelay( int maxTime , int sampleRate )
diff --git a/plugins/FreeBoy/FreeBoy.cpp b/plugins/FreeBoy/FreeBoy.cpp
index f426f5387..976860f6c 100644
--- a/plugins/FreeBoy/FreeBoy.cpp
+++ b/plugins/FreeBoy/FreeBoy.cpp
@@ -25,11 +25,9 @@
 
 #include <cmath>
 
-#include <QPainter>
 #include <QDomElement>
 #include "FreeBoy.h"
 #include "Gb_Apu_Buffer.h"
-#include "Multi_Buffer.h"
 #include "base64.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
diff --git a/plugins/FreeBoy/FreeBoy.h b/plugins/FreeBoy/FreeBoy.h
index 9ceb27966..a6bef0af2 100644
--- a/plugins/FreeBoy/FreeBoy.h
+++ b/plugins/FreeBoy/FreeBoy.h
@@ -26,14 +26,14 @@
 #ifndef FREEBOY_H
 #define FREEBOY_H
 
-#include <QObject>
+#include "AutomatableModel.h"
+#include "Blip_Buffer.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 #include "Graph.h"
-#include "Gb_Apu.h"
 
 class FreeBoyInstrumentView;
+class Knob;
 class NotePlayHandle;
 class PixmapButton;
 
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
index 201eab497..7e13d2351 100644
--- a/plugins/HydrogenImport/HydrogenImport.cpp
+++ b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -1,10 +1,4 @@
 #include <QDomDocument>
-#include <QDir>
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QTextStream>
-#include <stdlib.h>
 
 #include "LocalFileMng.h"
 #include "HydrogenImport.h"
@@ -15,9 +9,7 @@
 #include "Note.h"
 #include "MidiClip.h"
 #include "PatternStore.h"
-#include "PatternTrack.h"
 #include "Track.h"
-#include "Instrument.h"
 
 #include "plugin_export.h"
 
diff --git a/plugins/HydrogenImport/HydrogenImport.h b/plugins/HydrogenImport/HydrogenImport.h
index 9818a1366..d19d1e8dd 100644
--- a/plugins/HydrogenImport/HydrogenImport.h
+++ b/plugins/HydrogenImport/HydrogenImport.h
@@ -2,8 +2,6 @@
 #define _HYDROGEN_IMPORT_H
 
 #include <QString>
-#include <QPair>
-#include <QVector>
 
 #include "ImportFilter.h"
 
diff --git a/plugins/HydrogenImport/local_file_mgr.cpp b/plugins/HydrogenImport/local_file_mgr.cpp
index 78560fef9..3ca6572a9 100644
--- a/plugins/HydrogenImport/local_file_mgr.cpp
+++ b/plugins/HydrogenImport/local_file_mgr.cpp
@@ -1,16 +1,11 @@
-#include <cstdlib>
-#include <cassert>
 #include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
 
-#include <QDir>
-#include <QApplication>
-#include <QVector>
 #include <QDomDocument>
+#include <QFile>
 #include <QLocale>
 #include <QTextCodec>
 
-#include <algorithm>
 #include "LocalFileMng.h"
 
 
diff --git a/plugins/LadspaEffect/LadspaControlDialog.cpp b/plugins/LadspaEffect/LadspaControlDialog.cpp
index 0034dfd6d..134bf1cc1 100644
--- a/plugins/LadspaEffect/LadspaControlDialog.cpp
+++ b/plugins/LadspaEffect/LadspaControlDialog.cpp
@@ -26,10 +26,13 @@
 
 #include <cmath>
 
+#include <QHBoxLayout>
 #include <QGroupBox>
-#include <QLayout>
+#include <QVBoxLayout>
 
-#include "LadspaEffect.h"
+#include "LadspaBase.h"
+#include "LadspaControl.h"
+#include "LadspaControls.h"
 #include "LadspaControlDialog.h"
 #include "LadspaControlView.h"
 #include "LedCheckbox.h"
diff --git a/plugins/LadspaEffect/LadspaControls.cpp b/plugins/LadspaEffect/LadspaControls.cpp
index 028394d30..9399fce03 100644
--- a/plugins/LadspaEffect/LadspaControls.cpp
+++ b/plugins/LadspaEffect/LadspaControls.cpp
@@ -24,6 +24,8 @@
 
 #include <QDomElement>
 
+#include "LadspaBase.h"
+#include "LadspaControl.h"
 #include "LadspaEffect.h"
 
 
diff --git a/plugins/LadspaEffect/LadspaControls.h b/plugins/LadspaEffect/LadspaControls.h
index 013b914d4..0a157009c 100644
--- a/plugins/LadspaEffect/LadspaControls.h
+++ b/plugins/LadspaEffect/LadspaControls.h
@@ -26,10 +26,10 @@
 #define LADSPA_CONTROLS_H
 
 #include "EffectControls.h"
-#include "LadspaControl.h"
 #include "LadspaControlDialog.h"
 
 
+class LadspaControl;
 typedef QVector<LadspaControl *> control_list_t;
 
 class LadspaEffect;
diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp
index 3989a8b85..b2e119af7 100644
--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -24,20 +24,18 @@
  */
 
 
-#include <QtCore/QVarLengthArray>
+#include <QVarLengthArray>
 #include <QMessageBox>
 
 #include "LadspaEffect.h"
 #include "DataFile.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
-#include "ConfigManager.h"
 #include "Ladspa2LMMS.h"
+#include "LadspaBase.h"
 #include "LadspaControl.h"
 #include "LadspaSubPluginFeatures.h"
-#include "EffectChain.h"
 #include "AutomationClip.h"
-#include "ControllerConnection.h"
 #include "MemoryManager.h"
 #include "ValueBuffer.h"
 #include "Song.h"
diff --git a/plugins/LadspaEffect/LadspaEffect.h b/plugins/LadspaEffect/LadspaEffect.h
index e9f8eef7b..a46099f93 100644
--- a/plugins/LadspaEffect/LadspaEffect.h
+++ b/plugins/LadspaEffect/LadspaEffect.h
@@ -29,10 +29,12 @@
 #include <QMutex>
 
 #include "Effect.h"
-#include "LadspaBase.h"
+#include "ladspa.h"
 #include "LadspaControls.h"
+#include "LadspaManager.h"
 
 
+typedef struct PortDescription port_desc_t;
 typedef QVector<port_desc_t *> multi_proc_t;
 
 class LadspaEffect : public Effect
diff --git a/plugins/LadspaEffect/swh/ladspa b/plugins/LadspaEffect/swh/ladspa
index 0c94d096a..d99a0db52 160000
--- a/plugins/LadspaEffect/swh/ladspa
+++ b/plugins/LadspaEffect/swh/ladspa
@@ -1 +1 @@
-Subproject commit 0c94d096a2202c83dcb89b5b66bd6047cb0e98c7
+Subproject commit d99a0db521d13a87bdaa418c674ca8858e484452
diff --git a/plugins/Lv2Effect/Lv2Effect.cpp b/plugins/Lv2Effect/Lv2Effect.cpp
index ddec187bb..3d6a114d1 100644
--- a/plugins/Lv2Effect/Lv2Effect.cpp
+++ b/plugins/Lv2Effect/Lv2Effect.cpp
@@ -24,8 +24,6 @@
 
 #include "Lv2Effect.h"
 
-#include <QDebug>
-#include <lv2.h>
 
 #include "Lv2SubPluginFeatures.h"
 
diff --git a/plugins/Lv2Effect/Lv2FxControlDialog.cpp b/plugins/Lv2Effect/Lv2FxControlDialog.cpp
index 9a77171d6..267923561 100644
--- a/plugins/Lv2Effect/Lv2FxControlDialog.cpp
+++ b/plugins/Lv2Effect/Lv2FxControlDialog.cpp
@@ -24,11 +24,8 @@
 
 #include "Lv2FxControlDialog.h"
 
-#include <QDebug>
 #include <QPushButton>
-#include <lv2.h>
 
-#include "Lv2Effect.h"
 #include "Lv2FxControls.h"
 
 
diff --git a/plugins/Lv2Effect/Lv2FxControls.cpp b/plugins/Lv2Effect/Lv2FxControls.cpp
index 56469d3cc..99d4162d8 100644
--- a/plugins/Lv2Effect/Lv2FxControls.cpp
+++ b/plugins/Lv2Effect/Lv2FxControls.cpp
@@ -29,7 +29,6 @@
 #include "Engine.h"
 #include "Lv2Effect.h"
 #include "Lv2FxControlDialog.h"
-#include "Lv2Proc.h"
 
 
 
diff --git a/plugins/MidiExport/MidiExport.cpp b/plugins/MidiExport/MidiExport.cpp
index 6106b511f..a150b424a 100644
--- a/plugins/MidiExport/MidiExport.cpp
+++ b/plugins/MidiExport/MidiExport.cpp
@@ -24,15 +24,9 @@
  */
 
 
-#include <QDomDocument>
-#include <QDir>
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressDialog>
 
 #include "MidiExport.h"
 
-#include "lmms_math.h"
 #include "TrackContainer.h"
 #include "DataFile.h"
 #include "InstrumentTrack.h"
@@ -271,7 +265,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 
 
 
-void MidiExport::writeMidiClip(MidiNoteVector &midiClip, QDomNode n,
+void MidiExport::writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
 				int base_pitch, double base_volume, int base_time)
 {
 	// TODO interpret steps="12" muted="0" type="1" name="Piano1"  len="2592"
diff --git a/plugins/MidiExport/MidiExport.h b/plugins/MidiExport/MidiExport.h
index e65d5a870..fd73442b5 100644
--- a/plugins/MidiExport/MidiExport.h
+++ b/plugins/MidiExport/MidiExport.h
@@ -31,6 +31,8 @@
 #include "ExportFilter.h"
 #include "MidiFile.hpp"
 
+class QDomNode;
+
 
 const int BUFFER_SIZE = 50*1024;
 typedef MidiFile::MIDITrack<BUFFER_SIZE> MTrack;
@@ -70,7 +72,7 @@ public:
 				int tempo, int masterPitch, const QString &filename);
 	
 private:
-	void writeMidiClip(MidiNoteVector &midiClip, QDomNode n,
+	void writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
 				int base_pitch, double base_volume, int base_time);
 	void writeMidiClipToTrack(MTrack &mtrack, MidiNoteVector &nv);
 	void writePatternClip(MidiNoteVector &src, MidiNoteVector &dst,
diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp
index f63332c0b..a57a425a2 100644
--- a/plugins/MidiImport/MidiImport.cpp
+++ b/plugins/MidiImport/MidiImport.cpp
@@ -23,7 +23,6 @@
  */
 
 
-#include <QDomDocument>
 #include <QDir>
 #include <QApplication>
 #include <QFile>
@@ -47,7 +46,6 @@
 #include "debug.h"
 #include "Song.h"
 
-#include "embed.h"
 #include "plugin_export.h"
 
 #include "portsmf/allegro.h"
diff --git a/plugins/MultitapEcho/MultitapEcho.h b/plugins/MultitapEcho/MultitapEcho.h
index 0735fada0..539ae9475 100644
--- a/plugins/MultitapEcho/MultitapEcho.h
+++ b/plugins/MultitapEcho/MultitapEcho.h
@@ -28,9 +28,7 @@
 
 #include "Effect.h"
 #include "MultitapEchoControls.h"
-#include "ValueBuffer.h"
 #include "RingBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class MultitapEchoEffect : public Effect
diff --git a/plugins/MultitapEcho/MultitapEchoControlDialog.cpp b/plugins/MultitapEcho/MultitapEchoControlDialog.cpp
index 20018ddc5..5894c24d7 100644
--- a/plugins/MultitapEcho/MultitapEchoControlDialog.cpp
+++ b/plugins/MultitapEcho/MultitapEchoControlDialog.cpp
@@ -23,13 +23,11 @@
  *
  */
 
-#include <QLayout>
 
 #include "MultitapEchoControlDialog.h"
 #include "MultitapEchoControls.h"
 #include "embed.h"
 #include "Graph.h"
-#include "PixmapButton.h"
 #include "ToolTip.h"
 #include "LedCheckbox.h"
 #include "Knob.h"
diff --git a/plugins/MultitapEcho/MultitapEchoControls.h b/plugins/MultitapEcho/MultitapEchoControls.h
index cbecb1b3d..4696f46d9 100644
--- a/plugins/MultitapEcho/MultitapEchoControls.h
+++ b/plugins/MultitapEcho/MultitapEchoControls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "MultitapEchoControlDialog.h"
-#include "Knob.h"
 #include "Graph.h"
 
 
diff --git a/plugins/OpulenZ/OpulenZ.cpp b/plugins/OpulenZ/OpulenZ.cpp
index fa3a6bbdd..b09d2c60b 100644
--- a/plugins/OpulenZ/OpulenZ.cpp
+++ b/plugins/OpulenZ/OpulenZ.cpp
@@ -40,12 +40,11 @@
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
 
-#include <QDomDocument>
 #include <QFile>
 #include <QFileInfo>
 #include <QByteArray>
-#include <assert.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #include "opl.h"
 #include "temuopl.h"
@@ -55,7 +54,6 @@
 #include "debug.h"
 
 #include "Knob.h"
-#include "LcdSpinBox.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
 
diff --git a/plugins/OpulenZ/OpulenZ.h b/plugins/OpulenZ/OpulenZ.h
index 1776df93f..7b4868b4f 100644
--- a/plugins/OpulenZ/OpulenZ.h
+++ b/plugins/OpulenZ/OpulenZ.h
@@ -25,13 +25,18 @@
 #ifndef OPULENZ_H
 #define OPULENZ_H
 
+#include <QMutex>
+
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "opl.h"
 
-#include "LcdSpinBox.h"
-#include "Knob.h"
-#include "PixmapButton.h"
+class automatableButtonGroup;
+class Copl;
+class Knob;
+class LcdSpinBox;
+class PixmapButton;
+
 
 // This one is a flag, MIDI notes take 7 low bits
 #define OPL2_VOICE_FREE 128
diff --git a/plugins/ReverbSC/ReverbSC.cpp b/plugins/ReverbSC/ReverbSC.cpp
index da42e65dc..2d56d7f48 100644
--- a/plugins/ReverbSC/ReverbSC.cpp
+++ b/plugins/ReverbSC/ReverbSC.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include <math.h>
+#include <cmath>
 #include "ReverbSC.h"
 
 #include "embed.h"
diff --git a/plugins/ReverbSC/ReverbSC.h b/plugins/ReverbSC/ReverbSC.h
index 0e697c197..3a7a81e8d 100644
--- a/plugins/ReverbSC/ReverbSC.h
+++ b/plugins/ReverbSC/ReverbSC.h
@@ -28,7 +28,6 @@
 
 #include "Effect.h"
 #include "ReverbSCControls.h"
-#include "ValueBuffer.h"
 
 extern "C" {
     #include "base.h"
diff --git a/plugins/ReverbSC/ReverbSCControlDialog.cpp b/plugins/ReverbSC/ReverbSCControlDialog.cpp
index 9c9f3f44a..9c5ae7eab 100644
--- a/plugins/ReverbSC/ReverbSCControlDialog.cpp
+++ b/plugins/ReverbSC/ReverbSCControlDialog.cpp
@@ -22,11 +22,12 @@
  *
  */
 
-#include <QLayout>
 
 #include "ReverbSCControlDialog.h"
-#include "ReverbSCControls.h"
+
 #include "embed.h"
+#include "Knob.h"
+#include "ReverbSCControls.h"
 
 ReverbSCControlDialog::ReverbSCControlDialog( ReverbSCControls* controls ) :
 	EffectControlDialog( controls )
diff --git a/plugins/ReverbSC/ReverbSCControls.cpp b/plugins/ReverbSC/ReverbSCControls.cpp
index 165e784f6..11c99f665 100644
--- a/plugins/ReverbSC/ReverbSCControls.cpp
+++ b/plugins/ReverbSC/ReverbSCControls.cpp
@@ -28,7 +28,6 @@
 #include "ReverbSCControls.h"
 #include "ReverbSC.h"
 #include "Engine.h"
-#include "Song.h"
 
 ReverbSCControls::ReverbSCControls( ReverbSCEffect* effect ) :
 	EffectControls( effect ),
diff --git a/plugins/ReverbSC/ReverbSCControls.h b/plugins/ReverbSC/ReverbSCControls.h
index 36cc16a7e..78423ae8d 100644
--- a/plugins/ReverbSC/ReverbSCControls.h
+++ b/plugins/ReverbSC/ReverbSCControls.h
@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "ReverbSCControlDialog.h"
-#include "Knob.h"
 
 
 class ReverbSCEffect;
diff --git a/plugins/Sid/SidInstrument.cpp b/plugins/Sid/SidInstrument.cpp
index 236b00589..f7156ba4d 100644
--- a/plugins/Sid/SidInstrument.cpp
+++ b/plugins/Sid/SidInstrument.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include <QPainter>
 #include <QDomElement>
 
 #include <cmath>
diff --git a/plugins/Sid/SidInstrument.h b/plugins/Sid/SidInstrument.h
index c0998f026..85fe6d482 100644
--- a/plugins/Sid/SidInstrument.h
+++ b/plugins/Sid/SidInstrument.h
@@ -27,12 +27,12 @@
 #ifndef _SID_H
 #define _SID_H
 
-#include <QObject>
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 
 
+class Knob;
 class SidInstrumentView;
 class NotePlayHandle;
 class automatableButtonGroup;
diff --git a/plugins/SpectrumAnalyzer/Analyzer.h b/plugins/SpectrumAnalyzer/Analyzer.h
index 304777c9a..57a11d30a 100644
--- a/plugins/SpectrumAnalyzer/Analyzer.h
+++ b/plugins/SpectrumAnalyzer/Analyzer.h
@@ -27,7 +27,6 @@
 #ifndef ANALYZER_H
 #define ANALYZER_H
 
-#include <QWaitCondition>
 
 #include "DataprocLauncher.h"
 #include "Effect.h"
diff --git a/plugins/SpectrumAnalyzer/SaControls.cpp b/plugins/SpectrumAnalyzer/SaControls.cpp
index 6be298e27..45490f6b3 100644
--- a/plugins/SpectrumAnalyzer/SaControls.cpp
+++ b/plugins/SpectrumAnalyzer/SaControls.cpp
@@ -24,7 +24,7 @@
 
 #include "SaControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "Analyzer.h"
 #include "SaControlsDialog.h"
diff --git a/plugins/SpectrumAnalyzer/SaControls.h b/plugins/SpectrumAnalyzer/SaControls.h
index ee8a9e001..d75156f74 100644
--- a/plugins/SpectrumAnalyzer/SaControls.h
+++ b/plugins/SpectrumAnalyzer/SaControls.h
@@ -27,7 +27,6 @@
 
 #include "ComboBoxModel.h"
 #include "EffectControls.h"
-#include "lmms_constants.h"
 
 //#define SA_DEBUG 1	// define SA_DEBUG to enable performance measurements
 
diff --git a/plugins/SpectrumAnalyzer/SaControlsDialog.cpp b/plugins/SpectrumAnalyzer/SaControlsDialog.cpp
index ddd1489e8..ddd822bb1 100644
--- a/plugins/SpectrumAnalyzer/SaControlsDialog.cpp
+++ b/plugins/SpectrumAnalyzer/SaControlsDialog.cpp
@@ -32,13 +32,13 @@
 
 #include "ComboBox.h"
 #include "ComboBoxModel.h"
-#include "embed.h"
-#include "Engine.h"
 #include "Knob.h"
 #include "LedCheckbox.h"
 #include "PixmapButton.h"
 #include "SaControls.h"
 #include "SaProcessor.h"
+#include "SaSpectrumView.h"
+#include "SaWaterfallView.h"
 
 
 // The entire GUI layout is built here.
diff --git a/plugins/SpectrumAnalyzer/SaControlsDialog.h b/plugins/SpectrumAnalyzer/SaControlsDialog.h
index e5a35f186..8cbb0ecaa 100644
--- a/plugins/SpectrumAnalyzer/SaControlsDialog.h
+++ b/plugins/SpectrumAnalyzer/SaControlsDialog.h
@@ -26,10 +26,12 @@
 #define SACONTROLSDIALOG_H
 
 #include "EffectControlDialog.h"
-#include "SaControls.h"
-#include "SaSpectrumView.h"
-#include "SaProcessor.h"
-#include "SaWaterfallView.h"
+#include "fft_helpers.h"
+
+class SaControls;
+class SaProcessor;
+class SaSpectrumView;
+class SaWaterfallView;
 
 
 //! Top-level widget holding the configuration GUI and spectrum displays
diff --git a/plugins/SpectrumAnalyzer/SaProcessor.cpp b/plugins/SpectrumAnalyzer/SaProcessor.cpp
index 7a86731cf..843067988 100644
--- a/plugins/SpectrumAnalyzer/SaProcessor.cpp
+++ b/plugins/SpectrumAnalyzer/SaProcessor.cpp
@@ -36,8 +36,10 @@
 #endif
 #include <QMutexLocker>
 
-#include "lmms_math.h"
+#include "fft_helpers.h"
+#include "lmms_constants.h"
 #include "LocklessRingBuffer.h"
+#include "SaControls.h"
 
 
 SaProcessor::SaProcessor(const SaControls *controls) :
diff --git a/plugins/SpectrumAnalyzer/SaProcessor.h b/plugins/SpectrumAnalyzer/SaProcessor.h
index 0c396b3c0..b331a9c09 100644
--- a/plugins/SpectrumAnalyzer/SaProcessor.h
+++ b/plugins/SpectrumAnalyzer/SaProcessor.h
@@ -28,16 +28,21 @@
 #define SAPROCESSOR_H
 
 #include <atomic>
-#include <QColor>
+#include <fftw3.h>
 #include <QMutex>
+#include <QRgb>
 #include <vector>
 
-#include "fft_helpers.h"
-#include "SaControls.h"
+#include "lmms_basics.h"
+
 
 template<class T>
 class LocklessRingBuffer;
 
+class SaControls;
+
+
+
 //! Receives audio data, runs FFT analysis and stores the result.
 class SaProcessor
 {
diff --git a/plugins/SpectrumAnalyzer/SaSpectrumView.cpp b/plugins/SpectrumAnalyzer/SaSpectrumView.cpp
index cf584431d..1feee5cef 100644
--- a/plugins/SpectrumAnalyzer/SaSpectrumView.cpp
+++ b/plugins/SpectrumAnalyzer/SaSpectrumView.cpp
@@ -33,8 +33,10 @@
 #include <QPainter>
 #include <QString>
 
+#include "fft_helpers.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "SaControls.h"
 #include "SaProcessor.h"
 
 #ifdef SA_DEBUG
diff --git a/plugins/SpectrumAnalyzer/SaSpectrumView.h b/plugins/SpectrumAnalyzer/SaSpectrumView.h
index 0894cd383..70606cc34 100644
--- a/plugins/SpectrumAnalyzer/SaSpectrumView.h
+++ b/plugins/SpectrumAnalyzer/SaSpectrumView.h
@@ -27,7 +27,6 @@
 #ifndef SASPECTRUMVIEW_H
 #define SASPECTRUMVIEW_H
 
-#include "SaControls.h"
 
 #include <string>
 #include <utility>
@@ -37,6 +36,7 @@
 
 class QMouseEvent;
 class QPainter;
+class SaControls;
 class SaProcessor;
 
 //! Widget that displays a spectrum curve and frequency / amplitude grid
diff --git a/plugins/SpectrumAnalyzer/SaWaterfallView.cpp b/plugins/SpectrumAnalyzer/SaWaterfallView.cpp
index 510ba835b..36fcbf3bc 100644
--- a/plugins/SpectrumAnalyzer/SaWaterfallView.cpp
+++ b/plugins/SpectrumAnalyzer/SaWaterfallView.cpp
@@ -31,12 +31,12 @@
 #include <QMouseEvent>
 #include <QMutexLocker>
 #include <QPainter>
-#include <QSplitter>
 #include <QString>
 
 #include "EffectControlDialog.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "SaControls.h"
 #include "SaProcessor.h"
 
 
diff --git a/plugins/SpectrumAnalyzer/SaWaterfallView.h b/plugins/SpectrumAnalyzer/SaWaterfallView.h
index bd91d6d16..b2f815203 100644
--- a/plugins/SpectrumAnalyzer/SaWaterfallView.h
+++ b/plugins/SpectrumAnalyzer/SaWaterfallView.h
@@ -26,13 +26,13 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <QPainter>
 #include <QWidget>
 
-#include "SaControls.h"
-#include "SaProcessor.h"
 
+class EffectControlDialog;
 class QMouseEvent;
+class SaControls;
+class SaProcessor;
 
 // Widget that displays a spectrum waterfall (spectrogram) and time labels.
 class SaWaterfallView : public QWidget
diff --git a/plugins/Vectorscope/VecControls.cpp b/plugins/Vectorscope/VecControls.cpp
index 0e7a2d061..ede9c77b2 100644
--- a/plugins/Vectorscope/VecControls.cpp
+++ b/plugins/Vectorscope/VecControls.cpp
@@ -24,7 +24,7 @@
 
 #include "VecControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "VecControlsDialog.h"
 #include "Vectorscope.h"
diff --git a/plugins/Vectorscope/VecControlsDialog.cpp b/plugins/Vectorscope/VecControlsDialog.cpp
index 9916d7756..bf6764c9b 100644
--- a/plugins/Vectorscope/VecControlsDialog.cpp
+++ b/plugins/Vectorscope/VecControlsDialog.cpp
@@ -24,13 +24,11 @@
 
 #include "VecControlsDialog.h"
 
-#include <QGridLayout>
-#include <QLabel>
-#include <QResizeEvent>
-#include <QSizePolicy>
-#include <QWidget>
 
-#include "embed.h"
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+#include "Knob.h"
 #include "LedCheckbox.h"
 #include "VecControls.h"
 #include "Vectorscope.h"
diff --git a/plugins/Vectorscope/VectorView.cpp b/plugins/Vectorscope/VectorView.cpp
index f6db921cc..93a384891 100644
--- a/plugins/Vectorscope/VectorView.cpp
+++ b/plugins/Vectorscope/VectorView.cpp
@@ -31,6 +31,7 @@
 #include "ColorChooser.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "VecControls.h"
 
 
 VectorView::VectorView(VecControls *controls, LocklessRingBuffer<sampleFrame> *inputBuffer, unsigned short displaySize, QWidget *parent) :
diff --git a/plugins/Vectorscope/VectorView.h b/plugins/Vectorscope/VectorView.h
index 066e306a0..8e88847ab 100644
--- a/plugins/Vectorscope/VectorView.h
+++ b/plugins/Vectorscope/VectorView.h
@@ -23,14 +23,11 @@
 #ifndef VECTORVIEW_H
 #define VECTORVIEW_H
 
-#include <QMouseEvent>
-#include <QWheelEvent>
 #include <QWidget>
 
-#include "Knob.h"
-#include "LedCheckbox.h"
 #include "LocklessRingBuffer.h"
-#include "VecControls.h"
+
+class VecControls;
 
 //#define VEC_DEBUG
 
diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp
index d3d722990..df5b18eb9 100644
--- a/plugins/VstEffect/VstEffect.cpp
+++ b/plugins/VstEffect/VstEffect.cpp
@@ -22,13 +22,13 @@
  *
  */
 
-#include <QMessageBox>
 
 #include "VstEffect.h"
 
 #include "GuiApplication.h"
 #include "Song.h"
 #include "TextFloat.h"
+#include "VstPlugin.h"
 #include "VstSubPluginFeatures.h"
 
 #include "embed.h"
diff --git a/plugins/VstEffect/VstEffect.h b/plugins/VstEffect/VstEffect.h
index 95834e862..6b6d72259 100644
--- a/plugins/VstEffect/VstEffect.h
+++ b/plugins/VstEffect/VstEffect.h
@@ -25,11 +25,10 @@
 #ifndef _VST_EFFECT_H
 #define _VST_EFFECT_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
+#include <QMutex>
+#include <QSharedPointer>
 
 #include "Effect.h"
-#include "VstEffectControlDialog.h"
 #include "VstEffectControls.h"
 
 class VstPlugin;
@@ -49,11 +48,6 @@ public:
 		return &m_vstControls;
 	}
 
-	virtual inline QString publicName() const
-	{
-		return m_plugin->name();
-	}
-
 
 private:
 	void openPlugin( const QString & _plugin );
diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
index f160367d0..a675ea1f5 100644
--- a/plugins/VstEffect/VstEffectControlDialog.cpp
+++ b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -23,20 +23,17 @@
  */
 
 #include <QLayout>
-#include <QMdiArea>
 #include <QMenu>
 #include <QPushButton>
 
 #include "VstEffectControlDialog.h"
 #include "VstEffect.h"
+#include "VstPlugin.h"
 
-#include "ConfigManager.h"
 #include "PixmapButton.h"
 #include "embed.h"
 #include "ToolTip.h"
 
-#include <QObject>
-#include <QPainter>
 #include "gui_templates.h"
 #include <QToolBar>
 #include <QLabel>
diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h
index 930f514c9..dad68ae04 100644
--- a/plugins/VstEffect/VstEffectControlDialog.h
+++ b/plugins/VstEffect/VstEffectControlDialog.h
@@ -26,16 +26,14 @@
 #define _VST_EFFECT_CONTROL_DIALOG_H
 
 #include "EffectControlDialog.h"
-#include "VstPlugin.h"
 
-#include <QObject>
-#include <QPainter>
-#include <QLabel>
 #include <QSharedPointer>
 
 
 class VstEffectControls;
+class VstPlugin;
 class PixmapButton;
+class QLabel;
 class QPixmap;
 class QPushButton;
 class PixmapButton;
diff --git a/plugins/VstEffect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp
index 68181e2a0..bbfff5f64 100644
--- a/plugins/VstEffect/VstEffectControls.cpp
+++ b/plugins/VstEffect/VstEffectControls.cpp
@@ -22,15 +22,24 @@
  *
  */
 
+#include <QAction>
 #include <QDomElement>
+#include <QGridLayout>
+#include <QMenu>
+#include <QPushButton>
+#include <QScrollArea>
 
+#include "embed.h"
+#include "CustomTextKnob.h"
 #include "VstEffectControls.h"
+#include "VstEffectControlDialog.h"
 #include "VstEffect.h"
+#include "VstPlugin.h"
 
 #include "LocaleHelper.h"
 #include "MainWindow.h"
 #include "GuiApplication.h"
-#include <QMdiArea>
+#include "SubWindow.h"
 #include <QApplication>
 
 
diff --git a/plugins/VstEffect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h
index cb98d0f43..2592f1291 100644
--- a/plugins/VstEffect/VstEffectControls.h
+++ b/plugins/VstEffect/VstEffectControls.h
@@ -26,20 +26,17 @@
 #define _VST_EFFECT_CONTROLS_H
 
 #include "EffectControls.h"
-#include "VstEffectControlDialog.h"
 
-#include <QMenu>
-#include "embed.h"
-#include <QPushButton>
 
-#include <QMdiSubWindow>
-#include <QScrollArea>
-#include "CustomTextKnob.h"
-#include <QLayout>
-#include <QPainter>
 #include <QObject>
 
 
+class CustomTextKnob;
+class QGridLayout;
+class QPaintEvent;
+class QPushButton;
+class QMdiSubWindow;
+class QScrollArea;
 class VstEffect;
 
 
diff --git a/plugins/VstEffect/VstSubPluginFeatures.h b/plugins/VstEffect/VstSubPluginFeatures.h
index 00629d66d..1c6d9cc2a 100644
--- a/plugins/VstEffect/VstSubPluginFeatures.h
+++ b/plugins/VstEffect/VstSubPluginFeatures.h
@@ -27,7 +27,9 @@
 #ifndef _VST_SUBPLUGIN_FEATURES_H
 #define _VST_SUBPLUGIN_FEATURES_H
 
+
 #include "Effect.h"
+#include "Plugin.h"
 
 
 class VstSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures
diff --git a/plugins/Xpressive/ExprSynth.cpp b/plugins/Xpressive/ExprSynth.cpp
index 7d1cf13b6..ceb79138e 100644
--- a/plugins/Xpressive/ExprSynth.cpp
+++ b/plugins/Xpressive/ExprSynth.cpp
@@ -27,11 +27,9 @@
 
 #include <string>
 #include <vector>
-#include <math.h>
-#include <cstdlib>
+#include <cmath>
 #include <random>
 
-#include "Xpressive.h"
 
 #include "interpolation.h"
 #include "lmms_math.h"
diff --git a/plugins/Xpressive/ExprSynth.h b/plugins/Xpressive/ExprSynth.h
index bb25fd036..1246058ca 100644
--- a/plugins/Xpressive/ExprSynth.h
+++ b/plugins/Xpressive/ExprSynth.h
@@ -30,11 +30,15 @@
 #include <limits>
 #include "AutomatableModel.h"
 #include "Graph.h"
-#include "Instrument.h"
 #include "MemoryManager.h"
 
-
+class automatableButtonGroup;
 class ExprFrontData;
+class Knob;
+class LedCheckBox;
+class NotePlayHandle;
+class PixmapButton;
+
 
 class ExprFront
 {
diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp
index 51b00de87..99bd7fa52 100644
--- a/plugins/Xpressive/Xpressive.cpp
+++ b/plugins/Xpressive/Xpressive.cpp
@@ -25,6 +25,7 @@
 #include "Xpressive.h"
 
 #include <QDomElement>
+#include <QPlainTextEdit>
 
 #include "AudioEngine.h"
 #include "Engine.h"
@@ -35,10 +36,8 @@
 #include "LedCheckbox.h"
 #include "MainWindow.h"
 #include "NotePlayHandle.h"
-#include "Oscillator.h"
 #include "PixmapButton.h"
 #include "Song.h"
-#include "SubWindow.h"
 #include "ToolTip.h"
 
 #include "base64.h"
diff --git a/plugins/Xpressive/Xpressive.h b/plugins/Xpressive/Xpressive.h
index 5abee2691..651660cfe 100644
--- a/plugins/Xpressive/Xpressive.h
+++ b/plugins/Xpressive/Xpressive.h
@@ -26,14 +26,12 @@
 #ifndef XPRESSIVE_H
 #define XPRESSIVE_H
 
-#include <QPlainTextEdit>
+
+#include <QTextEdit>
 
 #include "Graph.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
-#include "LedCheckbox.h"
-#include "PixmapButton.h"
 
 #include "ExprSynth.h"
 
@@ -50,6 +48,7 @@ const int	NUM_EXPRS = 5;
 
 class ExprFront;
 class SubWindow;
+class QPlainTextEdit;
 
 
 
diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index 65d2cd669..e7cf2495d 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -25,22 +25,21 @@
 #include "audio_file_processor.h"
 
 #include <QPainter>
-#include <QBitmap>
-#include <QDomDocument>
 #include <QFileInfo>
 #include <QDropEvent>
 
 #include <samplerate.h>
 
 #include "AudioEngine.h"
+#include "ComboBox.h"
 #include "ConfigManager.h"
 #include "DataFile.h"
 #include "Engine.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
-#include "interpolation.h"
 #include "NotePlayHandle.h"
 #include "PathUtil.h"
+#include "PixmapButton.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "ToolTip.h"
diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h
index 0df7eeaf1..c16c3f977 100644
--- a/plugins/audio_file_processor/audio_file_processor.h
+++ b/plugins/audio_file_processor/audio_file_processor.h
@@ -29,13 +29,15 @@
 
 #include <QPixmap>
 
+#include "ComboBoxModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "SampleBuffer.h"
 #include "Knob.h"
-#include "PixmapButton.h"
-#include "AutomatableButton.h"
-#include "ComboBox.h"
+
+class automatableButtonGroup;
+class ComboBox;
+class PixmapButton;
 
 
 class audioFileProcessor : public Instrument
diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp
index a79276f30..11d9c852a 100644
--- a/plugins/bit_invader/bit_invader.cpp
+++ b/plugins/bit_invader/bit_invader.cpp
@@ -34,7 +34,6 @@
 #include "Knob.h"
 #include "LedCheckbox.h"
 #include "NotePlayHandle.h"
-#include "Oscillator.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
 #include "Song.h"
diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h
index ae9c92cb2..bb9d16ad4 100644
--- a/plugins/bit_invader/bit_invader.h
+++ b/plugins/bit_invader/bit_invader.h
@@ -27,16 +27,17 @@
 #ifndef BIT_INVADER_H
 #define BIT_INVADER_H
 
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "Graph.h"
-#include "Knob.h"
-#include "PixmapButton.h"
-#include "LedCheckbox.h"
 #include "MemoryManager.h"
 
 class oscillator;
 class bitInvaderView;
+class Knob;
+class LedCheckBox;
+class PixmapButton;
 
 class bSynth
 {
diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp
index 01cbb8454..1f23977e8 100644
--- a/plugins/carlabase/carla.cpp
+++ b/plugins/carlabase/carla.cpp
@@ -26,22 +26,23 @@
 
 #include "AudioEngine.h"
 #include "Engine.h"
-#include "Song.h"
 #include "GuiApplication.h"
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
+#include "Knob.h"
 #include "MidiEventToByteSeq.h"
 #include "MainWindow.h"
-#include "Song.h"
 #include "gui_templates.h"
+#include "Song.h"
 
 #include <QApplication>
 #include <QComboBox>
+#include <QCompleter>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMdiArea>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSizePolicy>
@@ -49,6 +50,7 @@
 #include <QSplitter>
 #include <QString>
 #include <QStringList>
+#include <QStringListModel>
 #include <QTimerEvent>
 #include <QVBoxLayout>
 
diff --git a/plugins/carlabase/carla.h b/plugins/carlabase/carla.h
index 6de8e3379..da36147a3 100644
--- a/plugins/carlabase/carla.h
+++ b/plugins/carlabase/carla.h
@@ -31,12 +31,8 @@
 
 // qt
 #include <QCloseEvent>
-#include <QCompleter>
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QScrollArea>
-#include <QStringListModel>
-#include <QtCore/QMutex>
+#include <QDomElement>
+#include <QMutex>
 
 // carla/source/includes
 #include "carlabase_export.h"
@@ -54,16 +50,22 @@
 #endif
 
 // lmms/include/
-#include "EffectControls.h"
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 #include "SubWindow.h"
 
 class QPushButton;
 class QComboBox;
+class QCompleter;
+class QGridLayout;
+class QHBoxLayout;
+class QLineEdit;
+class QStringListModel;
+class QScrollArea;
 
 class CarlaParamsView;
+class Knob;
 
 class CarlaParamFloatModel : public FloatModel
 {
diff --git a/plugins/dynamics_processor/dynamics_processor.cpp b/plugins/dynamics_processor/dynamics_processor.cpp
index 0dae64504..c1918e86c 100644
--- a/plugins/dynamics_processor/dynamics_processor.cpp
+++ b/plugins/dynamics_processor/dynamics_processor.cpp
@@ -27,6 +27,7 @@
 #include "dynamics_processor.h"
 #include "lmms_math.h"
 #include "interpolation.h"
+#include "RmsHelper.h"
 
 #include "embed.h"
 #include "plugin_export.h"
diff --git a/plugins/dynamics_processor/dynamics_processor.h b/plugins/dynamics_processor/dynamics_processor.h
index 3edf98cfc..695af679b 100644
--- a/plugins/dynamics_processor/dynamics_processor.h
+++ b/plugins/dynamics_processor/dynamics_processor.h
@@ -29,7 +29,8 @@
 
 #include "Effect.h"
 #include "dynamics_processor_controls.h"
-#include "RmsHelper.h"
+
+class RmsHelper;
 
 
 class dynProcEffect : public Effect
diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
index 00d92f944..989555d79 100644
--- a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
+++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
@@ -24,15 +24,14 @@
  */
 
 
-#include <QLayout>
 
 #include "dynamics_processor_control_dialog.h"
 #include "dynamics_processor_controls.h"
 #include "embed.h"
 #include "Graph.h"
+#include "Knob.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
-#include "LedCheckbox.h"
 
 
 dynProcControlDialog::dynProcControlDialog(
diff --git a/plugins/dynamics_processor/dynamics_processor_controls.h b/plugins/dynamics_processor/dynamics_processor_controls.h
index 8682531d1..df292d690 100644
--- a/plugins/dynamics_processor/dynamics_processor_controls.h
+++ b/plugins/dynamics_processor/dynamics_processor_controls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "dynamics_processor_control_dialog.h"
-#include "Knob.h"
 #include "Graph.h"
 
 class dynProcEffect;
diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp
index 1867f6f3b..22c4f5550 100644
--- a/plugins/kicker/kicker.cpp
+++ b/plugins/kicker/kicker.cpp
@@ -24,16 +24,18 @@
  */
 
 
-#include <QDomDocument>
-#include <QPainter>
+
+#include <QDomElement>
 
 #include "kicker.h"
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "LedCheckbox.h"
 #include "NotePlayHandle.h"
 #include "KickerOsc.h"
+#include "TempoSyncKnob.h"
 
 #include "embed.h"
 #include "plugin_export.h"
diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h
index 22b2b854f..348b84e75 100644
--- a/plugins/kicker/kicker.h
+++ b/plugins/kicker/kicker.h
@@ -27,12 +27,14 @@
 #ifndef KICKER_H
 #define KICKER_H
 
-#include <QObject>
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
-#include "LedCheckbox.h"
-#include "TempoSyncKnob.h"
+#include "TempoSyncKnobModel.h"
+
+class Knob;
+class LedCheckBox;
+
 
 
 #define KICKER_PRESET_VERSION 1
diff --git a/plugins/ladspa_browser/ladspa_port_dialog.cpp b/plugins/ladspa_browser/ladspa_port_dialog.cpp
index f1301f744..5eb3a3947 100644
--- a/plugins/ladspa_browser/ladspa_port_dialog.cpp
+++ b/plugins/ladspa_browser/ladspa_port_dialog.cpp
@@ -25,8 +25,8 @@
 
 #include "ladspa_port_dialog.h"
 
-#include <QLayout>
 #include <QTableWidget>
+#include <QVBoxLayout>
 
 #include "AudioEngine.h"
 #include "embed.h"
diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp
index 2385073b2..f06b83b13 100644
--- a/plugins/lb302/lb302.cpp
+++ b/plugins/lb302/lb302.cpp
@@ -30,7 +30,7 @@
 
 // Need to include this first to ensure we get M_PI in MinGW with C++11
 #define _USE_MATH_DEFINES
-#include <math.h>
+#include <cmath>
 
 #include "lb302.h"
 #include "AutomatableButton.h"
@@ -38,6 +38,7 @@
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
+#include "LedCheckbox.h"
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"
@@ -64,10 +65,6 @@
 
 #define LB_DEBUG
 
-#ifdef LB_DEBUG
-#include <assert.h>
-#endif
-
 //
 // Old config
 //
diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h
index 557d958d4..62b357377 100644
--- a/plugins/lb302/lb302.h
+++ b/plugins/lb302/lb302.h
@@ -35,14 +35,15 @@
 #include "DspEffectLibrary.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "LedCheckbox.h"
-#include "Knob.h"
 #include "NotePlayHandle.h"
 #include <QMutex>
 
 static const int NUM_FILTERS = 2;
 
+class automatableButtonGroup;
+class Knob;
 class lb302SynthView;
+class LedCheckBox;
 class NotePlayHandle;
 
 class lb302FilterKnobState
diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
index 39f5fa66e..90ce43c8c 100644
--- a/plugins/monstro/Monstro.cpp
+++ b/plugins/monstro/Monstro.cpp
@@ -26,11 +26,12 @@
 #include <QDomElement>
 
 #include "Monstro.h"
+
+#include "ComboBox.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "gui_templates.h"
 #include "ToolTip.h"
-#include "Song.h"
 #include "lmms_math.h"
 #include "interpolation.h"
 
diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h
index c8acde3f0..c535fc92c 100644
--- a/plugins/monstro/Monstro.h
+++ b/plugins/monstro/Monstro.h
@@ -28,18 +28,18 @@
 
 #include <vector>
 
+#include "ComboBoxModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "AutomatableModel.h"
-#include "AutomatableButton.h"
 #include "TempoSyncKnob.h"
-#include "NotePlayHandle.h"
 #include "PixmapButton.h"
-#include "ComboBox.h"
 #include "Oscillator.h"
 #include "lmms_math.h"
 #include "BandLimitedWave.h"
 
+class ComboBox;
+
 //
 //	UI Macros
 //
diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp
index 637fbfcd3..fb18a8fe0 100644
--- a/plugins/nes/Nes.cpp
+++ b/plugins/nes/Nes.cpp
@@ -25,14 +25,14 @@
 #include <QDomElement>
 
 #include "Nes.h"
+
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
-#include "ToolTip.h"
-#include "Song.h"
-#include "lmms_math.h"
 #include "interpolation.h"
+#include "Knob.h"
 #include "Oscillator.h"
+#include "ToolTip.h"
 
 #include "embed.h"
 #include "plugin_export.h"
diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h
index 1646bae31..9d4ca5357 100644
--- a/plugins/nes/Nes.h
+++ b/plugins/nes/Nes.h
@@ -30,9 +30,6 @@
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "AutomatableModel.h"
-#include "AutomatableButton.h"
-#include "TempoSyncKnob.h"
-#include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include "MemoryManager.h"
 
@@ -79,6 +76,7 @@ const float NES_MIXING_ALL = 1.0 / ( NES_MIXING_12 + NES_MIXING_34 ); // constan
 const int MIN_WLEN = 4;
 
 
+class Knob;
 class NesInstrument;
 
 class NesObject
diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
index 1dbc06b85..44cf98fe1 100644
--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -27,7 +27,6 @@
 
 
 #include <QDomElement>
-#include <QPainter>
 
 
 #include "Engine.h"
@@ -37,7 +36,6 @@
 #include "NotePlayHandle.h"
 #include "Oscillator.h"
 #include "PixmapButton.h"
-#include "ToolTip.h"
 
 #include "embed.h"
 
diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h
index c0bc29f16..519a86548 100644
--- a/plugins/organic/organic.h
+++ b/plugins/organic/organic.h
@@ -30,13 +30,13 @@
 
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Oscillator.h"
 #include "AutomatableModel.h"
 
 class QPixmap;
 
 class Knob;
 class NotePlayHandle;
+class Oscillator;
 class PixmapButton;
 
 const int NUM_OSCILLATORS = 8;
diff --git a/plugins/peak_controller_effect/peak_controller_effect.cpp b/plugins/peak_controller_effect/peak_controller_effect.cpp
index 6db4fba5c..419411f64 100644
--- a/plugins/peak_controller_effect/peak_controller_effect.cpp
+++ b/plugins/peak_controller_effect/peak_controller_effect.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include "Controller.h"
 #include "Song.h"
 #include "PresetPreviewPlayHandle.h"
 #include "PeakController.h"
diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
index 88538b813..6650a8d99 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
+++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
@@ -25,8 +25,9 @@
 
 
 
-#include <QLayout>
-#include <QLabel>
+
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "peak_controller_effect_control_dialog.h"
 #include "peak_controller_effect_controls.h"
diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
index ff87d0d99..e77597b2c 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
+++ b/plugins/peak_controller_effect/peak_controller_effect_controls.cpp
@@ -26,7 +26,6 @@
 
 #include <QDomElement>
 
-#include "PeakController.h"
 #include "peak_controller_effect_controls.h"
 #include "peak_controller_effect.h"
 #include "Song.h"
diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.h b/plugins/peak_controller_effect/peak_controller_effect_controls.h
index fe90eddca..0b1154db7 100644
--- a/plugins/peak_controller_effect/peak_controller_effect_controls.h
+++ b/plugins/peak_controller_effect/peak_controller_effect_controls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "peak_controller_effect_control_dialog.h"
-#include "Knob.h"
 
 class PeakControllerEffect;
 
diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp
index 9586e7408..1cfcc868c 100644
--- a/plugins/sf2_player/patches_dialog.cpp
+++ b/plugins/sf2_player/patches_dialog.cpp
@@ -25,8 +25,12 @@
 
 #include "patches_dialog.h"
 
+#include <fluidsynth.h>
 #include <QHeaderView>
 //#include <QFileInfo>
+#include <QLabel>
+
+#include "fluidsynthshims.h"
 
 
 // Custom list-view item (as for numerical sort purposes...)
diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h
index 76387e830..d2d1d94fe 100644
--- a/plugins/sf2_player/patches_dialog.h
+++ b/plugins/sf2_player/patches_dialog.h
@@ -26,12 +26,13 @@
 #ifndef _PATCHES_DIALOG_H
 #define _PATCHES_DIALOG_H
 
+#include <fluidsynth/types.h>
+
 #include "ui_patches_dialog.h"
 #include "LcdSpinBox.h"
 
-#include "fluidsynthshims.h"
-#include <QWidget>
-#include <QLabel>
+class QLabel;
+
 
 //----------------------------------------------------------------------------
 // qsynthPresetForm -- UI wrapper form.
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 2f42fc230..b180e66b6 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -25,23 +25,23 @@
 
 #include "sf2_player.h"
 
+#include <fluidsynth.h>
 #include <QDebug>
-#include <QLayout>
+#include <QDomElement>
 #include <QLabel>
-#include <QDomDocument>
 
 #include "AudioEngine.h"
 #include "ConfigManager.h"
 #include "FileDialog.h"
-#include "ConfigManager.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "InstrumentPlayHandle.h"
 #include "Knob.h"
 #include "NotePlayHandle.h"
 #include "PathUtil.h"
-#include "SampleBuffer.h"
+#include "PixmapButton.h"
 #include "Song.h"
+#include "fluidsynthshims.h"
 
 #include "patches_dialog.h"
 #include "ToolTip.h"
diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h
index afd7bfecd..853839b9f 100644
--- a/plugins/sf2_player/sf2_player.h
+++ b/plugins/sf2_player/sf2_player.h
@@ -27,21 +27,20 @@
 #ifndef SF2_PLAYER_H
 #define SF2_PLAYER_H
 
+#include <fluidsynth/types.h>
 #include <QMutex>
 #include <samplerate.h>
 
 #include "Instrument.h"
-#include "PixmapButton.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 #include "LcdSpinBox.h"
-#include "LedCheckbox.h"
-#include "fluidsynthshims.h"
 #include "MemoryManager.h"
 
 class sf2InstrumentView;
 class sf2Font;
+class Knob;
 class NotePlayHandle;
+class PixmapButton;
 
 class patchesDialog;
 class QLabel;
diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp
index bfdd22b55..c96daccb5 100644
--- a/plugins/sfxr/sfxr.cpp
+++ b/plugins/sfxr/sfxr.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <cstdlib>
-#include <time.h>
+#include <ctime>
 
 #define rnd(n) (rand()%(n+1))
 
@@ -44,11 +44,9 @@ float frnd(float range)
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
-#include "lmms_constants.h"
 #include "NotePlayHandle.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
-#include "Song.h"
 #include "MidiEvent.h"
 
 #include "embed.h"
diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h
index 20ae54c96..d7b599c40 100644
--- a/plugins/sfxr/sfxr.h
+++ b/plugins/sfxr/sfxr.h
@@ -28,12 +28,9 @@
 #ifndef SFXR_H
 #define SFXR_H
 
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
-#include "Graph.h"
-#include "PixmapButton.h"
-#include "LedCheckbox.h"
 #include "MemoryManager.h"
 
 
@@ -64,6 +61,9 @@ const int KNOB_BLOCK_SIZE_Y = 40;
 
 
 
+class automatableButtonGroup;
+class Knob;
+class PixmapButton;
 class sfxrInstrument;
 
 
diff --git a/plugins/stereo_enhancer/stereo_enhancer.h b/plugins/stereo_enhancer/stereo_enhancer.h
index c13af958e..b5fb406ed 100644
--- a/plugins/stereo_enhancer/stereo_enhancer.h
+++ b/plugins/stereo_enhancer/stereo_enhancer.h
@@ -28,7 +28,6 @@
 
 #include "Effect.h"
 #include "DspEffectLibrary.h"
-#include "Engine.h"
 #include "stereoenhancer_controls.h"
 
 class stereoEnhancerEffect : public Effect
diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
index 47523f05f..52f471c5c 100644
--- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
+++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
@@ -24,9 +24,12 @@
 
 
 
-#include <QLayout>
 
 #include "stereoenhancer_control_dialog.h"
+
+#include <QHBoxLayout>
+
+#include "Knob.h"
 #include "stereoenhancer_controls.h"
 
 
diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.h b/plugins/stereo_enhancer/stereoenhancer_controls.h
index 458d6e860..ad4da3e90 100644
--- a/plugins/stereo_enhancer/stereoenhancer_controls.h
+++ b/plugins/stereo_enhancer/stereoenhancer_controls.h
@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "stereoenhancer_control_dialog.h"
-#include "Knob.h"
 
 class stereoEnhancerEffect;
 
diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp
index 79a366048..d82f06e04 100644
--- a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp
+++ b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp
@@ -24,12 +24,12 @@
 
 
 
-#include <QLayout>
-#include <QLabel>
 
 #include "stereomatrix_control_dialog.h"
-#include "stereomatrix_controls.h"
+
 #include "embed.h"
+#include "Knob.h"
+#include "stereomatrix_controls.h"
 
 
 
diff --git a/plugins/stereo_matrix/stereomatrix_controls.h b/plugins/stereo_matrix/stereomatrix_controls.h
index 4f886cae7..211e1da1d 100644
--- a/plugins/stereo_matrix/stereomatrix_controls.h
+++ b/plugins/stereo_matrix/stereomatrix_controls.h
@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "stereomatrix_control_dialog.h"
-#include "Knob.h"
 
 class stereoMatrixEffect;
 
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index a175b385d..1b5aef420 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -27,6 +27,7 @@
 #include "mallets.h"
 
 #include <QDir>
+#include <QDomElement>
 #include <QMessageBox>
 
 #include "BandedWG.h"
diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp
index a39da6cb5..29f5fbce5 100644
--- a/plugins/triple_oscillator/TripleOscillator.cpp
+++ b/plugins/triple_oscillator/TripleOscillator.cpp
@@ -23,9 +23,8 @@
  */
  
 
-#include <QDomDocument>
-#include <QBitmap>
-#include <QPainter>
+
+#include <QDomElement>
 
 #include "TripleOscillator.h"
 #include "AudioEngine.h"
@@ -35,6 +34,7 @@
 #include "InstrumentTrack.h"
 #include "Knob.h"
 #include "NotePlayHandle.h"
+#include "Oscillator.h"
 #include "PixmapButton.h"
 #include "SampleBuffer.h"
 #include "ToolTip.h"
diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h
index 6c8487463..944834417 100644
--- a/plugins/triple_oscillator/TripleOscillator.h
+++ b/plugins/triple_oscillator/TripleOscillator.h
@@ -28,13 +28,13 @@
 
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Oscillator.h"
 #include "AutomatableModel.h"
 
 
 class automatableButtonGroup;
 class Knob;
 class NotePlayHandle;
+class Oscillator;
 class PixmapButton;
 class SampleBuffer;
 
diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
index 97af8bc43..5771a474f 100644
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 #include "VstPlugin.h"
 
@@ -31,18 +31,18 @@
 #include <memory>
 
 #include <QDropEvent>
-#include <QMessageBox>
+#include <QGridLayout>
 #include <QPainter>
 #include <QPushButton>
+#include <QScrollArea>
 #include <QMdiArea>
 #include <QMenu>
 #include <QDomElement>
 
-#include <string>
 
 #include "AudioEngine.h"
-#include "BufferManager.h"
 #include "ConfigManager.h"
+#include "CustomTextKnob.h"
 #include "Engine.h"
 #include "FileDialog.h"
 #include "GuiApplication.h"
@@ -53,9 +53,9 @@
 #include "MainWindow.h"
 #include "PathUtil.h"
 #include "PixmapButton.h"
-#include "SampleBuffer.h"
 #include "Song.h"
 #include "StringPairDrag.h"
+#include "SubWindow.h"
 #include "TextFloat.h"
 #include "ToolTip.h"
 #include "Clipboard.h"
diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h
index 60c75cd9d..9f2e6b02d 100644
--- a/plugins/vestige/vestige.h
+++ b/plugins/vestige/vestige.h
@@ -27,20 +27,20 @@
 #define _VESTIGE_H
 
 
+#include <QMdiSubWindow>
 #include <QMutex>
-#include <QLayout>
-#include <QScrollArea>
 
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "CustomTextKnob.h"
-#include "SubWindow.h"
-#include "AutomatableModel.h"
 
 
 class QPixmap;
 class QPushButton;
+class QScrollArea;
 
+class CustomTextKnob;
+class FloatModel;
+class QGridLayout;
 class PixmapButton;
 class VstPlugin;
 
diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp
index 222f232ee..1016613f7 100644
--- a/plugins/vibed/nine_button_selector.cpp
+++ b/plugins/vibed/nine_button_selector.cpp
@@ -27,7 +27,7 @@
 #include "nine_button_selector.h"
 
 #include "CaptionMenu.h"
-#include "embed.h"
+#include "PixmapButton.h"
 
 
 nineButtonSelector::nineButtonSelector(	QPixmap _button0_on,
diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h
index dd68a8261..7897e1f52 100644
--- a/plugins/vibed/nine_button_selector.h
+++ b/plugins/vibed/nine_button_selector.h
@@ -25,7 +25,14 @@
 #ifndef _NINE_BUTTON_SELECTOR_H
 #define _NINE_BUTTON_SELECTOR_H
 
-#include "PixmapButton.h"
+
+#include <QWidget>
+
+#include "AutomatableModelView.h"
+
+class Knob;	
+class PixmapButton;
+class graphModel;
 
 
 class nineButtonSelector: public QWidget , public IntModelView
diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp
index 8e582158f..5f6b5ff95 100644
--- a/plugins/vibed/vibed.cpp
+++ b/plugins/vibed/vibed.cpp
@@ -22,18 +22,21 @@
  *
  */
 
-#include <QDomDocument>
-#include <QMap>
+
+#include <QDomElement>
 
 #include "vibed.h"
 #include "AudioEngine.h"
 #include "Engine.h"
+#include "Graph.h"
 #include "InstrumentTrack.h"
+#include "Knob.h"
+#include "LedCheckbox.h"
 #include "NotePlayHandle.h"
+#include "PixmapButton.h"
 #include "ToolTip.h"
 #include "base64.h"
 #include "CaptionMenu.h"
-#include "Oscillator.h"
 #include "string_container.h"
 #include "volume.h"
 #include "Song.h"
diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h
index b1c33f4b7..e3dfd7601 100644
--- a/plugins/vibed/vibed.h
+++ b/plugins/vibed/vibed.h
@@ -26,14 +26,12 @@
 
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Graph.h"
-#include "Knob.h"
-#include "PixmapButton.h"
-#include "LedCheckbox.h"
 #include "nine_button_selector.h"
 
-class vibedView;
+class Graph;
+class LedCheckBox;
 class NotePlayHandle;
+class vibedView;
 
 class vibed : public Instrument
 {
diff --git a/plugins/vibed/vibrating_string.cpp b/plugins/vibed/vibrating_string.cpp
index aee2d2527..77c9fda87 100644
--- a/plugins/vibed/vibrating_string.cpp
+++ b/plugins/vibed/vibrating_string.cpp
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301 USA.
  *
  */
-#include <math.h>
+#include <cmath>
 
 #include "vibrating_string.h"
 #include "interpolation.h"
diff --git a/plugins/vibed/vibrating_string.h b/plugins/vibed/vibrating_string.h
index 3739d19a9..1bb8720ea 100644
--- a/plugins/vibed/vibrating_string.h
+++ b/plugins/vibed/vibrating_string.h
@@ -24,7 +24,6 @@
 #ifndef _VIBRATING_STRING_H
 #define _VIBRATING_STRING_H
 
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "lmms_basics.h"
diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp
index c949147eb..ee5704d4b 100644
--- a/plugins/vst_base/RemoteVstPlugin.cpp
+++ b/plugins/vst_base/RemoteVstPlugin.cpp
@@ -102,8 +102,8 @@ struct ERect
 #endif
 
 #ifndef USE_QT_SHMEM
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 2b14fc936..06770a096 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -26,15 +26,13 @@
 
 #include "communication.h"
 
-#include <QtCore/QtEndian>
-#include <QtCore/QDebug>
+#include <QtEndian>
+#include <QDebug>
 #include <QDir>
+#include <QDomElement>
 #include <QFileInfo>
 #include <QLocale>
 #include <QTemporaryFile>
-#include <QCloseEvent>
-#include <QMdiArea>
-#include <QMdiSubWindow>
 
 #ifdef LMMS_BUILD_LINUX
 #	include <QX11Info>
@@ -43,7 +41,6 @@
 
 #include <QWindow>
 
-#include <QDomDocument>
 
 #ifdef LMMS_BUILD_WIN32
 #	include <windows.h>
diff --git a/plugins/vst_base/VstPlugin.h b/plugins/vst_base/VstPlugin.h
index e05031256..2317cf3ad 100644
--- a/plugins/vst_base/VstPlugin.h
+++ b/plugins/vst_base/VstPlugin.h
@@ -26,11 +26,10 @@
 #define _VST_PLUGIN_H
 
 #include <QMap>
-#include <QMutex>
 #include <QPointer>
+#include <QSize>
 #include <QString>
 #include <QTimer>
-#include <QWidget>
 
 #include "JournallingObject.h"
 #include "RemotePlugin.h"
diff --git a/plugins/vst_base/vst_base.cpp b/plugins/vst_base/vst_base.cpp
index 2d7333dd3..67217390a 100644
--- a/plugins/vst_base/vst_base.cpp
+++ b/plugins/vst_base/vst_base.cpp
@@ -25,7 +25,6 @@
 
 
 #include "Plugin.h"
-#include "embed.h"
 #include "vstbase_export.h"
 
 extern "C"
diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp
index d8b6f80f4..01b74e52c 100644
--- a/plugins/watsyn/Watsyn.cpp
+++ b/plugins/watsyn/Watsyn.cpp
@@ -29,6 +29,7 @@
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "InstrumentTrack.h"
+#include "PixmapButton.h"
 #include "ToolTip.h"
 #include "Song.h"
 #include "lmms_math.h"
diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h
index 079e532e4..b957faef7 100644
--- a/plugins/watsyn/Watsyn.h
+++ b/plugins/watsyn/Watsyn.h
@@ -30,10 +30,7 @@
 #include "InstrumentView.h"
 #include "Graph.h"
 #include "AutomatableModel.h"
-#include "AutomatableButton.h"
 #include "TempoSyncKnob.h"
-#include "NotePlayHandle.h"
-#include "PixmapButton.h"
 #include <samplerate.h>
 #include "MemoryManager.h"
 
@@ -77,6 +74,8 @@ const int	B1_OSC = 2;
 const int	B2_OSC = 3;
 const int	NUM_OSCS = 4;
 
+class automatableButtonGroup;
+class PixmapButton;
 class WatsynInstrument;
 
 class WatsynObject
diff --git a/plugins/waveshaper/waveshaper_control_dialog.cpp b/plugins/waveshaper/waveshaper_control_dialog.cpp
index ffa75d513..8238b08ab 100644
--- a/plugins/waveshaper/waveshaper_control_dialog.cpp
+++ b/plugins/waveshaper/waveshaper_control_dialog.cpp
@@ -24,12 +24,12 @@
  */
 
 
-#include <QLayout>
 
 #include "waveshaper_control_dialog.h"
 #include "waveshaper_controls.h"
 #include "embed.h"
 #include "Graph.h"
+#include "Knob.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
 #include "LedCheckbox.h"
diff --git a/plugins/waveshaper/waveshaper_controls.h b/plugins/waveshaper/waveshaper_controls.h
index 550dcc752..bba4d8d85 100644
--- a/plugins/waveshaper/waveshaper_controls.h
+++ b/plugins/waveshaper/waveshaper_controls.h
@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "waveshaper_control_dialog.h"
-#include "Knob.h"
 #include "Graph.h"
 
 class waveShaperEffect;
diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
index b6a036ed2..ed32339eb 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
@@ -30,10 +30,11 @@
 
 #include "LocalZynAddSubFx.h"
 
+#include "MidiEvent.h"
+
 #include "zynaddsubfx/src/Nio/NulEngine.h"
 #include "zynaddsubfx/src/Misc/Master.h"
 #include "zynaddsubfx/src/Misc/Part.h"
-#include "zynaddsubfx/src/Misc/Dump.h"
 
 
 SYNTH_T* synth = nullptr;
diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.h b/plugins/zynaddsubfx/LocalZynAddSubFx.h
index 7068d0b12..397fbbe82 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.h
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.h
@@ -25,10 +25,10 @@
 #ifndef LOCAL_ZYNADDSUBFX_H
 #define LOCAL_ZYNADDSUBFX_H
 
-#include "MidiEvent.h"
 #include "Note.h"
 
 class Master;
+class MidiEvent;
 class NulEngine;
 
 class LocalZynAddSubFx
diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
index a31544217..d57ee40d7 100644
--- a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
@@ -29,7 +29,6 @@
 
 #include <queue>
 
-#include <FL/x.H>
 #undef CursorShape // is, by mistake, not undefed in FL
 
 #define BUILD_REMOTE_PLUGIN_CLIENT
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index eaa4c6182..d706c5ec6 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -46,7 +46,6 @@
 #include "RemoteZynAddSubFx.h"
 #include "LocalZynAddSubFx.h"
 #include "AudioEngine.h"
-#include "ControllerConnection.h"
 #include "Clipboard.h"
 
 #include "embed.h"
diff --git a/src/3rdparty/ringbuffer b/src/3rdparty/ringbuffer
index ea00e1fc2..1c46ef34a 160000
--- a/src/3rdparty/ringbuffer
+++ b/src/3rdparty/ringbuffer
@@ -1 +1 @@
-Subproject commit ea00e1fc2b821a0e06d78e8cc13ac06e6b4f72f5
+Subproject commit 1c46ef34a28d4637b43fb6d5ebb31d38c05f4bd8
diff --git a/src/core/AudioEngineWorkerThread.cpp b/src/core/AudioEngineWorkerThread.cpp
index c119f04a4..3d45cbccb 100644
--- a/src/core/AudioEngineWorkerThread.cpp
+++ b/src/core/AudioEngineWorkerThread.cpp
@@ -30,6 +30,7 @@
 
 #include "denormals.h"
 #include "AudioEngine.h"
+#include "MemoryManager.h"
 #include "ThreadableJob.h"
 
 #if __SSE__
diff --git a/src/core/AutomationClip.cpp b/src/core/AutomationClip.cpp
index 419c74536..300944416 100644
--- a/src/core/AutomationClip.cpp
+++ b/src/core/AutomationClip.cpp
@@ -30,6 +30,7 @@
 #include "AutomationClipView.h"
 #include "AutomationTrack.h"
 #include "LocaleHelper.h"
+#include "Note.h"
 #include "PatternStore.h"
 #include "ProjectJournal.h"
 #include "Song.h"
diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp
index eb8764074..248434cf9 100644
--- a/src/core/BufferManager.cpp
+++ b/src/core/BufferManager.cpp
@@ -26,7 +26,8 @@
 
 #include "BufferManager.h"
 
-#include "Engine.h"
+#include <cstring>
+
 #include "MemoryManager.h"
 
 static fpp_t framesPerPeriod;
diff --git a/src/core/Clipboard.cpp b/src/core/Clipboard.cpp
index 7da493c55..c30b657bb 100644
--- a/src/core/Clipboard.cpp
+++ b/src/core/Clipboard.cpp
@@ -27,7 +27,6 @@
 #include <QMimeData>
 
 #include "Clipboard.h"
-#include "JournallingObject.h"
 
 
 namespace Clipboard
diff --git a/src/core/ComboBoxModel.cpp b/src/core/ComboBoxModel.cpp
index 5694ec5d3..19d4f576f 100644
--- a/src/core/ComboBoxModel.cpp
+++ b/src/core/ComboBoxModel.cpp
@@ -23,7 +23,8 @@
  */
 
 #include "ComboBoxModel.h"
-#include "embed.h"
+
+#include <cassert>
 
 using std::unique_ptr;
 using std::move;
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 3ac561ae4..5444ea834 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -28,7 +28,7 @@
 #include <QMessageBox>
 #include <QApplication>
 #include <QStandardPaths>
-#include <QtCore/QTextStream>
+#include <QTextStream>
 
 #include "ConfigManager.h"
 #include "MainWindow.h"
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 3b1db245b..5cb3218a9 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -25,11 +25,9 @@
  */
 
 #include <QDomElement>
-#include <QObject>
 #include <QVector>
 
 
-#include "Song.h"
 #include "AudioEngine.h"
 #include "ControllerConnection.h"
 #include "ControllerDialog.h"
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 10585b727..a4aa60cfa 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -26,7 +26,7 @@
 
 #include "DataFile.h"
 
-#include <math.h>
+#include <cmath>
 #include <map>
 
 #include <QDebug>
diff --git a/src/core/EffectChain.cpp b/src/core/EffectChain.cpp
index 2f5deaec4..7b9b3b2db 100644
--- a/src/core/EffectChain.cpp
+++ b/src/core/EffectChain.cpp
@@ -30,7 +30,6 @@
 #include "Effect.h"
 #include "DummyEffect.h"
 #include "MixHelpers.h"
-#include "Song.h"
 
 
 EffectChain::EffectChain( Model * _parent ) :
diff --git a/src/core/InstrumentSoundShaping.cpp b/src/core/InstrumentSoundShaping.cpp
index 59141f5e4..e3ab82c0e 100644
--- a/src/core/InstrumentSoundShaping.cpp
+++ b/src/core/InstrumentSoundShaping.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtCore/QVarLengthArray>
+#include <QVarLengthArray>
 #include <QDomElement>
 
 #include "InstrumentSoundShaping.h"
diff --git a/src/core/Keymap.cpp b/src/core/Keymap.cpp
index 325a6d6b6..a50abfaf2 100644
--- a/src/core/Keymap.cpp
+++ b/src/core/Keymap.cpp
@@ -26,6 +26,8 @@
 
 #include <QDomElement>
 
+#include "Note.h"
+
 
 Keymap::Keymap() :
 	m_description(tr("empty")),
diff --git a/src/core/LadspaControl.cpp b/src/core/LadspaControl.cpp
index 4dbcb77fc..4d3faeda7 100644
--- a/src/core/LadspaControl.cpp
+++ b/src/core/LadspaControl.cpp
@@ -25,6 +25,8 @@
 
 #include <cstdio>
 
+#include <QDomElement>
+
 #include "LadspaControl.h"
 #include "LadspaBase.h"
 
diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp
index a7bccd3d4..e821a8163 100644
--- a/src/core/LadspaManager.cpp
+++ b/src/core/LadspaManager.cpp
@@ -29,7 +29,7 @@
 #include <QDir>
 #include <QLibrary>
 
-#include <math.h>
+#include <cmath>
 
 #include "ConfigManager.h"
 #include "LadspaManager.h"
diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp
index c58551510..947fd5e22 100644
--- a/src/core/LfoController.cpp
+++ b/src/core/LfoController.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <QDomElement>
-#include <QObject>
 
 
 #include "LfoController.h"
diff --git a/src/core/LocklessAllocator.cpp b/src/core/LocklessAllocator.cpp
index 9fab5f5ca..07aaa0c14 100644
--- a/src/core/LocklessAllocator.cpp
+++ b/src/core/LocklessAllocator.cpp
@@ -25,7 +25,7 @@
 #include "LocklessAllocator.h"
 
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>
 
 #include "lmmsconfig.h"
 
diff --git a/src/core/MemoryHelper.cpp b/src/core/MemoryHelper.cpp
index eaf10825b..8ac2700f3 100644
--- a/src/core/MemoryHelper.cpp
+++ b/src/core/MemoryHelper.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "lmms_basics.h"
 #include "MemoryHelper.h"
diff --git a/src/core/MemoryManager.cpp b/src/core/MemoryManager.cpp
index 0f1c93466..01fdfd5d6 100644
--- a/src/core/MemoryManager.cpp
+++ b/src/core/MemoryManager.cpp
@@ -25,7 +25,7 @@
 
 #include "MemoryManager.h"
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 #include "rpmalloc.h"
 
 /// Global static object handling rpmalloc intializing and finalizing
diff --git a/src/core/Microtuner.cpp b/src/core/Microtuner.cpp
index cbd4f16d3..b384cf390 100644
--- a/src/core/Microtuner.cpp
+++ b/src/core/Microtuner.cpp
@@ -27,9 +27,9 @@
 #include <vector>
 #include <cmath>
 
-#include "ConfigManager.h"
 #include "Engine.h"
 #include "Keymap.h"
+#include "Note.h"
 #include "Scale.h"
 #include "Song.h"
 
diff --git a/src/core/MixHelpers.cpp b/src/core/MixHelpers.cpp
index d78f6f879..70506a93a 100644
--- a/src/core/MixHelpers.cpp
+++ b/src/core/MixHelpers.cpp
@@ -24,12 +24,12 @@
 
 #include "MixHelpers.h"
 
-#include <cstdio>
 
-#include "lmms_math.h"
+#include <cmath>
+#include <QtGlobal>
+
 #include "ValueBuffer.h"
 
-#include <cstdio>
 
 
 static bool s_NaNHandler;
diff --git a/src/core/Note.cpp b/src/core/Note.cpp
index f43a8b971..cba02ee9e 100644
--- a/src/core/Note.cpp
+++ b/src/core/Note.cpp
@@ -25,7 +25,7 @@
 
 #include <QDomElement>
 
-#include <math.h>
+#include <cmath>
 
 #include "Note.h"
 #include "DetuningHelper.h"
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
index c58522bb7..2a4cf8f12 100644
--- a/src/core/NotePlayHandle.cpp
+++ b/src/core/NotePlayHandle.cpp
@@ -25,7 +25,6 @@
 
 #include "NotePlayHandle.h"
 
-#include "lmms_constants.h"
 #include "AudioEngine.h"
 #include "BasicFilters.h"
 #include "DetuningHelper.h"
diff --git a/src/core/PathUtil.cpp b/src/core/PathUtil.cpp
index 03f16bc89..24d9c8992 100644
--- a/src/core/PathUtil.cpp
+++ b/src/core/PathUtil.cpp
@@ -1,6 +1,5 @@
 #include "PathUtil.h"
 
-#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 
diff --git a/src/core/PatternClip.cpp b/src/core/PatternClip.cpp
index 1d3586e74..d88ef5224 100644
--- a/src/core/PatternClip.cpp
+++ b/src/core/PatternClip.cpp
@@ -22,13 +22,14 @@
  *
  */
  
- #include "PatternClip.h"
+#include "PatternClip.h"
  
- #include <QDomElement>
+#include <QDomElement>
  
- #include "Engine.h"
- #include "PatternStore.h"
- #include "PatternTrack.h"
+#include "Engine.h"
+#include "PatternClipView.h"
+#include "PatternStore.h"
+#include "PatternTrack.h"
 
 
 PatternClip::PatternClip(Track* track) :
diff --git a/src/core/PatternStore.cpp b/src/core/PatternStore.cpp
index a075a6edf..c16726777 100644
--- a/src/core/PatternStore.cpp
+++ b/src/core/PatternStore.cpp
@@ -25,6 +25,7 @@
 
 #include "PatternStore.h"
 
+#include "Clip.h"
 #include "Engine.h"
 #include "PatternTrack.h"
 #include "Song.h"
diff --git a/src/core/PlayHandle.cpp b/src/core/PlayHandle.cpp
index 37149583f..1c5f90ef0 100644
--- a/src/core/PlayHandle.cpp
+++ b/src/core/PlayHandle.cpp
@@ -27,10 +27,8 @@
 #include "BufferManager.h"
 #include "Engine.h"
 
-#include <QtCore/QThread>
-#include <QDebug>
+#include <QThread>
 
-#include <iterator>
 
 PlayHandle::PlayHandle(const Type type, f_cnt_t offset) :
 		m_type(type),
diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp
index 753f5dfbd..7772bffde 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -25,9 +25,8 @@
 #include "Plugin.h"
 
 #include <QtGlobal>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QLibrary>
+#include <QDomElement>
+#include <QLibrary>
 #include <QMessageBox>
 
 #include "embed.h"
diff --git a/src/core/PluginFactory.cpp b/src/core/PluginFactory.cpp
index 05d0628a3..879af542c 100644
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -24,16 +24,15 @@
 
 #include "PluginFactory.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QLibrary>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QLibrary>
 #include <memory>
 #include "lmmsconfig.h"
 
 #include "ConfigManager.h"
 #include "Plugin.h"
-#include "embed.h"
 
 #ifdef LMMS_BUILD_WIN32
 	QStringList nameFilters("*.dll");
diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp
index 05d50ca9b..323fdd6c9 100644
--- a/src/core/ProjectRenderer.cpp
+++ b/src/core/ProjectRenderer.cpp
@@ -34,10 +34,6 @@
 #include "AudioFileMP3.h"
 #include "AudioFileFlac.h"
 
-#ifdef LMMS_HAVE_SCHED_H
-#include "sched.h"
-#endif
-
 const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
 {
 
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index 520ae4379..652bfaf13 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -37,7 +37,7 @@
 #include <QDir>
 
 #ifndef SYNC_WITH_SHM_FIFO
-#include <QtCore/QUuid>
+#include <QUuid>
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
diff --git a/src/core/RenderManager.cpp b/src/core/RenderManager.cpp
index 69b053983..a0de888f4 100644
--- a/src/core/RenderManager.cpp
+++ b/src/core/RenderManager.cpp
@@ -22,13 +22,11 @@
  *
  */
 
-#include <QDebug>
 #include <QDir>
 
 #include "RenderManager.h"
 
 #include "PatternStore.h"
-#include "PatternTrack.h"
 #include "Song.h"
 
 
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
index 949a4667b..e09dd5198 100644
--- a/src/core/SampleBuffer.cpp
+++ b/src/core/SampleBuffer.cpp
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 
-#include <QBuffer>
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
@@ -57,7 +56,7 @@
 #include "endian_handling.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "lmms_constants.h"
+#include "Note.h"
 #include "PathUtil.h"
 
 #include "FileDialog.h"
diff --git a/src/core/SampleClip.cpp b/src/core/SampleClip.cpp
index a949a8078..46bb6e6b7 100644
--- a/src/core/SampleClip.cpp
+++ b/src/core/SampleClip.cpp
@@ -26,7 +26,9 @@
 
 #include <QDomElement>
 
+#include "SampleBuffer.h"
 #include "SampleClipView.h"
+#include "SampleTrack.h"
 #include "TimeLineWidget.h"
 
 SampleClip::SampleClip( Track * _track ) :
@@ -317,4 +319,4 @@ void SampleClip::loadSettings( const QDomElement & _this )
 ClipView * SampleClip::createView( TrackView * _tv )
 {
 	return new SampleClipView( this, _tv );
-}
\ No newline at end of file
+}
diff --git a/src/core/SamplePlayHandle.cpp b/src/core/SamplePlayHandle.cpp
index 2d5a40c6a..bcfd2ea58 100644
--- a/src/core/SamplePlayHandle.cpp
+++ b/src/core/SamplePlayHandle.cpp
@@ -26,10 +26,10 @@
 #include "AudioEngine.h"
 #include "AudioPort.h"
 #include "Engine.h"
-#include "InstrumentTrack.h"
-#include "lmms_constants.h"
+#include "Note.h"
 #include "PatternTrack.h"
 #include "SampleClip.h"
+#include "SampleTrack.h"
 
 
 
diff --git a/src/core/SampleRecordHandle.cpp b/src/core/SampleRecordHandle.cpp
index 783bc8dbb..cc0ce1635 100644
--- a/src/core/SampleRecordHandle.cpp
+++ b/src/core/SampleRecordHandle.cpp
@@ -26,10 +26,9 @@
 #include "SampleRecordHandle.h"
 #include "AudioEngine.h"
 #include "Engine.h"
-#include "InstrumentTrack.h"
 #include "PatternTrack.h"
 #include "SampleBuffer.h"
-#include "SampleTrack.h"
+#include "SampleClip.h"
 #include "debug.h"
 
 
diff --git a/src/core/Scale.cpp b/src/core/Scale.cpp
index c71d86075..394377e28 100644
--- a/src/core/Scale.cpp
+++ b/src/core/Scale.cpp
@@ -24,6 +24,7 @@
 
 #include "Scale.h"
 
+#include <cmath>
 #include <QDomElement>
 
 
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index ede0349e3..ec115f9a4 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -27,25 +27,23 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
-#include <QFileInfo>
 #include <QMessageBox>
 
 #include <algorithm>
 #include <cmath>
-#include <functional>
 
 #include "AutomationTrack.h"
 #include "AutomationEditor.h"
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "ControllerConnection.h"
-#include "embed.h"
 #include "EnvelopeAndLfoParameters.h"
 #include "Mixer.h"
 #include "MixerView.h"
 #include "GuiApplication.h"
 #include "ExportFilter.h"
 #include "InstrumentTrack.h"
+#include "Keymap.h"
 #include "NotePlayHandle.h"
 #include "MidiClip.h"
 #include "PatternEditor.h"
@@ -54,6 +52,7 @@
 #include "PianoRoll.h"
 #include "ProjectJournal.h"
 #include "ProjectNotes.h"
+#include "Scale.h"
 #include "SongEditor.h"
 #include "TimeLineWidget.h"
 #include "PeakController.h"
diff --git a/src/core/StepRecorder.cpp b/src/core/StepRecorder.cpp
index 96b93320f..29675d5b2 100644
--- a/src/core/StepRecorder.cpp
+++ b/src/core/StepRecorder.cpp
@@ -19,12 +19,14 @@
  */
 
 #include "StepRecorder.h"
+
+#include <QKeyEvent>
+
+#include "MidiClip.h"
 #include "StepRecorderWidget.h"
 #include "PianoRoll.h"
 
-#include <QPainter>
 
-#include <climits>
 using std::min;
 using std::max;
 
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index 965b7f93c..d3418ea33 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -29,6 +29,7 @@
 
 #include "Track.h"
 
+#include <QDomElement>
 #include <QVariant>
 
 #include "AutomationClip.h"
diff --git a/src/core/TrackContainer.cpp b/src/core/TrackContainer.cpp
index 36e744725..6c52b41af 100644
--- a/src/core/TrackContainer.cpp
+++ b/src/core/TrackContainer.cpp
@@ -24,16 +24,15 @@
  */
 
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QProgressDialog>
 #include <QDomElement>
 #include <QWriteLocker>
 
 #include "AutomationClip.h"
-#include "AutomationTrack.h"
 #include "embed.h"
 #include "TrackContainer.h"
-#include "InstrumentTrack.h"
+#include "PatternClip.h"
 #include "PatternStore.h"
 #include "PatternTrack.h"
 #include "Song.h"
diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp
index 9caa92e09..c905b5561 100644
--- a/src/core/VstSyncController.cpp
+++ b/src/core/VstSyncController.cpp
@@ -23,18 +23,16 @@
  *
  */
 
+#include "VstSyncController.h"
+
 #include <QDebug>
 
 #include "AudioEngine.h"
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "VstSyncController.h"
 #include "RemotePlugin.h"
 
 #ifndef USE_QT_SHMEM
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp
index 83c64f46c..1cea301b9 100644
--- a/src/core/audio/AudioAlsa.cpp
+++ b/src/core/audio/AudioAlsa.cpp
@@ -22,8 +22,6 @@
  *
  */
 
-#include <QComboBox>
-#include <QLineEdit>
 
 #include "AudioAlsa.h"
 
@@ -33,7 +31,6 @@
 #include "AudioEngine.h"
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "gui_templates.h"
 
 
 AudioAlsa::AudioAlsa( bool & _success_ful, AudioEngine*  _audioEngine ) :
diff --git a/src/core/audio/AudioFileMP3.cpp b/src/core/audio/AudioFileMP3.cpp
index 0a0045a9c..088cd6eda 100644
--- a/src/core/audio/AudioFileMP3.cpp
+++ b/src/core/audio/AudioFileMP3.cpp
@@ -27,7 +27,6 @@
 
 #ifdef LMMS_HAVE_MP3LAME
 
-#include "AudioEngine.h"
 
 #include <cassert>
 
diff --git a/src/core/audio/AudioFileWave.cpp b/src/core/audio/AudioFileWave.cpp
index 94b84c0da..1fce2fe48 100644
--- a/src/core/audio/AudioFileWave.cpp
+++ b/src/core/audio/AudioFileWave.cpp
@@ -27,8 +27,6 @@
 #include "endian_handling.h"
 #include "AudioEngine.h"
 
-#include <QFile>
-#include <QDebug>
 
 
 AudioFileWave::AudioFileWave( OutputSettings const & outputSettings,
diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
index aac1cda8e..6bc039a50 100644
--- a/src/core/audio/AudioJack.cpp
+++ b/src/core/audio/AudioJack.cpp
@@ -35,7 +35,6 @@
 #include "gui_templates.h"
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
-#include "AudioPort.h"
 #include "MainWindow.h"
 #include "AudioEngine.h"
 #include "MidiJack.h"
diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
index 2bd2874c7..1bc137dac 100644
--- a/src/core/audio/AudioPortAudio.cpp
+++ b/src/core/audio/AudioPortAudio.cpp
@@ -43,7 +43,6 @@ void AudioPortAudioSetupUtil::updateChannels()
 #ifdef LMMS_HAVE_PORTAUDIO
 
 #include <QLabel>
-#include <QLineEdit>
 
 #include "Engine.h"
 #include "ConfigManager.h"
diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp
index 50991642c..d62678b49 100644
--- a/src/core/audio/AudioSdl.cpp
+++ b/src/core/audio/AudioSdl.cpp
@@ -28,9 +28,9 @@
 
 #include <QLabel>
 #include <QLineEdit>
+#include <SDL.h>
 
 #include "AudioEngine.h"
-#include "Engine.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
 
diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp
index 4bd978744..114e01460 100644
--- a/src/core/audio/AudioSndio.cpp
+++ b/src/core/audio/AudioSndio.cpp
@@ -27,7 +27,7 @@
 
 #ifdef LMMS_HAVE_SNDIO
 
-#include <QFileInfo>
+#include <cstdlib>
 #include <QLabel>
 #include <QLineEdit>
 
@@ -37,13 +37,6 @@
 #include "Engine.h"
 #include "gui_templates.h"
 
-#ifdef LMMS_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include "ConfigManager.h"
 
 
diff --git a/src/core/lv2/Lv2ControlBase.cpp b/src/core/lv2/Lv2ControlBase.cpp
index 98fe7b13b..3c8ccbf8a 100644
--- a/src/core/lv2/Lv2ControlBase.cpp
+++ b/src/core/lv2/Lv2ControlBase.cpp
@@ -27,6 +27,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <algorithm>
+#include <QDebug>
 #include <QtGlobal>
 
 #include "Engine.h"
diff --git a/src/core/lv2/Lv2Manager.cpp b/src/core/lv2/Lv2Manager.cpp
index 25fab7002..09870a90b 100644
--- a/src/core/lv2/Lv2Manager.cpp
+++ b/src/core/lv2/Lv2Manager.cpp
@@ -30,18 +30,13 @@
 #include <cstdlib>
 #include <cstring>
 #include <lilv/lilv.h>
-#include <lv2.h>
 #include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
 #include <lv2/lv2plug.in/ns/ext/options/options.h>
 #include <QDebug>
-#include <QDir>
-#include <QLibrary>
 #include <QElapsedTimer>
 
-#include "ConfigManager.h"
 #include "Engine.h"
 #include "Plugin.h"
-#include "PluginFactory.h"
 #include "Lv2ControlBase.h"
 #include "Lv2Options.h"
 #include "PluginIssue.h"
diff --git a/src/core/lv2/Lv2Proc.cpp b/src/core/lv2/Lv2Proc.cpp
index 3ea734f91..59f84befe 100644
--- a/src/core/lv2/Lv2Proc.cpp
+++ b/src/core/lv2/Lv2Proc.cpp
@@ -41,6 +41,7 @@
 #include "Lv2Manager.h"
 #include "Lv2Ports.h"
 #include "Lv2Evbuf.h"
+#include "MidiEvent.h"
 #include "MidiEventToByteSeq.h"
 
 
diff --git a/src/core/lv2/Lv2SubPluginFeatures.cpp b/src/core/lv2/Lv2SubPluginFeatures.cpp
index 3f86c5324..8fb908cb1 100644
--- a/src/core/lv2/Lv2SubPluginFeatures.cpp
+++ b/src/core/lv2/Lv2SubPluginFeatures.cpp
@@ -28,7 +28,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <QDebug>
 #include <QHBoxLayout>
 #include <QLabel>
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9912d2348..953995b67 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -55,7 +55,7 @@
 #include <unistd.h>
 #endif
 
-#include <signal.h>
+#include <csignal>
 
 #include "MainApplication.h"
 #include "ConfigManager.h"
@@ -71,7 +71,6 @@
 #include "ProjectRenderer.h"
 #include "RenderManager.h"
 #include "Song.h"
-#include "SetupDialog.h"
 
 #ifdef LMMS_DEBUG_FPE
 #include <fenv.h> // For feenableexcept
diff --git a/src/core/midi/MidiAlsaRaw.cpp b/src/core/midi/MidiAlsaRaw.cpp
index a4fcae19e..883d31e96 100644
--- a/src/core/midi/MidiAlsaRaw.cpp
+++ b/src/core/midi/MidiAlsaRaw.cpp
@@ -24,7 +24,6 @@
 
 #include "MidiAlsaRaw.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 #ifdef LMMS_HAVE_ALSA
diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp
index c47dcf6cf..b04964843 100644
--- a/src/core/midi/MidiAlsaSeq.cpp
+++ b/src/core/midi/MidiAlsaSeq.cpp
@@ -25,10 +25,8 @@
 #include "MidiAlsaSeq.h"
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "gui_templates.h"
 #include "Song.h"
 #include "MidiPort.h"
-#include "Note.h"
 
 
 #ifdef LMMS_HAVE_ALSA
diff --git a/src/core/midi/MidiClient.cpp b/src/core/midi/MidiClient.cpp
index 06de8c4b0..109e01fd6 100644
--- a/src/core/midi/MidiClient.cpp
+++ b/src/core/midi/MidiClient.cpp
@@ -25,7 +25,6 @@
 
 #include "MidiClient.h"
 #include "MidiPort.h"
-#include "Note.h"
 
 
 MidiClient::MidiClient()
diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp
index 051ab978a..91d0dd782 100644
--- a/src/core/midi/MidiController.cpp
+++ b/src/core/midi/MidiController.cpp
@@ -24,11 +24,8 @@
  */
 
 #include <QDomElement>
-#include <QObject>
 
-#include "Song.h"
 #include "AudioEngine.h"
-#include "MidiClient.h"
 #include "MidiController.h"
 
 
diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp
index c6e687343..fdf194889 100644
--- a/src/core/midi/MidiJack.cpp
+++ b/src/core/midi/MidiJack.cpp
@@ -26,12 +26,11 @@
 
 #ifdef LMMS_HAVE_JACK
 
-#include <QCompleter>
 #include <QMessageBox>
 
 #include "AudioEngine.h"
+#include "AudioJack.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 #include "GuiApplication.h"
 #include "Engine.h"
 #include "MainWindow.h"
diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp
index 758b94453..faf6453a2 100644
--- a/src/core/midi/MidiOss.cpp
+++ b/src/core/midi/MidiOss.cpp
@@ -28,7 +28,6 @@
 #ifdef LMMS_HAVE_OSS
 
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 
diff --git a/src/core/midi/MidiPort.cpp b/src/core/midi/MidiPort.cpp
index 99790add6..40460f434 100644
--- a/src/core/midi/MidiPort.cpp
+++ b/src/core/midi/MidiPort.cpp
@@ -28,6 +28,7 @@
 #include "MidiPort.h"
 #include "MidiClient.h"
 #include "MidiDummy.h"
+#include "MidiEventProcessor.h"
 #include "Note.h"
 #include "Song.h"
 
diff --git a/src/core/midi/MidiSndio.cpp b/src/core/midi/MidiSndio.cpp
index 29fa4d84f..4acd2827e 100644
--- a/src/core/midi/MidiSndio.cpp
+++ b/src/core/midi/MidiSndio.cpp
@@ -27,17 +27,11 @@
 
 #ifdef LMMS_HAVE_SNDIO
 
-#include <QLabel>
-#include <QLineEdit>
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
+#include <cstdlib>
+#include <sndio.h>
 #include <poll.h>
 
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 MidiSndio::MidiSndio( void ) :
diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp
index eb1a00c7f..80ebea964 100644
--- a/src/core/midi/MidiWinMM.cpp
+++ b/src/core/midi/MidiWinMM.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "MidiWinMM.h"
-#include "Note.h"
 
 #ifdef LMMS_BUILD_WIN32
 
diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp
index ba89d043c..082022d35 100644
--- a/src/gui/AutomatableModelView.cpp
+++ b/src/gui/AutomatableModelView.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
 
diff --git a/src/gui/AutomationClipView.cpp b/src/gui/AutomationClipView.cpp
index 47fa2e046..16e7c0b86 100644
--- a/src/gui/AutomationClipView.cpp
+++ b/src/gui/AutomationClipView.cpp
@@ -23,6 +23,7 @@
  */
 #include "AutomationClipView.h"
 
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
@@ -31,12 +32,12 @@
 #include "AutomationEditor.h"
 #include "embed.h"
 #include "GuiApplication.h"
-#include "gui_templates.h"
 #include "ProjectJournal.h"
 #include "RenameDialog.h"
 #include "StringPairDrag.h"
 #include "TextFloat.h"
 #include "ToolTip.h"
+#include "Track.h"
 
 #include "Engine.h"
 
@@ -276,7 +277,7 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 
 	// pixels per bar
 	const float ppb = fixedClips() ?
-			( parentWidget()->width() - 2 * CLIP_BORDER_WIDTH )
+			( parentWidget()->width() - 2 * BORDER_WIDTH )
 				/ (float) m_clip->timeMapLength().getBar() :
 								pixelsPerBar();
 
@@ -284,10 +285,10 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 	const float max = m_clip->firstObject()->maxValue<float>();
 
 	const float y_scale = max - min;
-	const float h = ( height() - 2 * CLIP_BORDER_WIDTH ) / y_scale;
+	const float h = ( height() - 2 * BORDER_WIDTH ) / y_scale;
 	const float ppTick  = ppb / TimePos::ticksPerBar();
 
-	p.translate( 0.0f, max * height() / y_scale - CLIP_BORDER_WIDTH );
+	p.translate( 0.0f, max * height() / y_scale - BORDER_WIDTH );
 	p.scale( 1.0f, -h );
 
 	QLinearGradient lin2grad( 0, min, 0, max );
@@ -307,8 +308,8 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 		if( it+1 == m_clip->getTimeMap().end() )
 		{
 			const float x1 = POS(it) * ppTick;
-			const float x2 = (float)( width() - CLIP_BORDER_WIDTH );
-			if( x1 > ( width() - CLIP_BORDER_WIDTH ) ) break;
+			const float x2 = (float)( width() - BORDER_WIDTH );
+			if( x1 > ( width() - BORDER_WIDTH ) ) break;
 			// We are drawing the space after the last node, so we use the outValue
 			if( gradient() )
 			{
@@ -347,7 +348,7 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 		for (int i = POS(it) + 1; i < POS(it + 1); i++)
 		{
 			x = i * ppTick;
-			if( x > ( width() - CLIP_BORDER_WIDTH ) ) break;
+			if( x > ( width() - BORDER_WIDTH ) ) break;
 			float value = values[i - POS(it)];
 			path.lineTo( QPointF( x, value ) );
 
@@ -374,15 +375,15 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 	const int lineSize = 3;
 	p.setPen( c.darker( 300 ) );
 
-	for (bar_t b = 1; b < width() - CLIP_BORDER_WIDTH; ++b)
+	for (bar_t b = 1; b < width() - BORDER_WIDTH; ++b)
 	{
-		const int bx = CLIP_BORDER_WIDTH + static_cast<int>(ppb * b) - 2;
+		const int bx = BORDER_WIDTH + static_cast<int>(ppb * b) - 2;
 
 		//top line
-		p.drawLine(bx, CLIP_BORDER_WIDTH, bx, CLIP_BORDER_WIDTH + lineSize);
+		p.drawLine(bx, BORDER_WIDTH, bx, BORDER_WIDTH + lineSize);
 
 		//bottom line
-		p.drawLine(bx, rect().bottom() - (lineSize + CLIP_BORDER_WIDTH), bx, rect().bottom() - CLIP_BORDER_WIDTH);
+		p.drawLine(bx, rect().bottom() - (lineSize + BORDER_WIDTH), bx, rect().bottom() - BORDER_WIDTH);
 	}
 
 	// recording icon for when recording automation
@@ -396,8 +397,8 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 
 	// inner border
 	p.setPen( c.lighter( current ? 160 : 130 ) );
-	p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
-		rect().bottom() - CLIP_BORDER_WIDTH );
+	p.drawRect( 1, 1, rect().right() - BORDER_WIDTH,
+		rect().bottom() - BORDER_WIDTH );
 
 	// outer border
 	p.setPen( current? c.lighter( 130 ) : c.darker( 300 ) );
@@ -406,7 +407,7 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 	// draw the 'muted' pixmap only if the clip was manualy muted
 	if( m_clip->isMuted() )
 	{
-		const int spacing = CLIP_BORDER_WIDTH;
+		const int spacing = BORDER_WIDTH;
 		const int size = 14;
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
diff --git a/src/gui/AutomationTrackView.cpp b/src/gui/AutomationTrackView.cpp
index 152d11401..ec44ba937 100644
--- a/src/gui/AutomationTrackView.cpp
+++ b/src/gui/AutomationTrackView.cpp
@@ -25,13 +25,14 @@
  
  #include "AutomationTrackView.h"
  
- #include "AutomationClip.h"
- #include "embed.h"
- #include "Engine.h"
- #include "ProjectJournal.h"
- #include "StringPairDrag.h"
- #include "TrackContainerView.h"
- #include "TrackLabelButton.h"
+#include "AutomationClip.h"
+#include "AutomationTrack.h"
+#include "embed.h"
+#include "Engine.h"
+#include "ProjectJournal.h"
+#include "StringPairDrag.h"
+#include "TrackContainerView.h"
+#include "TrackLabelButton.h"
  
 
 AutomationTrackView::AutomationTrackView( AutomationTrack * _at, TrackContainerView* tcv ) :
@@ -85,4 +86,4 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 	}
 
 	update();
-}
\ No newline at end of file
+}
diff --git a/src/gui/ClipView.cpp b/src/gui/ClipView.cpp
index 3a7eda4f9..1e154f155 100644
--- a/src/gui/ClipView.cpp
+++ b/src/gui/ClipView.cpp
@@ -41,8 +41,9 @@
 #include "InstrumentTrack.h"
 #include "InstrumentTrackView.h"
 #include "MidiClip.h"
+#include "MidiClipView.h"
 #include "Note.h"
-#include "SampleTrack.h"
+#include "SampleClip.h"
 #include "Song.h"
 #include "SongEditor.h"
 #include "StringPairDrag.h"
@@ -311,7 +312,7 @@ void ClipView::updateLength()
 		setFixedWidth(
 		static_cast<int>( m_clip->length() * pixelsPerBar() /
 					TimePos::ticksPerBar() ) + 1 /*+
-						CLIP_BORDER_WIDTH * 2-1*/ );
+						BORDER_WIDTH * 2-1*/ );
 	}
 	m_trackView->trackContainerView()->update();
 }
@@ -583,8 +584,8 @@ void ClipView::paintTextLabel(QString const & text, QPainter & painter)
 	labelFont.setHintingPreference( QFont::PreferFullHinting );
 	painter.setFont( labelFont );
 
-	const int textTop = CLIP_BORDER_WIDTH + 1;
-	const int textLeft = CLIP_BORDER_WIDTH + 3;
+	const int textTop = BORDER_WIDTH + 1;
+	const int textLeft = BORDER_WIDTH + 3;
 
 	QFontMetrics fontMetrics(labelFont);
 	QString elidedClipName = fontMetrics.elidedText(text, Qt::ElideMiddle, width() - 2 * textLeft);
diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp
index b72914716..216dd6066 100644
--- a/src/gui/ControllerConnectionDialog.cpp
+++ b/src/gui/ControllerConnectionDialog.cpp
@@ -23,10 +23,9 @@
  *
  */
 
-#include <QLayout>
+#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QScrollArea>
 #include <QMessageBox>
 
 #include "AudioEngine.h"
@@ -40,9 +39,9 @@
 #include "ComboBox.h"
 #include "GroupBox.h"
 #include "Song.h"
+#include "TabWidget.h"
 #include "ToolButton.h"
 
-#include "gui_templates.h"
 #include "embed.h"
 
 
diff --git a/src/gui/EffectControlDialog.cpp b/src/gui/EffectControlDialog.cpp
index 3439835d1..d7d5b4054 100644
--- a/src/gui/EffectControlDialog.cpp
+++ b/src/gui/EffectControlDialog.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <QMessageBox>
 #include <QCloseEvent>
 
 #include "EffectControlDialog.h"
diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/EffectSelectDialog.cpp
index 56e30d4b2..b4bd3af4a 100644
--- a/src/gui/EffectSelectDialog.cpp
+++ b/src/gui/EffectSelectDialog.cpp
@@ -26,8 +26,8 @@
 
 #include "ui_EffectSelectDialog.h"
 
-#include "gui_templates.h"
 #include "DummyEffect.h"
+#include "EffectChain.h"
 #include "embed.h"
 #include "PluginFactory.h"
 
diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp
index c3bf074e0..151d25237 100644
--- a/src/gui/ExportProjectDialog.cpp
+++ b/src/gui/ExportProjectDialog.cpp
@@ -23,9 +23,7 @@
  */
 
 #include <QFileInfo>
-#include <QDir>
 #include <QMessageBox>
-#include <QDebug>
 
 #include "ExportProjectDialog.h"
 #include "Song.h"
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index 77a298aa5..b439ee9e5 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -24,6 +24,7 @@
  */
 
 
+#include <QApplication>
 #include <QDesktopServices>
 #include <QHBoxLayout>
 #include <QKeyEvent>
@@ -43,7 +44,6 @@
 #include "embed.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "gui_templates.h"
 #include "ImportFilter.h"
 #include "Instrument.h"
 #include "InstrumentTrack.h"
@@ -52,6 +52,7 @@
 #include "PatternStore.h"
 #include "PluginFactory.h"
 #include "PresetPreviewPlayHandle.h"
+#include "SampleClip.h"
 #include "SamplePlayHandle.h"
 #include "SampleTrack.h"
 #include "Song.h"
diff --git a/src/gui/GuiApplication.cpp b/src/gui/GuiApplication.cpp
index 15c44fb82..0829bfd80 100644
--- a/src/gui/GuiApplication.cpp
+++ b/src/gui/GuiApplication.cpp
@@ -33,7 +33,6 @@
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "MixerView.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "MicrotunerConfig.h"
 #include "PatternEditor.h"
@@ -44,6 +43,7 @@
 #include <QApplication>
 #include <QDir>
 #include <QtGlobal>
+#include <QLabel>
 #include <QMessageBox>
 #include <QSplashScreen>
 
diff --git a/src/gui/InstrumentTrackView.cpp b/src/gui/InstrumentTrackView.cpp
index f20182ebb..b58144956 100644
--- a/src/gui/InstrumentTrackView.cpp
+++ b/src/gui/InstrumentTrackView.cpp
@@ -33,10 +33,10 @@
 
 #include "AudioEngine.h"
 #include "ConfigManager.h"
-#include "ControllerConnectionDialog.h"
 #include "Engine.h"
 #include "FadeButton.h"
-#include "MixerLineLcdSpinBox.h"
+#include "Knob.h"
+#include "MidiCCRackView.h"
 #include "Mixer.h"
 #include "MixerView.h"
 #include "GuiApplication.h"
diff --git a/src/gui/InstrumentTrackWindow.cpp b/src/gui/InstrumentTrackWindow.cpp
index d59ec940f..0dd95c30a 100644
--- a/src/gui/InstrumentTrackWindow.cpp
+++ b/src/gui/InstrumentTrackWindow.cpp
@@ -28,8 +28,9 @@
 #include <QDropEvent>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMdiSubWindow>
+#include <QLineEdit>
 #include <QMenu>
+#include <QPushButton>
 #include <QVBoxLayout>
 
 #include "ComboBox.h"
@@ -40,8 +41,8 @@
 #include "Engine.h"
 #include "FileBrowser.h"
 #include "FileDialog.h"
+#include "GroupBox.h"
 #include "MixerLineLcdSpinBox.h"
-#include "Mixer.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
 #include "Instrument.h"
@@ -52,6 +53,7 @@
 #include "InstrumentSoundShapingView.h"
 #include "InstrumentTrack.h"
 #include "InstrumentTrackView.h"
+#include "Knob.h"
 #include "LcdSpinBox.h"
 #include "LedCheckbox.h"
 #include "LeftRightNav.h"
@@ -61,6 +63,7 @@
 #include "PluginView.h"
 #include "Song.h"
 #include "StringPairDrag.h"
+#include "SubWindow.h"
 #include "TabWidget.h"
 #include "ToolTip.h"
 #include "TrackContainerView.h"
diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp
index 80594a04a..eaa49df10 100644
--- a/src/gui/InstrumentView.cpp
+++ b/src/gui/InstrumentView.cpp
@@ -28,7 +28,6 @@
 #include "embed.h"
 #include "InstrumentTrack.h"
 #include "InstrumentTrackWindow.h"
-#include "StringPairDrag.h"
 
 
 InstrumentView::InstrumentView( Instrument * _Instrument, QWidget * _parent ) :
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
index 943894a71..564f85e54 100644
--- a/src/gui/LfoControllerDialog.cpp
+++ b/src/gui/LfoControllerDialog.cpp
@@ -23,16 +23,8 @@
  *
  */
 
-#include <QLabel>
-#include <QPushButton>
-#include <QMdiArea>
-#include <QPainter>
 
-#include "CaptionMenu.h"
-#include "gui_templates.h"
 #include "embed.h"
-#include "LedCheckbox.h"
-#include "MainWindow.h"
 #include "ToolTip.h"
 
 
@@ -244,6 +236,9 @@ void LfoControllerDialog::contextMenuEvent( QContextMenuEvent * )
 	/*
 	QPointer<captionMenu> contextMenu = new captionMenu(
 						getEffect()->publicName() );
+		// ^ if this ever gets activated again:
+		//   a47a36c86e4473af862df58d2b59f6cb8620b9ee says that publicName
+		//   should be replaced by Model::displayName
 	contextMenu->addAction( embed::getIconPixmap( "arp_up_on" ),
 						tr( "Move &up" ),
 						this, SLOT( moveUp() ) );
diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
index c5a08220b..2882b9572 100644
--- a/src/gui/LmmsStyle.cpp
+++ b/src/gui/LmmsStyle.cpp
@@ -26,7 +26,6 @@
 
 #include <QFile>
 #include <QApplication>
-#include <QFrame>
 #include <QPainter>
 #include <QPainterPath>
 #include <QStyleFactory>
diff --git a/src/gui/Lv2ViewBase.cpp b/src/gui/Lv2ViewBase.cpp
index 6fe7220bc..1ae12beed 100644
--- a/src/gui/Lv2ViewBase.cpp
+++ b/src/gui/Lv2ViewBase.cpp
@@ -27,10 +27,9 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <QGridLayout>
-#include <QGroupBox>
-#include <QMdiSubWindow>
 #include <QPushButton>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <lilv/lilv.h>
 #include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
 
@@ -40,7 +39,6 @@
 #include "GuiApplication.h"
 #include "embed.h"
 #include "gui_templates.h"
-#include "LedCheckbox.h"
 #include "Lv2ControlBase.h"
 #include "Lv2Manager.h"
 #include "Lv2Proc.h"
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 5bc30947a..40ff4c055 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -32,14 +32,11 @@
 #include <QMdiArea>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QScrollBar>
 #include <QShortcut>
 #include <QLibrary>
 #include <QSplitter>
-#include <QUrl>
 
 #include "AboutDialog.h"
-#include "AudioDummy.h"
 #include "AutomationEditor.h"
 #include "ControllerRackView.h"
 #include "embed.h"
@@ -67,6 +64,7 @@
 #include "SetupDialog.h"
 #include "SideBar.h"
 #include "SongEditor.h"
+#include "SubWindow.h"
 #include "TemplatesMenu.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
diff --git a/src/gui/MidiCCRackView.cpp b/src/gui/MidiCCRackView.cpp
index a77cceede..f7bf98e81 100644
--- a/src/gui/MidiCCRackView.cpp
+++ b/src/gui/MidiCCRackView.cpp
@@ -26,7 +26,6 @@
 #include "MidiCCRackView.h"
 
 #include <QGridLayout>
-#include <QMdiSubWindow>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
@@ -37,7 +36,7 @@
 #include "InstrumentTrack.h"
 #include "Knob.h"
 #include "MainWindow.h"
-#include "Track.h"
+#include "SubWindow.h"
 
 
 MidiCCRackView::MidiCCRackView(InstrumentTrack * track) :
diff --git a/src/gui/MidiClipView.cpp b/src/gui/MidiClipView.cpp
index 354b77adf..12ed7eea7 100644
--- a/src/gui/MidiClipView.cpp
+++ b/src/gui/MidiClipView.cpp
@@ -25,15 +25,18 @@
 
 #include "MidiClipView.h"
 
+#include <cmath>
 #include <QApplication>
 #include <QMenu>
+#include <QPainter>
 
 #include "ConfigManager.h"
 #include "DeprecationHelper.h"
 #include "GuiApplication.h"
-#include "InstrumentTrack.h"
+#include "MidiClip.h"
 #include "PianoRoll.h"
 #include "RenameDialog.h"
+#include "ToolTip.h"
 
 MidiClipView::MidiClipView( MidiClip* clip, TrackView* parent ) :
 	ClipView( clip, parent ),
@@ -193,8 +196,8 @@ void MidiClipView::mousePressEvent( QMouseEvent * _me )
 	{
 //	get the step number that was clicked on and
 //	do calculations in floats to prevent rounding errors...
-		float tmp = ( ( float(_me->x()) - CLIP_BORDER_WIDTH ) *
-				float( m_clip -> m_steps ) ) / float(width() - CLIP_BORDER_WIDTH*2);
+		float tmp = ( ( float(_me->x()) - BORDER_WIDTH ) *
+				float( m_clip -> m_steps ) ) / float(width() - BORDER_WIDTH*2);
 
 		int step = int( tmp );
 
@@ -260,8 +263,8 @@ void MidiClipView::wheelEvent(QWheelEvent * we)
 	{
 //	get the step number that was wheeled on and
 //	do calculations in floats to prevent rounding errors...
-		float tmp = ((float(position(we).x()) - CLIP_BORDER_WIDTH) *
-				float(m_clip -> m_steps)) / float(width() - CLIP_BORDER_WIDTH*2);
+		float tmp = ((float(position(we).x()) - BORDER_WIDTH) *
+				float(m_clip -> m_steps)) / float(width() - BORDER_WIDTH*2);
 
 		int step = int( tmp );
 
@@ -368,7 +371,7 @@ void MidiClipView::paintEvent( QPaintEvent * )
 
 	// TODO Warning! This might cause problems if ClipView::paintTextLabel changes
 	int textBoxHeight = 0;
-	const int textTop = CLIP_BORDER_WIDTH + 1;
+	const int textTop = BORDER_WIDTH + 1;
 	if (drawTextBox)
 	{
 		QFont labelFont = this->font();
@@ -379,15 +382,15 @@ void MidiClipView::paintEvent( QPaintEvent * )
 	}
 
 	// Compute pixels per bar
-	const int baseWidth = fixedClips() ? parentWidget()->width() - 2 * CLIP_BORDER_WIDTH
-						: width() - CLIP_BORDER_WIDTH;
+	const int baseWidth = fixedClips() ? parentWidget()->width() - 2 * BORDER_WIDTH
+						: width() - BORDER_WIDTH;
 	const float pixelsPerBar = baseWidth / (float) m_clip->length().getBar();
 
 	// Length of one bar/beat in the [0,1] x [0,1] coordinate system
 	const float barLength = 1. / m_clip->length().getBar();
 	const float tickLength = barLength / TimePos::ticksPerBar();
 
-	const int x_base = CLIP_BORDER_WIDTH;
+	const int x_base = BORDER_WIDTH;
 
 	bool displayPattern = fixedClips() || (pixelsPerBar >= 96 && m_legacySEPattern);
 	// melody clip paint event
@@ -514,7 +517,7 @@ void MidiClipView::paintEvent( QPaintEvent * )
 		QPixmap stepoffl;
 		const int steps = qMax( 1,
 					m_clip->m_steps );
-		const int w = width() - 2 * CLIP_BORDER_WIDTH;
+		const int w = width() - 2 * BORDER_WIDTH;
 
 		// scale step graphics to fit the beat clip length
 		stepon0 = s_stepBtnOn0->scaled( w / steps,
@@ -539,7 +542,7 @@ void MidiClipView::paintEvent( QPaintEvent * )
 			Note * n = m_clip->noteAtStep( it );
 
 			// figure out x and y coordinates for step graphic
-			const int x = CLIP_BORDER_WIDTH + static_cast<int>( it * w / steps );
+			const int x = BORDER_WIDTH + static_cast<int>( it * w / steps );
 			const int y = height() - s_stepBtnOff->height() - 1;
 
 			if( n )
@@ -577,12 +580,12 @@ void MidiClipView::paintEvent( QPaintEvent * )
 	for( bar_t t = 1; t < m_clip->length().getBar(); ++t )
 	{
 		p.drawLine( x_base + static_cast<int>( pixelsPerBar * t ) - 1,
-				CLIP_BORDER_WIDTH, x_base + static_cast<int>(
-						pixelsPerBar * t ) - 1, CLIP_BORDER_WIDTH + lineSize );
+				BORDER_WIDTH, x_base + static_cast<int>(
+						pixelsPerBar * t ) - 1, BORDER_WIDTH + lineSize );
 		p.drawLine( x_base + static_cast<int>( pixelsPerBar * t ) - 1,
-				rect().bottom() - ( lineSize + CLIP_BORDER_WIDTH ),
+				rect().bottom() - ( lineSize + BORDER_WIDTH ),
 				x_base + static_cast<int>( pixelsPerBar * t ) - 1,
-				rect().bottom() - CLIP_BORDER_WIDTH );
+				rect().bottom() - BORDER_WIDTH );
 	}
 
 	// clip name
@@ -595,8 +598,8 @@ void MidiClipView::paintEvent( QPaintEvent * )
 	{
 		// inner border
 		p.setPen( c.lighter( current ? 160 : 130 ) );
-		p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
-			rect().bottom() - CLIP_BORDER_WIDTH );
+		p.drawRect( 1, 1, rect().right() - BORDER_WIDTH,
+			rect().bottom() - BORDER_WIDTH );
 
 		// outer border
 		p.setPen( current ? c.lighter( 130 ) : c.darker( 300 ) );
@@ -606,7 +609,7 @@ void MidiClipView::paintEvent( QPaintEvent * )
 	// draw the 'muted' pixmap only if the clip was manually muted
 	if( m_clip->isMuted() )
 	{
-		const int spacing = CLIP_BORDER_WIDTH;
+		const int spacing = BORDER_WIDTH;
 		const int size = 14;
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
diff --git a/src/gui/MidiSetupWidget.cpp b/src/gui/MidiSetupWidget.cpp
index 834207057..7298eb558 100644
--- a/src/gui/MidiSetupWidget.cpp
+++ b/src/gui/MidiSetupWidget.cpp
@@ -24,6 +24,7 @@
 
 #include "MidiSetupWidget.h"
 
+#include <QLabel>
 #include <QLineEdit>
 
 #include "ConfigManager.h"
diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp
index 368206bb5..502461b7d 100644
--- a/src/gui/MixerView.cpp
+++ b/src/gui/MixerView.cpp
@@ -22,15 +22,8 @@
  *
  */
 
-#include <QtGlobal>
-#include <QDebug>
 
-#include <QButtonGroup>
-#include <QInputDialog>
 #include <QLayout>
-#include <QMdiArea>
-#include <QMdiSubWindow>
-#include <QPainter>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QStyle>
@@ -45,11 +38,12 @@
 #include "GuiApplication.h"
 #include "MainWindow.h"
 #include "AudioEngine.h"
-#include "gui_templates.h"
 #include "InstrumentTrack.h"
 #include "PatternStore.h"
 #include "SampleTrack.h"
+#include "SendButtonIndicator.h"
 #include "Song.h"
+#include "SubWindow.h"
 #include "TrackContainer.h" // For TrackContainer::TrackList typedef
 
 MixerView::MixerView() :
diff --git a/src/gui/PatternClipView.cpp b/src/gui/PatternClipView.cpp
index 6389e6cb0..30d2096e7 100644
--- a/src/gui/PatternClipView.cpp
+++ b/src/gui/PatternClipView.cpp
@@ -24,16 +24,16 @@
 
 #include "PatternClipView.h"
 
+#include <QApplication>
 #include <QMenu>
 #include <QPainter>
 
-#include "gui_templates.h"
+#include "Engine.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "PatternEditor.h"
+#include "PatternClip.h"
 #include "PatternStore.h"
 #include "RenameDialog.h"
-#include "Song.h"
 #include "ToolTip.h"
 
 PatternClipView::PatternClipView(Clip* _clip, TrackView* _tv) :
@@ -123,9 +123,9 @@ void PatternClipView::paintEvent(QPaintEvent*)
 								x < width() - 2;
 			x += static_cast<int>( t * pixelsPerBar() ) )
 		{
-			p.drawLine( x, CLIP_BORDER_WIDTH, x, CLIP_BORDER_WIDTH + lineSize );
-			p.drawLine( x, rect().bottom() - ( CLIP_BORDER_WIDTH + lineSize ),
-			 	x, rect().bottom() - CLIP_BORDER_WIDTH );
+			p.drawLine( x, BORDER_WIDTH, x, BORDER_WIDTH + lineSize );
+			p.drawLine( x, rect().bottom() - ( BORDER_WIDTH + lineSize ),
+			 	x, rect().bottom() - BORDER_WIDTH );
 		}
 	}
 
@@ -134,8 +134,8 @@ void PatternClipView::paintEvent(QPaintEvent*)
 
 	// inner border
 	p.setPen( c.lighter( 130 ) );
-	p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
-		rect().bottom() - CLIP_BORDER_WIDTH );	
+	p.drawRect( 1, 1, rect().right() - BORDER_WIDTH,
+		rect().bottom() - BORDER_WIDTH );	
 
 	// outer border
 	p.setPen( c.darker( 300 ) );
@@ -144,7 +144,7 @@ void PatternClipView::paintEvent(QPaintEvent*)
 	// draw the 'muted' pixmap only if the clip was manualy muted
 	if (m_patternClip->isMuted())
 	{
-		const int spacing = CLIP_BORDER_WIDTH;
+		const int spacing = BORDER_WIDTH;
 		const int size = 14;
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
diff --git a/src/gui/PatternTrackView.cpp b/src/gui/PatternTrackView.cpp
index 9d8607571..7571cd1db 100644
--- a/src/gui/PatternTrackView.cpp
+++ b/src/gui/PatternTrackView.cpp
@@ -28,6 +28,7 @@
 #include "GuiApplication.h"
 #include "PatternEditor.h"
 #include "PatternStore.h"
+#include "PatternTrack.h"
 #include "TrackLabelButton.h"
 
 PatternTrackView::PatternTrackView(PatternTrack* pt, TrackContainerView* tcv) :
diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp
index 48f0a93da..6f95f1a84 100644
--- a/src/gui/PeakControllerDialog.cpp
+++ b/src/gui/PeakControllerDialog.cpp
@@ -25,19 +25,13 @@
 
 
 #include <QLabel>
-#include <QPushButton>
-#include <QMdiArea>
 #include <QPainter>
+#include <QIcon>
 
-#include "CaptionMenu.h"
-#include "gui_templates.h"
 #include "embed.h"
-#include "MainWindow.h"
 #include "ToolTip.h"
 
 #include "PeakController.h"
-#include "Knob.h"
-#include "TempoSyncKnob.h"
 
 
 PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) :
diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp
index 8771e0588..78962d938 100644
--- a/src/gui/PianoView.cpp
+++ b/src/gui/PianoView.cpp
@@ -44,6 +44,7 @@
 #include <QPainterPath>
 #include <QVBoxLayout>
 
+#include "AutomatableModelView.h"
 #include "PianoView.h"
 #include "Piano.h"
 #include "CaptionMenu.h"
@@ -51,10 +52,8 @@
 #include "Engine.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
-#include "Knob.h"
 #include "Song.h"
 #include "StringPairDrag.h"
-#include "MainWindow.h"
 
 
 /*! The scale of C Major - white keys only.
diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp
index b677638a1..649d6bb56 100644
--- a/src/gui/PluginBrowser.cpp
+++ b/src/gui/PluginBrowser.cpp
@@ -34,7 +34,6 @@
 
 #include "embed.h"
 #include "Engine.h"
-#include "gui_templates.h"
 #include "StringPairDrag.h"
 #include "PluginFactory.h"
 
diff --git a/src/gui/SampleClipView.cpp b/src/gui/SampleClipView.cpp
index 04f3adf55..aff412120 100644
--- a/src/gui/SampleClipView.cpp
+++ b/src/gui/SampleClipView.cpp
@@ -24,12 +24,14 @@
  
 #include "SampleClipView.h"
 
+#include <QApplication>
 #include <QMenu>
 #include <QPainter>
 
 #include "embed.h"
-#include "gui_templates.h"
 #include "PathUtil.h"
+#include "SampleBuffer.h"
+#include "SampleClip.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "ToolTip.h"
@@ -245,9 +247,9 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 		p.setPen(p.pen().brush().color().darker(150));
 	}
 
-	const int spacing = CLIP_BORDER_WIDTH + 1;
+	const int spacing = BORDER_WIDTH + 1;
 	const float ppb = fixedClips() ?
-			( parentWidget()->width() - 2 * CLIP_BORDER_WIDTH )
+			( parentWidget()->width() - 2 * BORDER_WIDTH )
 					/ (float) m_clip->length().getBar() :
 								pixelsPerBar();
 
@@ -268,8 +270,8 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 
 	// inner border
 	p.setPen( c.lighter( 135 ) );
-	p.drawRect( 1, 1, rect().right() - CLIP_BORDER_WIDTH,
-		rect().bottom() - CLIP_BORDER_WIDTH );
+	p.drawRect( 1, 1, rect().right() - BORDER_WIDTH,
+		rect().bottom() - BORDER_WIDTH );
 
 	// outer border
 	p.setPen( c.darker( 200 ) );
@@ -278,7 +280,7 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 	// draw the 'muted' pixmap only if the clip was manualy muted
 	if( m_clip->isMuted() )
 	{
-		const int spacing = CLIP_BORDER_WIDTH;
+		const int spacing = BORDER_WIDTH;
 		const int size = 14;
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
@@ -349,4 +351,4 @@ bool SampleClipView::splitClip( const TimePos pos )
 		return true;
 	}
 	else { return false; }
-}
\ No newline at end of file
+}
diff --git a/src/gui/SampleTrackView.cpp b/src/gui/SampleTrackView.cpp
index afa714518..a73724911 100644
--- a/src/gui/SampleTrackView.cpp
+++ b/src/gui/SampleTrackView.cpp
@@ -24,15 +24,18 @@
  
 #include "SampleTrackView.h"
 
+#include <QApplication>
 #include <QMenu>
 
+#include "ConfigManager.h"
 #include "embed.h"
 #include "Engine.h"
+#include "FadeButton.h"
+#include "Mixer.h"
 #include "MixerView.h"
-#include "gui_templates.h"
 #include "GuiApplication.h"
 #include "Knob.h"
-#include "MainWindow.h"
+#include "SampleClip.h"
 #include "SampleTrackWindow.h"
 #include "StringPairDrag.h"
 #include "TrackContainerView.h"
@@ -228,4 +231,4 @@ void SampleTrackView::assignMixerLine(int channelIndex)
 	model()->mixerChannelModel()->setValue(channelIndex);
 
 	getGUI()->mixerView()->setCurrentMixerLine(channelIndex);
-}
\ No newline at end of file
+}
diff --git a/src/gui/SampleTrackWindow.cpp b/src/gui/SampleTrackWindow.cpp
index 87273461f..0ef22a01d 100644
--- a/src/gui/SampleTrackWindow.cpp
+++ b/src/gui/SampleTrackWindow.cpp
@@ -25,14 +25,22 @@
 #include "SampleTrackWindow.h"
 
 #include <QCloseEvent>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMenu>
+#include <QVBoxLayout>
 
+#include "EffectRackView.h"
 #include "embed.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"
 #include "Knob.h"
 #include "MainWindow.h"
+#include "MixerLineLcdSpinBox.h"
+#include "SampleTrackView.h"
 #include "Song.h"
+#include "SubWindow.h"
 #include "TabWidget.h"
 #include "TrackLabelButton.h"
  
@@ -262,4 +270,4 @@ void SampleTrackWindow::loadSettings(const QDomElement& element)
 	{
 		m_stv->m_tlb->setChecked(true);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index 737fcfca2..50b92befa 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -28,7 +28,6 @@
 #include <QLabel>
 #include <QLayout>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QScrollArea>
 
 #include "AudioDeviceSetupWidget.h"
diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp
index 5cbac4cd6..df3fe0047 100644
--- a/src/gui/SubWindow.cpp
+++ b/src/gui/SubWindow.cpp
@@ -28,10 +28,12 @@
 
 #include "SubWindow.h"
 
+#include <QGraphicsDropShadowEffect>
+#include <QLabel>
 #include <QMdiArea>
 #include <QMoveEvent>
 #include <QPainter>
-#include <QScrollBar>
+#include <QPushButton>
 
 #include "embed.h"
 
diff --git a/src/gui/TimeLineWidget.cpp b/src/gui/TimeLineWidget.cpp
index cf7cbd826..e4a4ba711 100644
--- a/src/gui/TimeLineWidget.cpp
+++ b/src/gui/TimeLineWidget.cpp
@@ -25,8 +25,6 @@
 
 #include <QDomElement>
 #include <QTimer>
-#include <QApplication>
-#include <QLayout>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QToolBar>
@@ -37,7 +35,6 @@
 #include "NStateButton.h"
 #include "GuiApplication.h"
 #include "TextFloat.h"
-#include "SongEditor.h"
 
 
 QPixmap * TimeLineWidget::s_posMarkerPixmap = nullptr;
diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
index 9a5968723..04034074e 100644
--- a/src/gui/TrackContainerView.cpp
+++ b/src/gui/TrackContainerView.cpp
@@ -24,11 +24,8 @@
 
 #include "TrackContainerView.h"
 
-#include <cmath>
 
-#include <QApplication>
 #include <QLayout>
-#include <QMdiArea>
 #include <QScrollBar>
 #include <QWheelEvent>
 
@@ -43,6 +40,7 @@
 #include "PatternTrack.h"
 #include "Song.h"
 #include "StringPairDrag.h"
+#include "TrackView.h"
 #include "GuiApplication.h"
 #include "PluginFactory.h"
 
diff --git a/src/gui/TrackView.cpp b/src/gui/TrackView.cpp
index ba5c17b7a..85c33e8c9 100644
--- a/src/gui/TrackView.cpp
+++ b/src/gui/TrackView.cpp
@@ -27,7 +27,6 @@
 
 #include <QApplication>
 #include <QHBoxLayout>
-#include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QStyleOption>
diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp
index 848a7f52a..79f1ca5e0 100644
--- a/src/gui/dialogs/FileDialog.cpp
+++ b/src/gui/dialogs/FileDialog.cpp
@@ -24,8 +24,8 @@
 
 #include <QList>
 #include <QUrl>
-#include <QDesktopServices>
 #include <QListView>
+#include <QStandardPaths>
 
 #include "ConfigManager.h"
 #include "FileDialog.h"
diff --git a/src/gui/dialogs/VersionedSaveDialog.cpp b/src/gui/dialogs/VersionedSaveDialog.cpp
index b9b229b1c..b471d8766 100644
--- a/src/gui/dialogs/VersionedSaveDialog.cpp
+++ b/src/gui/dialogs/VersionedSaveDialog.cpp
@@ -23,13 +23,11 @@
  */
 
 
-#include <QFontMetrics>
 #include <QLayout>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QGroupBox>
-#include <QLabel>
 
 #include "DeprecationHelper.h"
 #include "VersionedSaveDialog.h"
diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
index 77121e7b9..19de943f5 100644
--- a/src/gui/editors/AutomationEditor.cpp
+++ b/src/gui/editors/AutomationEditor.cpp
@@ -30,10 +30,9 @@
 #include <cmath>
 
 #include <QApplication>
+#include <QInputDialog>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QLayout>
-#include <QMdiArea>
 #include <QPainter>
 #include <QPainterPath>
 #include <QScrollBar>
@@ -53,11 +52,11 @@
 #include "Engine.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
+#include "Knob.h"
 #include "MainWindow.h"
 #include "PatternStore.h"
 #include "PianoRoll.h"
 #include "ProjectJournal.h"
-#include "SongEditor.h"
 #include "StringPairDrag.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp
index dc86a1789..f9ab600bf 100644
--- a/src/gui/editors/Editor.cpp
+++ b/src/gui/editors/Editor.cpp
@@ -26,11 +26,9 @@
 
 #include "Song.h"
 
-#include "MainWindow.h"
 #include "embed.h"
 
 #include <QAction>
-#include <QMdiArea>
 #include <QShortcut>
 #include <QCloseEvent>
 
diff --git a/src/gui/editors/PatternEditor.cpp b/src/gui/editors/PatternEditor.cpp
index 6197373eb..818c454f6 100644
--- a/src/gui/editors/PatternEditor.cpp
+++ b/src/gui/editors/PatternEditor.cpp
@@ -25,9 +25,8 @@
 #include "PatternEditor.h"
 
 #include <QAction>
-#include <QKeyEvent>
-#include <QLayout>
 
+#include "ClipView.h"
 #include "ComboBox.h"
 #include "DataFile.h"
 #include "embed.h"
@@ -36,6 +35,7 @@
 #include "PatternTrack.h"
 #include "Song.h"
 #include "StringPairDrag.h"
+#include "TrackView.h"
 
 #include "MidiClip.h"
 
@@ -236,11 +236,11 @@ PatternEditorWindow::PatternEditorWindow(PatternStore* ps) :
 	// TODO: Use style sheet
 	if (ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt())
 	{
-		setMinimumWidth(TRACK_OP_WIDTH_COMPACT + DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + 2 * CLIP_BORDER_WIDTH + 384);
+		setMinimumWidth(TRACK_OP_WIDTH_COMPACT + DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + 2 * ClipView::BORDER_WIDTH + 384);
 	}
 	else
 	{
-		setMinimumWidth(TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH + 2 * CLIP_BORDER_WIDTH + 384);
+		setMinimumWidth(TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH + 2 * ClipView::BORDER_WIDTH + 384);
 	}
 
 	m_playAction->setToolTip(tr("Play/pause current pattern (Space)"));
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index fc12c1b63..bafede415 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -26,26 +26,26 @@
 
 #include "PianoRoll.h"
 
+#include <QtMath>
 #include <QApplication>
-#include <QClipboard>
+#include <QHBoxLayout>
+#include <QInputDialog>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QLayout>
 #include <QMargins>
-#include <QMdiArea>
 #include <QMessageBox>
 #include <QPainter>
 #include <QPointer>
+#include <QPushButton>
 #include <QScrollBar>
 #include <QStyleOption>
-#include <QtMath>
 #include <QToolButton>
 
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
+#include <cmath>
 #include <utility>
 
 #include "AutomationEditor.h"
@@ -65,6 +65,7 @@
 #include "MidiClip.h"
 #include "PatternStore.h"
 #include "PianoView.h"
+#include "PositionLine.h"
 #include "SongEditor.h"
 #include "StepRecorderWidget.h"
 #include "TextFloat.h"
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 8a2eda92f..3c9d108f1 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -27,16 +27,15 @@
 #include <QAction>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QLayout>
 #include <QMdiArea>
-#include <QMdiSubWindow>
-#include <QPainter>
 #include <QScrollBar>
 #include <QTimeLine>
 
+#include "ActionGroup.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
 #include "AutomatableSlider.h"
+#include "ClipView.h"
 #include "ComboBox.h"
 #include "ConfigManager.h"
 #include "CPULoadWidget.h"
@@ -48,11 +47,13 @@
 #include "MeterDialog.h"
 #include "Oscilloscope.h"
 #include "PianoRoll.h"
+#include "PositionLine.h"
+#include "SubWindow.h"
 #include "TextFloat.h"
 #include "TimeDisplayWidget.h"
 #include "TimeLineWidget.h"
 #include "ToolTip.h"
-#include "Track.h"
+#include "TrackView.h"
 
 const QVector<float> SongEditor::m_zoomLevels =
 		{ 0.125f, 0.25f, 0.5f, 1.0f, 2.0f, 4.0f, 8.0f, 16.0f };
diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp
index 80df31913..80d127877 100644
--- a/src/gui/widgets/AutomatableButton.cpp
+++ b/src/gui/widgets/AutomatableButton.cpp
@@ -28,7 +28,6 @@
 #include <QMouseEvent>
 
 #include "CaptionMenu.h"
-#include "MainWindow.h"
 #include "StringPairDrag.h"
 
 
diff --git a/src/gui/widgets/AutomatableSlider.cpp b/src/gui/widgets/AutomatableSlider.cpp
index cd162a057..f44732de1 100644
--- a/src/gui/widgets/AutomatableSlider.cpp
+++ b/src/gui/widgets/AutomatableSlider.cpp
@@ -28,7 +28,6 @@
 #include <QMouseEvent>
 
 #include "CaptionMenu.h"
-#include "MainWindow.h"
 
 
 
diff --git a/src/gui/widgets/CaptionMenu.cpp b/src/gui/widgets/CaptionMenu.cpp
index d58879d4d..bfd743d0d 100644
--- a/src/gui/widgets/CaptionMenu.cpp
+++ b/src/gui/widgets/CaptionMenu.cpp
@@ -24,7 +24,6 @@
 
 
 #include "CaptionMenu.h"
-#include "embed.h"
 
 
 
diff --git a/src/gui/widgets/ComboBox.cpp b/src/gui/widgets/ComboBox.cpp
index 9f18bb7cd..181256b96 100644
--- a/src/gui/widgets/ComboBox.cpp
+++ b/src/gui/widgets/ComboBox.cpp
@@ -35,7 +35,6 @@
 #include "CaptionMenu.h"
 #include "embed.h"
 #include "gui_templates.h"
-#include "MainWindow.h"
 
 
 QPixmap * ComboBox::s_background = nullptr;
diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp
index d6b7cc410..2b597e1c2 100644
--- a/src/gui/widgets/ControllerRackView.cpp
+++ b/src/gui/widgets/ControllerRackView.cpp
@@ -24,21 +24,19 @@
  */
 
 #include <QApplication>
-#include <QLayout>
-#include <QMdiSubWindow>
 #include <QPushButton>
 #include <QScrollArea>
-#include <QMdiArea>
 #include <QMessageBox>
+#include <QVBoxLayout>
 
 #include "Song.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "GroupBox.h"
 #include "ControllerRackView.h"
 #include "ControllerView.h"
 #include "LfoController.h"
+#include "SubWindow.h"
 
 
 ControllerRackView::ControllerRackView( ) :
diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp
index a0cdf0893..a3b1a7934 100644
--- a/src/gui/widgets/ControllerView.cpp
+++ b/src/gui/widgets/ControllerView.cpp
@@ -26,22 +26,19 @@
 
 #include <QLabel>
 #include <QPushButton>
+#include <QHBoxLayout>
 #include <QMdiArea>
-#include <QMdiSubWindow>
-#include <QPainter>
 #include <QInputDialog>
-#include <QLayout>
+#include <QVBoxLayout>
 
 #include "ControllerView.h"
 
 #include "CaptionMenu.h"
 #include "ControllerDialog.h"
-#include "gui_templates.h"
 #include "embed.h"
 #include "GuiApplication.h"
-#include "LedCheckbox.h"
 #include "MainWindow.h"
-#include "ToolTip.h"
+#include "SubWindow.h"
 
 
 ControllerView::ControllerView( Controller * _model, QWidget * _parent ) :
diff --git a/src/gui/widgets/EffectRackView.cpp b/src/gui/widgets/EffectRackView.cpp
index def51123b..f6bac18e2 100644
--- a/src/gui/widgets/EffectRackView.cpp
+++ b/src/gui/widgets/EffectRackView.cpp
@@ -24,9 +24,9 @@
  */
 
 #include <QApplication>
-#include <QLayout>
 #include <QPushButton>
 #include <QScrollArea>
+#include <QVBoxLayout>
 
 #include "EffectRackView.h"
 #include "EffectSelectDialog.h"
diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp
index b99fdf349..ef6db867f 100644
--- a/src/gui/widgets/EffectView.cpp
+++ b/src/gui/widgets/EffectView.cpp
@@ -23,10 +23,7 @@
  *
  */
 
-#include <QLabel>
 #include <QPushButton>
-#include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QPainter>
 #include <QLayout>
 
@@ -39,6 +36,7 @@
 #include "Knob.h"
 #include "LedCheckbox.h"
 #include "MainWindow.h"
+#include "SubWindow.h"
 #include "TempoSyncKnob.h"
 #include "ToolTip.h"
 
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 17a97e898..f569aa550 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -55,7 +55,6 @@
 #include "CaptionMenu.h"
 #include "ConfigManager.h"
 #include "TextFloat.h"
-#include "MainWindow.h"
 
 
 TextFloat * Fader::s_textFloat = nullptr;
diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp
index 350b07f03..71e8375ee 100644
--- a/src/gui/widgets/Graph.cpp
+++ b/src/gui/widgets/Graph.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include <QPaintEvent>
-#include <QFontMetrics>
 #include <QPainter>
 
 #include "Graph.h"
diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp
index feba2a332..c10b7d349 100644
--- a/src/gui/widgets/InstrumentFunctionViews.cpp
+++ b/src/gui/widgets/InstrumentFunctionViews.cpp
@@ -22,8 +22,9 @@
  *
  */
 
+#include <QGridLayout>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QLayout>
 
 #include "InstrumentFunctions.h"
 #include "InstrumentFunctionViews.h"
diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp
index 724f835f0..c85ee75be 100644
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -22,10 +22,10 @@
  *
  */
 
-#include <QMenu>
 #include <QToolButton>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QLayout>
+#include <QVBoxLayout>
 
 #include "InstrumentMidiIOView.h"
 #include "MidiPortMenu.h"
@@ -36,8 +36,6 @@
 #include "gui_templates.h"
 #include "LcdSpinBox.h"
 #include "MidiClient.h"
-#include "InstrumentTrack.h"
-#include "LedCheckbox.h"
 
 
 InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
diff --git a/src/gui/widgets/InstrumentMiscView.cpp b/src/gui/widgets/InstrumentMiscView.cpp
index 81f77a882..af5dd37e3 100644
--- a/src/gui/widgets/InstrumentMiscView.cpp
+++ b/src/gui/widgets/InstrumentMiscView.cpp
@@ -25,8 +25,9 @@
 
 #include "InstrumentMiscView.h"
 
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QLayout>
+#include <QVBoxLayout>
 
 #include "ComboBox.h"
 #include "GroupBox.h"
diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
index 0c98734d2..96ef6fec8 100644
--- a/src/gui/widgets/Knob.cpp
+++ b/src/gui/widgets/Knob.cpp
@@ -24,7 +24,6 @@
 
 #include <memory>
 #include <QApplication>
-#include <QBitmap>
 #include <QFontMetrics>
 #include <QInputDialog>
 #include <QMouseEvent>
@@ -46,7 +45,6 @@
 #include "LocaleHelper.h"
 #include "MainWindow.h"
 #include "ProjectJournal.h"
-#include "Song.h"
 #include "StringPairDrag.h"
 #include "TextFloat.h"
 
diff --git a/src/gui/widgets/LadspaControlView.cpp b/src/gui/widgets/LadspaControlView.cpp
index e04a52351..bed39cca7 100644
--- a/src/gui/widgets/LadspaControlView.cpp
+++ b/src/gui/widgets/LadspaControlView.cpp
@@ -23,7 +23,8 @@
  *
  */
 
-#include <QLayout>
+
+#include <QHBoxLayout>
 
 #include "LadspaControl.h"
 #include "LadspaControlView.h"
diff --git a/src/gui/widgets/LcdFloatSpinBox.cpp b/src/gui/widgets/LcdFloatSpinBox.cpp
index a28d54b9b..22b4d5509 100644
--- a/src/gui/widgets/LcdFloatSpinBox.cpp
+++ b/src/gui/widgets/LcdFloatSpinBox.cpp
@@ -28,14 +28,13 @@
 
 #include <cmath>
 
-#include <QApplication>
 #include <QHBoxLayout>
 #include <QInputDialog>
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPixmap>
-#include <QStyleOptionFrameV2>
+#include <QStyleOptionFrame>
 #include <QVBoxLayout>
 
 #include "CaptionMenu.h"
diff --git a/src/gui/widgets/LcdSpinBox.cpp b/src/gui/widgets/LcdSpinBox.cpp
index 40b3717e8..ef0d08aae 100644
--- a/src/gui/widgets/LcdSpinBox.cpp
+++ b/src/gui/widgets/LcdSpinBox.cpp
@@ -24,17 +24,11 @@
  */
 
 #include <cmath>
-#include <QApplication>
-#include <QLabel>
 #include <QMouseEvent>
-#include <QPainter>
-#include <QStyleOptionFrameV2>
 #include <QInputDialog>
 
 #include "LcdSpinBox.h"
 #include "CaptionMenu.h"
-#include "GuiApplication.h"
-#include "MainWindow.h"
 
 
 
diff --git a/src/gui/widgets/LcdWidget.cpp b/src/gui/widgets/LcdWidget.cpp
index 1fefe3dd0..c947f7720 100644
--- a/src/gui/widgets/LcdWidget.cpp
+++ b/src/gui/widgets/LcdWidget.cpp
@@ -25,17 +25,13 @@
 
 
 
-#include <QApplication>
-#include <QLabel>
-#include <QMouseEvent>
+#include <QStyleOptionFrame>
 #include <QPainter>
-#include <QStyleOptionFrameV2>
 
 #include "LcdWidget.h"
 #include "DeprecationHelper.h"
 #include "embed.h"
 #include "gui_templates.h"
-#include "MainWindow.h"
 
 
 
diff --git a/src/gui/widgets/LeftRightNav.cpp b/src/gui/widgets/LeftRightNav.cpp
index 2502a0405..8d614fa3e 100644
--- a/src/gui/widgets/LeftRightNav.cpp
+++ b/src/gui/widgets/LeftRightNav.cpp
@@ -23,6 +23,8 @@
  */
 
 
+#include <QHBoxLayout>
+
 #include "LeftRightNav.h"
 #include "ToolTip.h"
 #include "embed.h"
@@ -88,4 +90,4 @@ void LeftRightNav::setShortcuts(const QKeySequence &leftShortcut, const QKeySequ
 
 	ToolTip::add(&m_leftBtn, tr("Previous (%1)").arg(leftShortcut.toString()));
 	ToolTip::add(&m_rightBtn, tr("Next (%1)").arg(rightShortcut.toString()));
-}
\ No newline at end of file
+}
diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp
index b1e3ffad4..10153c632 100644
--- a/src/gui/widgets/MeterDialog.cpp
+++ b/src/gui/widgets/MeterDialog.cpp
@@ -24,9 +24,9 @@
  */
 
 
-#include <QLayout>
-#include <QPushButton>
+#include <QHBoxLayout>
 #include <QLabel>
+#include <QVBoxLayout>
 
 #include "MeterDialog.h"
 #include "MeterModel.h"
diff --git a/src/gui/widgets/MicrotunerConfig.cpp b/src/gui/widgets/MicrotunerConfig.cpp
index 9646e2f3a..307369a19 100644
--- a/src/gui/widgets/MicrotunerConfig.cpp
+++ b/src/gui/widgets/MicrotunerConfig.cpp
@@ -27,7 +27,9 @@
 #include <QFile>
 #include <QGridLayout>
 #include <QLabel>
+#include <QLineEdit>
 #include <QMessageBox>
+#include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegExp>
 #include <QTextStream>
@@ -37,12 +39,16 @@
 #include "Engine.h"
 #include "FileDialog.h"
 #include "GuiApplication.h"
-#include "Knob.h"
+#include "Keymap.h"
+#include "LcdFloatSpinBox.h"
 #include "LcdSpinBox.h"
 #include "lmms_constants.h"
 #include "lmmsversion.h"
 #include "MainWindow.h"
+#include "Note.h"
+#include "Scale.h"
 #include "Song.h"
+#include "SubWindow.h"
 
 
 MicrotunerConfig::MicrotunerConfig() :
diff --git a/src/gui/widgets/MixerLine.cpp b/src/gui/widgets/MixerLine.cpp
index 95e64a6b6..6c0cc5bc3 100644
--- a/src/gui/widgets/MixerLine.cpp
+++ b/src/gui/widgets/MixerLine.cpp
@@ -28,11 +28,20 @@
 #include <cstdlib>
 
 #include <QGraphicsProxyWidget>
+#include <QGraphicsView>
+#include <QLineEdit>
+#include <QPainter>
 
 #include "CaptionMenu.h"
+#include "ColorChooser.h"
+#include "embed.h"
+#include "Knob.h"
+#include "LcdWidget.h"
 #include "Mixer.h"
+#include "MixerView.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"
+#include "SendButtonIndicator.h"
 #include "Song.h"
 
 bool MixerLine::eventFilter( QObject *dist, QEvent *event )
diff --git a/src/gui/widgets/PixmapButton.cpp b/src/gui/widgets/PixmapButton.cpp
index f792fcac7..9bedfe1b5 100644
--- a/src/gui/widgets/PixmapButton.cpp
+++ b/src/gui/widgets/PixmapButton.cpp
@@ -28,7 +28,6 @@
 #include <QPainter>
 
 #include "PixmapButton.h"
-#include "MainWindow.h"
 #include "embed.h"
 
 
diff --git a/src/gui/widgets/PositionLine.cpp b/src/gui/widgets/PositionLine.cpp
index a18e9cb8b..c91a82abe 100644
--- a/src/gui/widgets/PositionLine.cpp
+++ b/src/gui/widgets/PositionLine.cpp
@@ -26,7 +26,6 @@
 
 #include <QPainter>
 
-#include "GuiApplication.h"
 #include "Song.h"
 
 
diff --git a/src/gui/widgets/ProjectNotes.cpp b/src/gui/widgets/ProjectNotes.cpp
index 6fac73208..428720ee9 100644
--- a/src/gui/widgets/ProjectNotes.cpp
+++ b/src/gui/widgets/ProjectNotes.cpp
@@ -27,6 +27,7 @@
 
 #include <QAction>
 #include <QApplication>
+#include <QCloseEvent>
 #include <QColorDialog>
 #include <QComboBox>
 #include <QFontDatabase>
diff --git a/src/gui/widgets/SendButtonIndicator.cpp b/src/gui/widgets/SendButtonIndicator.cpp
index 6f081669f..6772f6289 100644
--- a/src/gui/widgets/SendButtonIndicator.cpp
+++ b/src/gui/widgets/SendButtonIndicator.cpp
@@ -1,6 +1,9 @@
 #include "SendButtonIndicator.h"
 
+#include "embed.h"
 #include "Mixer.h"
+#include "MixerLine.h"
+#include "MixerView.h"
 
 QPixmap * SendButtonIndicator::s_qpmOff = nullptr;
 QPixmap * SendButtonIndicator::s_qpmOn = nullptr;
diff --git a/src/gui/widgets/SideBarWidget.cpp b/src/gui/widgets/SideBarWidget.cpp
index 41647a4fd..ab827f8d1 100644
--- a/src/gui/widgets/SideBarWidget.cpp
+++ b/src/gui/widgets/SideBarWidget.cpp
@@ -24,9 +24,9 @@
 
 #include "SideBarWidget.h"
 
-#include <QApplication>
 #include <QFontMetrics>
 #include <QPainter>
+#include <QPushButton>
 
 #include "embed.h"
 
diff --git a/src/gui/widgets/StepRecorderWidget.cpp b/src/gui/widgets/StepRecorderWidget.cpp
index 65deb0d0a..679901b0e 100644
--- a/src/gui/widgets/StepRecorderWidget.cpp
+++ b/src/gui/widgets/StepRecorderWidget.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include <QPainter>
+
 #include "StepRecorderWidget.h"
 #include "TextFloat.h"
 #include "embed.h"
diff --git a/src/gui/widgets/TempoSyncKnob.cpp b/src/gui/widgets/TempoSyncKnob.cpp
index a141c0003..bb4faea26 100644
--- a/src/gui/widgets/TempoSyncKnob.cpp
+++ b/src/gui/widgets/TempoSyncKnob.cpp
@@ -34,6 +34,7 @@
 #include "MainWindow.h"
 #include "MeterDialog.h"
 #include "Song.h"
+#include "SubWindow.h"
 
 
 
diff --git a/src/gui/widgets/ToolTip.cpp b/src/gui/widgets/ToolTip.cpp
index 81f963edb..95dde8344 100644
--- a/src/gui/widgets/ToolTip.cpp
+++ b/src/gui/widgets/ToolTip.cpp
@@ -23,7 +23,8 @@
  */
 
 
-#include <QToolTip>
+
+#include <QWidget>
 
 #include "ToolTip.h"
 #include "ConfigManager.h"
diff --git a/src/gui/widgets/TrackLabelButton.cpp b/src/gui/widgets/TrackLabelButton.cpp
index 361db740e..3388fe9fb 100644
--- a/src/gui/widgets/TrackLabelButton.cpp
+++ b/src/gui/widgets/TrackLabelButton.cpp
@@ -26,7 +26,6 @@
 
 #include "TrackLabelButton.h"
 
-#include <QApplication>
 #include <QMouseEvent>
 
 #include "ConfigManager.h"
@@ -37,6 +36,7 @@
 #include "RenameDialog.h"
 #include "Song.h"
 #include "TrackRenameLineEdit.h"
+#include "TrackView.h"
 
 
 
diff --git a/src/lmmsconfig.h.in b/src/lmmsconfig.h.in
index d58c9705d..f76bae469 100644
--- a/src/lmmsconfig.h.in
+++ b/src/lmmsconfig.h.in
@@ -35,8 +35,6 @@
 
 #cmakedefine LMMS_DEBUG_FPE
 
-#cmakedefine LMMS_HAVE_STDINT_H
-#cmakedefine LMMS_HAVE_STDLIB_H
 #cmakedefine LMMS_HAVE_PTHREAD_H
 #cmakedefine LMMS_HAVE_UNISTD_H
 #cmakedefine LMMS_HAVE_SYS_TYPES_H
diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp
index dfdbb32ee..65d34b884 100644
--- a/src/tracks/AutomationTrack.cpp
+++ b/src/tracks/AutomationTrack.cpp
@@ -24,6 +24,8 @@
  *
  */
 
+#include "AutomationTrack.h"
+
 #include "AutomationTrackView.h"
 #include "AutomationClip.h"
 
@@ -76,4 +78,4 @@ void AutomationTrack::loadTrackSpecificSettings( const QDomElement & _this )
 	{
 		setMuted( false );
 	}
-}
\ No newline at end of file
+}
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index 0932404d8..5b25a6b56 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -31,11 +31,13 @@
 #include "Mixer.h"
 #include "InstrumentTrackView.h"
 #include "Instrument.h"
+#include "Keymap.h"
 #include "MidiClient.h"
 #include "MidiClip.h"
 #include "MixHelpers.h"
 #include "PatternStore.h"
 #include "PatternTrack.h"
+#include "Pitch.h"
 #include "Song.h"
 
 
diff --git a/src/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp
index 70c78e9a8..7a5fb657d 100644
--- a/src/tracks/MidiClip.cpp
+++ b/src/tracks/MidiClip.cpp
@@ -25,12 +25,14 @@
 
 #include "MidiClip.h"
 
+#include <QDomElement>
+
 #include "GuiApplication.h"
 #include "InstrumentTrack.h"
+#include "MidiClipView.h"
 #include "PatternStore.h"
 #include "PianoRoll.h"
 
-#include <limits>
 
 
 QPixmap * MidiClipView::s_stepBtnOn0 = nullptr;
diff --git a/src/tracks/PatternTrack.cpp b/src/tracks/PatternTrack.cpp
index f5f5efa29..243c9d3af 100644
--- a/src/tracks/PatternTrack.cpp
+++ b/src/tracks/PatternTrack.cpp
@@ -24,12 +24,13 @@
 #include "PatternTrack.h"
 
 #include <QDomElement>
-#include <QMenu>
-#include <QPainter>
 
+#include "AudioEngine.h"
+#include "Engine.h"
+#include "PatternClip.h"
 #include "PatternStore.h"
 #include "PatternTrackView.h"
-#include "Song.h"
+#include "PlayHandle.h"
 
 
 
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index 9c8ac4310..b1fd4c406 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -27,11 +27,17 @@
 
 #include <QDomElement>
 
+#include "EffectChain.h"
+#include "Mixer.h"
+#include "panning_constants.h"
 #include "PatternStore.h"
 #include "PatternTrack.h"
+#include "SampleClip.h"
 #include "SamplePlayHandle.h"
 #include "SampleRecordHandle.h"
+#include "SampleTrackView.h"
 #include "Song.h"
+#include "volume.h"
 
 
 
diff --git a/tests/QTestSuite.h b/tests/QTestSuite.h
index 05ae1fb66..e0bd164ed 100644
--- a/tests/QTestSuite.h
+++ b/tests/QTestSuite.h
@@ -1,7 +1,7 @@
 #ifndef QTESTSUITE_H
 #define QTESTSUITE_H
 
-#include <QtTest/QTest>
+#include <QTest>
 #include <QObject>
 #include <QList>
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 7b07778fc..b2c21b79a 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,6 +1,6 @@
 #include "QTestSuite.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include <QDebug>
 
diff --git a/tests/src/tracks/AutomationTrackTest.cpp b/tests/src/tracks/AutomationTrackTest.cpp
index 8b44bbd90..5adafbb0f 100644
--- a/tests/src/tracks/AutomationTrackTest.cpp
+++ b/tests/src/tracks/AutomationTrackTest.cpp
@@ -31,6 +31,7 @@
 #include "DetuningHelper.h"
 #include "InstrumentTrack.h"
 #include "MidiClip.h"
+#include "PatternClip.h"
 #include "PatternTrack.h"
 #include "PatternStore.h"
 #include "TrackContainer.h"