diff --git a/include/BufferManager.h b/include/BufferManager.h
index 53fe26217..db1895fd7 100644
--- a/include/BufferManager.h
+++ b/include/BufferManager.h
@@ -30,8 +30,6 @@
 #include "export.h"
 #include "lmms_basics.h"
 
-class QAtomicInt;
-
 const int BM_INITIAL_BUFFERS = 512;
 //const int BM_INCREMENT = 64;
 
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
index 38c9b2132..c5ef45b34 100644
--- a/include/ConfigManager.h
+++ b/include/ConfigManager.h
@@ -35,7 +35,6 @@
 
 #include "export.h"
 #include "MemoryManager.h"
-#include "lmmsversion.h"
 
 class LmmsCore;
 
@@ -135,10 +134,7 @@ public:
 		return dataDir() + SAMPLES_PATH;
 	}
 
-	QString defaultVersion() const
-	{
-		return LMMS_VERSION;
-	}
+	QString defaultVersion() const;
 
 	QString defaultArtworkDir() const
 	{
diff --git a/include/Engine.h b/include/Engine.h
index 309b036c4..2f940dfbf 100644
--- a/include/Engine.h
+++ b/include/Engine.h
@@ -26,7 +26,6 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
diff --git a/include/Instrument.h b/include/Instrument.h
index 56e724eb9..9dd68ef98 100644
--- a/include/Instrument.h
+++ b/include/Instrument.h
@@ -27,7 +27,6 @@
 #define INSTRUMENT_H
 
 #include <QString>
-#include <QtGlobal>
 #include "export.h"
 #include "lmms_basics.h"
 #include "MemoryManager.h"
diff --git a/include/Mixer.h b/include/Mixer.h
index d25da0d6b..c0c209564 100644
--- a/include/Mixer.h
+++ b/include/Mixer.h
@@ -25,10 +25,6 @@
 #ifndef MIXER_H
 #define MIXER_H
 
-#include "denormals.h"
-
-#include "lmmsconfig.h"
-
 #include <QtCore/QMutex>
 #include <QtCore/QThread>
 #include <QtCore/QVector>
diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h
index 9a642fbc3..bf5c266ca 100644
--- a/include/NotePlayHandle.h
+++ b/include/NotePlayHandle.h
@@ -32,7 +32,6 @@
 #include "Track.h"
 #include "MemoryManager.h"
 
-class QAtomicInt;
 class QReadWriteLock;
 class InstrumentTrack;
 class NotePlayHandle;
diff --git a/include/PeakController.h b/include/PeakController.h
index 811b03525..39d7fded9 100644
--- a/include/PeakController.h
+++ b/include/PeakController.h
@@ -25,15 +25,12 @@
 #ifndef PEAK_CONTROLLER_H
 #define PEAK_CONTROLLER_H
 
-#include <QWidget>
-
 #include "Model.h"
-#include "AutomatableModel.h"
 #include "Controller.h"
 #include "ControllerDialog.h"
 
-class automatableButtonGroup;
-class Knob;
+class QWidget;
+
 class PeakControllerEffect;
 
 typedef QVector<PeakControllerEffect *> PeakControllerEffectVector;
diff --git a/include/PlayHandle.h b/include/PlayHandle.h
index a9eb2ccde..1093607fb 100644
--- a/include/PlayHandle.h
+++ b/include/PlayHandle.h
@@ -25,13 +25,14 @@
 #ifndef PLAY_HANDLE_H
 #define PLAY_HANDLE_H
 
-#include <QtCore/QThread>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QMutex>
 
 #include "ThreadableJob.h"
 #include "lmms_basics.h"
 
+class QThread;
+
 class Track;
 class AudioPort;
 
diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index 921b6a7a0..66f4ec873 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -28,8 +28,6 @@
 
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QObject>
-#include <QtCore/QRect>
-#include <QtCore/QWriteLocker>
 
 #include <samplerate.h>
 
@@ -42,6 +40,7 @@
 
 
 class QPainter;
+class QRect;
 
 // values for buffer margins, used for various libsamplerate interpolation modes
 // the array positions correspond to the converter_type parameter values in libsamplerate
diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h
index 60c108ed1..bf6ada409 100644
--- a/include/TrackContainerView.h
+++ b/include/TrackContainerView.h
@@ -29,7 +29,7 @@
 #include <QtCore/QVector>
 #include <QScrollArea>
 #include <QWidget>
-
+#include <QThread>
 
 #include "Track.h"
 #include "JournallingObject.h"
diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h
index 9dbb636c9..1e714d455 100644
--- a/include/ValueBuffer.h
+++ b/include/ValueBuffer.h
@@ -26,10 +26,10 @@
 #ifndef VALUE_BUFFER_H
 #define VALUE_BUFFER_H
 
-#include <QtGlobal>
-#include "interpolation.h"
-#include <string.h>
+#include <vector>
+
 #include "MemoryManager.h"
+#include "export.h"
 
 class EXPORT ValueBuffer : public std::vector<float>
 {
diff --git a/plugins/Eq/EqParameterWidget.cpp b/plugins/Eq/EqParameterWidget.cpp
index 8ed5a2cdf..4ccdfbb2f 100644
--- a/plugins/Eq/EqParameterWidget.cpp
+++ b/plugins/Eq/EqParameterWidget.cpp
@@ -28,7 +28,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMouseEvent>
-#include <QPainter>
 #include <QWidget>
 
 #include "EqControls.h"
diff --git a/plugins/LadspaEffect/LadspaControlDialog.cpp b/plugins/LadspaEffect/LadspaControlDialog.cpp
index 73bf982de..f58ccb55b 100644
--- a/plugins/LadspaEffect/LadspaControlDialog.cpp
+++ b/plugins/LadspaEffect/LadspaControlDialog.cpp
@@ -24,6 +24,7 @@
  *
  */
 
+#include <cmath>
 
 #include <QGroupBox>
 #include <QLayout>
diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
index e9724f0bb..05b1ed08a 100644
--- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
+++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include <cmath>
+
 #include <QLayout>
 #include <QPainter>
 
diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
index b6d90acec..2fdb8e459 100644
--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -32,6 +32,7 @@
 #include <samplerate.h>
 
 #include "audio_file_processor.h"
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "Song.h"
 #include "InstrumentTrack.h"
diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp
index 6a504b36c..1b385e465 100644
--- a/plugins/nes/Nes.cpp
+++ b/plugins/nes/Nes.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <QDomElement>
 
 #include "Nes.h"
diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h
index def8a2be6..20f703739 100644
--- a/plugins/nes/Nes.h
+++ b/plugins/nes/Nes.h
@@ -25,6 +25,8 @@
 #ifndef NES_H
 #define NES_H
 
+#include <cmath>
+
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "AutomatableModel.h"
diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp
index 1284f9073..0f2035696 100644
--- a/plugins/papu/papu_instrument.cpp
+++ b/plugins/papu/papu_instrument.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include <cmath>
 
 #include <QPainter>
 #include <QDomElement>
diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
index bfd6c6629..60cd6210c 100644
--- a/plugins/patman/patman.cpp
+++ b/plugins/patman/patman.cpp
@@ -39,6 +39,7 @@
 #include "StringPairDrag.h"
 #include "ToolTip.h"
 #include "FileDialog.h"
+#include "ConfigManager.h"
 
 #include "embed.cpp"
 
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 93ec44775..9f1796503 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -28,6 +28,7 @@
 #include <QLabel>
 #include <QDomDocument>
 
+#include "ConfigManager.h"
 #include "FileDialog.h"
 #include "sf2_player.h"
 #include "Engine.h"
diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp
index b4e266ffa..b0222a0b1 100644
--- a/plugins/sfxr/sfxr.cpp
+++ b/plugins/sfxr/sfxr.cpp
@@ -35,6 +35,7 @@ float frnd(float range)
 	return (float)rnd(10000)/10000*range;
 }
 
+#include <cmath>
 
 #include <QDomElement>
 
diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp
index 5cee41d23..b2a52ace8 100644
--- a/plugins/sid/sid_instrument.cpp
+++ b/plugins/sid/sid_instrument.cpp
@@ -27,6 +27,7 @@
 #include <QPainter>
 #include <QDomElement>
 
+#include <cmath>
 #include <cstdio>
 
 #include "sid.h"
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index 1f585e131..5e5f35ffc 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -33,6 +33,7 @@
 #include "ModalBar.h"
 #include "TubeBell.h"
 
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index d59f55f0d..47da5147c 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -32,6 +32,7 @@
 #include <QPushButton>
 
 #include "ZynAddSubFx.h"
+#include "ConfigManager.h"
 #include "Engine.h"
 #include "Knob.h"
 #include "LedCheckbox.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e6b52234..32bdc1788 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -96,6 +96,9 @@ IF(CMAKE_VERSION VERSION_GREATER "2.8.7")
 		$<TARGET_OBJECTS:lmmsobjs>
 		"${WINRC}"
 	)
+
+    SET(iwyu include-what-you-use -Xiwyu --mapping_file=/usr/share/include-what-you-use/qt5_4.imp)
+    #SET_PROPERTY(TARGET lmmsobjs PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu})
 ELSE()
 	ADD_EXECUTABLE(lmms
 		core/main.cpp
diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
index 8c839c716..a5654ae71 100644
--- a/src/core/AutomatableModel.cpp
+++ b/src/core/AutomatableModel.cpp
@@ -24,9 +24,10 @@
 
 #include "AutomatableModel.h"
 
+#include "lmms_math.h"
+
 #include "AutomationPattern.h"
 #include "ControllerConnection.h"
-#include "lmms_math.h"
 #include "Mixer.h"
 #include "ProjectJournal.h"
 
diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp
index d800b97c7..ffe13ff40 100644
--- a/src/core/AutomationPattern.cpp
+++ b/src/core/AutomationPattern.cpp
@@ -32,7 +32,8 @@
 #include "ProjectJournal.h"
 #include "BBTrackContainer.h"
 #include "Song.h"
-#include "embed.h"
+
+#include <cmath>
 
 int AutomationPattern::s_quantization = 1;
 const float AutomationPattern::DEFAULT_MIN_VALUE = 0;
diff --git a/src/core/BandLimitedWave.cpp b/src/core/BandLimitedWave.cpp
index 8d6c44936..0f83badcf 100644
--- a/src/core/BandLimitedWave.cpp
+++ b/src/core/BandLimitedWave.cpp
@@ -27,8 +27,6 @@
 
 #include <QDataStream>
 
-#include "ConfigManager.h"
-
 WaveMipMap BandLimitedWave::s_waveforms[4] = {  };
 bool BandLimitedWave::s_wavesGenerated = false;
 QString BandLimitedWave::s_wavetableDir = "";
diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp
index 1942d2116..572bff7d9 100644
--- a/src/core/BufferManager.cpp
+++ b/src/core/BufferManager.cpp
@@ -25,9 +25,6 @@
 
 #include "BufferManager.h"
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QAtomicInt>
-
 #include "MemoryManager.h"
 
 sampleFrame ** BufferManager::s_available;
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index e8f263ade..5cdfe3d97 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -24,8 +24,6 @@
 
 #include <QDomElement>
 #include <QDir>
-#include <QFile>
-#include <QFileInfo>
 #include <QMessageBox>
 #include <QApplication>
 #include <QtCore/QTextStream>
@@ -35,6 +33,7 @@
 #include "ProjectVersion.h"
 #include "GuiApplication.h"
 
+#include "lmmsversion.h"
 
 static inline QString ensureTrailingSlash( const QString & s )
 {
@@ -177,6 +176,11 @@ void ConfigManager::upgrade()
 	m_version = LMMS_VERSION;
 }
 
+QString ConfigManager::defaultVersion() const
+{
+	return LMMS_VERSION;
+}
+
 bool ConfigManager::hasWorkingDir() const
 {
 	return QDir( m_workingDir ).exists();
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 3f56fbdcd..1293081fb 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -30,9 +30,7 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
-#include "Controller.h"
 #include "ControllerConnection.h"
 #include "ControllerDialog.h"
 #include "LfoController.h"
diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp
index dfd06bc32..280ed709c 100644
--- a/src/core/ControllerConnection.cpp
+++ b/src/core/ControllerConnection.cpp
@@ -29,7 +29,6 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "ControllerConnection.h"
 
 
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 448976023..398fd8ad2 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -32,20 +32,19 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
-#include <QTextStream>
 
 #include "base64.h"
 #include "ConfigManager.h"
 #include "Effect.h"
 #include "embed.h"
 #include "GuiApplication.h"
-#include "lmms_basics.h"
-#include "lmmsversion.h"
 #include "PluginFactory.h"
 #include "ProjectVersion.h"
 #include "SongEditor.h"
 #include "TextFloat.h"
 
+#include "lmmsversion.h"
+
 static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
 
 
diff --git a/src/core/DrumSynth.cpp b/src/core/DrumSynth.cpp
index 7481b7400..fd0695557 100644
--- a/src/core/DrumSynth.cpp
+++ b/src/core/DrumSynth.cpp
@@ -28,11 +28,8 @@
 
 #include <fstream>
 #include <cstring>
-#include <limits>
 
 #include <math.h>     //sin(), exp(), etc.
-#include <stdio.h>    //sscanf(), sprintf()
-#include <stdlib.h>   //RAND_MAX
 
 #ifdef LMMS_BUILD_WIN32
 #define powf pow
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index f465c1599..8cdcc9c60 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -26,7 +26,6 @@
 #include <QDomElement>
 
 #include "Effect.h"
-#include "Engine.h"
 #include "EffectChain.h"
 #include "EffectControls.h"
 #include "EffectView.h"
diff --git a/src/core/EffectChain.cpp b/src/core/EffectChain.cpp
index 8e80de822..a1aea9d3a 100644
--- a/src/core/EffectChain.cpp
+++ b/src/core/EffectChain.cpp
@@ -28,7 +28,6 @@
 
 #include "EffectChain.h"
 #include "Effect.h"
-#include "Engine.h"
 #include "DummyEffect.h"
 #include "MixHelpers.h"
 #include "Song.h"
diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp
index b5ba50194..a53abbe5d 100644
--- a/src/core/Engine.cpp
+++ b/src/core/Engine.cpp
@@ -31,13 +31,9 @@
 #include "Mixer.h"
 #include "PresetPreviewPlayHandle.h"
 #include "ProjectJournal.h"
-#include "Plugin.h"
-#include "PluginFactory.h"
 #include "Song.h"
 #include "BandLimitedWave.h"
 
-#include "GuiApplication.h"
-
 float LmmsCore::s_framesPerTick;
 Mixer* LmmsCore::s_mixer = NULL;
 FxMixer * LmmsCore::s_fxMixer = NULL;
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index 097c824b0..56284f9ca 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -33,7 +33,6 @@
 
 #include "InstrumentTrack.h"
 #include "BBTrackContainer.h"
-#include "ValueBuffer.h"
 
 FxRoute::FxRoute( FxChannel * from, FxChannel * to, float amount ) :
 	m_from( from ),
diff --git a/src/core/Instrument.cpp b/src/core/Instrument.cpp
index aef56cb63..859882fd3 100644
--- a/src/core/Instrument.cpp
+++ b/src/core/Instrument.cpp
@@ -25,8 +25,6 @@
 #include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "DummyInstrument.h"
-#include "NotePlayHandle.h"
-#include "Engine.h"
 
 
 Instrument::Instrument( InstrumentTrack * _instrument_track,
diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp
index 84e4905c1..4a542b081 100644
--- a/src/core/InstrumentFunctions.cpp
+++ b/src/core/InstrumentFunctions.cpp
@@ -29,7 +29,6 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "NotePlayHandle.h"
 #include "PresetPreviewPlayHandle.h"
 
 
diff --git a/src/core/InstrumentSoundShaping.cpp b/src/core/InstrumentSoundShaping.cpp
index d4cf7df7b..2a5a71e86 100644
--- a/src/core/InstrumentSoundShaping.cpp
+++ b/src/core/InstrumentSoundShaping.cpp
@@ -32,8 +32,6 @@
 #include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "NotePlayHandle.h"
-
 
 
 const float CUT_FREQ_MULTIPLIER = 6000.0f;
diff --git a/src/core/JournallingObject.cpp b/src/core/JournallingObject.cpp
index ff17aeae3..d61630cb9 100644
--- a/src/core/JournallingObject.cpp
+++ b/src/core/JournallingObject.cpp
@@ -24,8 +24,6 @@
 
 #include <QDomElement>
 
-#include <cstdio>
-
 #include "JournallingObject.h"
 #include "AutomatableModel.h"
 #include "ProjectJournal.h"
diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp
index 3dd8acbe6..4286c34ac 100644
--- a/src/core/LadspaManager.cpp
+++ b/src/core/LadspaManager.cpp
@@ -27,7 +27,6 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>
-#include <QFileInfo>
 #include <QLibrary>
 
 #include <math.h>
diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp
index 4aa5f4213..6bf54a8bc 100644
--- a/src/core/LfoController.cpp
+++ b/src/core/LfoController.cpp
@@ -28,10 +28,8 @@
 
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
 #include "LfoController.h"
-#include "lmms_math.h"
 
 
 LfoController::LfoController( Model * _parent ) :
diff --git a/src/core/MemoryManager.cpp b/src/core/MemoryManager.cpp
index 21b9e086e..4196d1aac 100644
--- a/src/core/MemoryManager.cpp
+++ b/src/core/MemoryManager.cpp
@@ -25,9 +25,7 @@
 
 
 #include "MemoryManager.h"
-#include <QtGlobal>
 #include <QReadWriteLock>
-#include <stdint.h>
 
 
 MemoryPoolVector MemoryManager::s_memoryPools;
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
index 33ffe45a8..3cc3b2863 100644
--- a/src/core/Mixer.cpp
+++ b/src/core/Mixer.cpp
@@ -24,17 +24,18 @@
 
 #include "Mixer.h"
 
+#include "denormals.h"
+
+#include "lmmsconfig.h"
+
 #include "AudioPort.h"
 #include "FxMixer.h"
 #include "MixerWorkerThread.h"
 #include "Song.h"
 #include "EnvelopeAndLfoParameters.h"
 #include "NotePlayHandle.h"
-#include "Engine.h"
 #include "ConfigManager.h"
 #include "SamplePlayHandle.h"
-#include "GuiApplication.h"
-#include "PianoRoll.h"
 
 // platform-specific audio-interface-classes
 #include "AudioAlsa.h"
@@ -57,11 +58,8 @@
 #include "MidiApple.h"
 #include "MidiDummy.h"
 
-#include "MemoryHelper.h"
 #include "BufferManager.h"
 
-
-
 typedef LocklessList<PlayHandle *>::Element LocklessListElement;
 
 
diff --git a/src/core/MixerWorkerThread.cpp b/src/core/MixerWorkerThread.cpp
index fadc1d85c..dfcc1ff6a 100644
--- a/src/core/MixerWorkerThread.cpp
+++ b/src/core/MixerWorkerThread.cpp
@@ -24,13 +24,12 @@
 
 #include "MixerWorkerThread.h"
 
+#include "denormals.h"
 #include <QMutex>
 #include <QWaitCondition>
 #include "ThreadableJob.h"
 #include "Mixer.h"
 
-#include "denormals.h"
-
 MixerWorkerThread::JobQueue MixerWorkerThread::globalJobQueue;
 QWaitCondition * MixerWorkerThread::queueReadyWaitCond = NULL;
 QList<MixerWorkerThread *> MixerWorkerThread::workerThreads;
diff --git a/src/core/Note.cpp b/src/core/Note.cpp
index 5fa2bf123..389526bb9 100644
--- a/src/core/Note.cpp
+++ b/src/core/Note.cpp
@@ -29,10 +29,6 @@
 
 #include "Note.h"
 #include "DetuningHelper.h"
-#include "templates.h"
-
-
-
 
 
 Note::Note( const MidiTime & length, const MidiTime & pos,
diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp
index 7294b5363..82be6b92f 100644
--- a/src/core/NotePlayHandle.cpp
+++ b/src/core/NotePlayHandle.cpp
@@ -29,8 +29,6 @@
 #include "InstrumentSoundShaping.h"
 #include "InstrumentTrack.h"
 #include "Instrument.h"
-#include "MidiEvent.h"
-#include "MidiPort.h"
 #include "Mixer.h"
 #include "Song.h"
 
diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp
index dad1527d8..976e3c96e 100644
--- a/src/core/PeakController.cpp
+++ b/src/core/PeakController.cpp
@@ -25,19 +25,16 @@
 
 #include "PeakController.h"
 
-#include <cstdio>
+#include <cmath>
+
 #include <QDomElement>
-#include <QObject>
 #include <QMessageBox>
 
-#include "Engine.h"
 #include "Mixer.h"
 #include "EffectChain.h"
 #include "plugins/peak_controller_effect/peak_controller_effect.h"
 #include "PresetPreviewPlayHandle.h"
 
-class ControllerDialog;
-
 PeakControllerEffectVector PeakController::s_effects;
 int PeakController::m_getCount;
 int PeakController::m_loadCount;
diff --git a/src/core/Piano.cpp b/src/core/Piano.cpp
index d72f34797..7ea9cb2b0 100644
--- a/src/core/Piano.cpp
+++ b/src/core/Piano.cpp
@@ -39,9 +39,6 @@
 #include "Piano.h"
 
 #include "InstrumentTrack.h"
-#include "MidiEvent.h"
-#include "MidiEventProcessor.h"
-#include "Note.h"
 
 
 /*! The black / white order of keys as they appear on the keyboard.
diff --git a/src/core/PlayHandle.cpp b/src/core/PlayHandle.cpp
index 53a8fc7f4..f4b1f0aa2 100644
--- a/src/core/PlayHandle.cpp
+++ b/src/core/PlayHandle.cpp
@@ -25,6 +25,8 @@
 #include "PlayHandle.h"
 #include "BufferManager.h"
 
+#include <QtCore/QThread>
+
 
 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 4ae8d659d..b479d7d8d 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -31,8 +31,6 @@
 #include "embed.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "Mixer.h"
-#include "ConfigManager.h"
 #include "DummyPlugin.h"
 #include "AutomatableModel.h"
 #include "Song.h"
diff --git a/src/core/PluginFactory.cpp b/src/core/PluginFactory.cpp
index e1702a373..f13f057fd 100644
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -27,11 +27,8 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtCore/QFileInfo>
 #include <QtCore/QLibrary>
 
-#include "Plugin.h"
-
 #ifdef LMMS_BUILD_WIN32
 	QStringList nameFilters("*.dll");
 #else
diff --git a/src/core/PresetPreviewPlayHandle.cpp b/src/core/PresetPreviewPlayHandle.cpp
index a4313de07..94b25ae5f 100644
--- a/src/core/PresetPreviewPlayHandle.cpp
+++ b/src/core/PresetPreviewPlayHandle.cpp
@@ -23,17 +23,12 @@
  */
 
 #include <QFileInfo>
-#include <QMutexLocker>
 
 #include "PresetPreviewPlayHandle.h"
-#include "debug.h"
 #include "Engine.h"
 #include "Instrument.h"
 #include "InstrumentTrack.h"
-#include "MidiPort.h"
 #include "Mixer.h"
-#include "DataFile.h"
-#include "NotePlayHandle.h"
 #include "PluginFactory.h"
 #include "ProjectJournal.h"
 #include "TrackContainer.h"
diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp
index 7e18a67b6..75a707592 100644
--- a/src/core/ProjectRenderer.cpp
+++ b/src/core/ProjectRenderer.cpp
@@ -27,15 +27,13 @@
 
 #include "ProjectRenderer.h"
 #include "Song.h"
-#include "Engine.h"
 
 #include "AudioFileWave.h"
 #include "AudioFileOgg.h"
 
 #ifdef LMMS_HAVE_SCHED_H
-#include <sched.h>
+#include "sched.h"
 #endif
-#include <QMutexLocker>
 
 const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
 {
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index 36229439c..bb7e39c6a 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -32,14 +32,9 @@
 #include "RemotePlugin.h"
 #include "Mixer.h"
 #include "Engine.h"
-#include "ConfigManager.h"
 
 #include <QDir>
 
-#ifdef LMMS_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifndef SYNC_WITH_SHM_FIFO
 #include <QtCore/QUuid>
 #include <sys/socket.h>
@@ -504,9 +499,3 @@ bool RemotePlugin::processMessage( const message & _m )
 
 	return true;
 }
-
-
-
-
-
-
diff --git a/src/core/RenderManager.cpp b/src/core/RenderManager.cpp
index 6f9a18966..f404b6e3d 100644
--- a/src/core/RenderManager.cpp
+++ b/src/core/RenderManager.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include <QFileInfo>
 #include <QDebug>
 #include <QDir>
 
@@ -30,7 +29,6 @@
 #include "Song.h"
 #include "BBTrackContainer.h"
 #include "BBTrack.h"
-#include "debug.h"
 
 RenderManager::RenderManager(
 		const Mixer::qualitySettings & qualitySettings,
diff --git a/src/core/RingBuffer.cpp b/src/core/RingBuffer.cpp
index bbae5156f..dd51ab605 100644
--- a/src/core/RingBuffer.cpp
+++ b/src/core/RingBuffer.cpp
@@ -26,7 +26,6 @@
 #include "RingBuffer.h"
 #include "Engine.h"
 #include "Mixer.h"
-#include <string.h>
 #include "MixHelpers.h"
 
  
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
index e9ab426fa..1870c10b4 100644
--- a/src/core/SampleBuffer.cpp
+++ b/src/core/SampleBuffer.cpp
@@ -30,11 +30,8 @@
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QPainter>
-#include <QReadLocker>
 
 
-#include <cstring>
-
 #include <sndfile.h>
 
 #define OV_EXCLUDE_STATIC_CALLBACKS
@@ -53,17 +50,13 @@
 
 #include "base64.h"
 #include "ConfigManager.h"
-#include "debug.h"
 #include "DrumSynth.h"
 #include "endian_handling.h"
 #include "Engine.h"
 #include "GuiApplication.h"
-#include "interpolation.h"
 #include "Mixer.h"
-#include "templates.h"
 
 #include "FileDialog.h"
-#include "MemoryManager.h"
 
 
 SampleBuffer::SampleBuffer( const QString & _audio_file,
diff --git a/src/core/SamplePlayHandle.cpp b/src/core/SamplePlayHandle.cpp
index 408db2eca..7f383c68e 100644
--- a/src/core/SamplePlayHandle.cpp
+++ b/src/core/SamplePlayHandle.cpp
@@ -28,7 +28,6 @@
 #include "Engine.h"
 #include "InstrumentTrack.h"
 #include "Mixer.h"
-#include "SampleBuffer.h"
 #include "SampleTrack.h"
 
 
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index dc61dc063..684bde885 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -29,9 +29,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QMessageBox>
-#include <QApplication>
-
-#include <math.h>
 
 #include "AutomationTrack.h"
 #include "AutomationEditor.h"
@@ -49,20 +46,13 @@
 #include "GuiApplication.h"
 #include "ImportFilter.h"
 #include "ExportFilter.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "FileDialog.h"
-#include "MidiClient.h"
-#include "DataFile.h"
-#include "NotePlayHandle.h"
 #include "Pattern.h"
 #include "PianoRoll.h"
 #include "ProjectJournal.h"
 #include "ProjectNotes.h"
-#include "ProjectRenderer.h"
-#include "RenameDialog.h"
 #include "SongEditor.h"
-#include "templates.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
 #include "PeakController.h"
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index 6ce4445e5..25dade02b 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -38,7 +38,6 @@
 #include "Track.h"
 
 #include <assert.h>
-#include <cstdio>
 
 #include <QLayout>
 #include <QMenu>
@@ -60,20 +59,14 @@
 #include "GuiApplication.h"
 #include "FxMixerView.h"
 #include "gui_templates.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "DataFile.h"
-#include "PixmapButton.h"
 #include "ProjectJournal.h"
 #include "SampleTrack.h"
 #include "Song.h"
 #include "SongEditor.h"
 #include "StringPairDrag.h"
-#include "templates.h"
 #include "TextFloat.h"
-#include "ToolTip.h"
-#include "TrackContainer.h"
 
 
 /*! The width of the resize grip in pixels
diff --git a/src/core/ValueBuffer.cpp b/src/core/ValueBuffer.cpp
index 2b06ffe67..687bd3c15 100644
--- a/src/core/ValueBuffer.cpp
+++ b/src/core/ValueBuffer.cpp
@@ -1,5 +1,7 @@
 #include "ValueBuffer.h"
 
+#include "interpolation.h"
+
 ValueBuffer::ValueBuffer()
 {}
 
diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp
index 91684f639..b441d0507 100644
--- a/src/core/VstSyncController.cpp
+++ b/src/core/VstSyncController.cpp
@@ -27,7 +27,6 @@
 
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "lmmsconfig.h"
 #include "Mixer.h"
 #include "VstSyncController.h"
 #include "RemotePlugin.h"
diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp
index e9954c672..45abe6776 100644
--- a/src/core/audio/AudioAlsa.cpp
+++ b/src/core/audio/AudioAlsa.cpp
@@ -24,7 +24,6 @@
 
 #include <QComboBox>
 #include <QLineEdit>
-#include <QLabel>
 
 #include "AudioAlsa.h"
 
@@ -33,13 +32,8 @@
 #include "endian_handling.h"
 #include "ConfigManager.h"
 #include "Engine.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 #include "gui_templates.h"
-#include "templates.h"
-
-#include <iostream>
-#include <vector>
 
 
 AudioAlsa::AudioAlsa( bool & _success_ful, Mixer*  _mixer ) :
diff --git a/src/core/audio/AudioFileOgg.cpp b/src/core/audio/AudioFileOgg.cpp
index 6066b79b0..39771f3d3 100644
--- a/src/core/audio/AudioFileOgg.cpp
+++ b/src/core/audio/AudioFileOgg.cpp
@@ -32,7 +32,6 @@
 
 
 #include <vorbis/vorbisenc.h>
-#include <cstring>
 
 #include "Mixer.h"
 
diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp
index 669dd3760..24f7b2f4f 100644
--- a/src/core/audio/AudioJack.cpp
+++ b/src/core/audio/AudioJack.cpp
@@ -30,8 +30,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include <stdlib.h>
-
 #include "Engine.h"
 #include "GuiApplication.h"
 #include "templates.h"
diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp
index 96264bb3c..21f495dca 100644
--- a/src/core/audio/AudioOss.cpp
+++ b/src/core/audio/AudioOss.cpp
@@ -35,7 +35,6 @@
 #include "Mixer.h"
 #include "Engine.h"
 #include "gui_templates.h"
-#include "templates.h"
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
@@ -46,9 +45,6 @@
 #ifdef LMMS_HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #ifdef LMMS_HAVE_SYS_SOUNDCARD_H
 // This is recommended by OSS
diff --git a/src/core/audio/AudioPort.cpp b/src/core/audio/AudioPort.cpp
index 336ed1e94..4f779bb45 100644
--- a/src/core/audio/AudioPort.cpp
+++ b/src/core/audio/AudioPort.cpp
@@ -30,8 +30,6 @@
 #include "Mixer.h"
 #include "MixHelpers.h"
 #include "BufferManager.h"
-#include "ValueBuffer.h"
-#include "panning.h"
 
 
 AudioPort::AudioPort( const QString & _name, bool _has_effect_chain,
diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
index 0798b269c..b14c1e79d 100644
--- a/src/core/audio/AudioPortAudio.cpp
+++ b/src/core/audio/AudioPortAudio.cpp
@@ -42,12 +42,10 @@ void AudioPortAudioSetupUtil::updateChannels()
 #include <QLineEdit>
 
 #include "Engine.h"
-#include "debug.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
 #include "templates.h"
 #include "ComboBox.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 
 
diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp
index 366d6b5fe..23031b10c 100644
--- a/src/core/audio/AudioPulseAudio.cpp
+++ b/src/core/audio/AudioPulseAudio.cpp
@@ -29,12 +29,10 @@
 
 #ifdef LMMS_HAVE_PULSEAUDIO
 
-#include "endian_handling.h"
 #include "ConfigManager.h"
 #include "LcdSpinBox.h"
 #include "Mixer.h"
 #include "gui_templates.h"
-#include "templates.h"
 #include "Engine.h"
 
 
diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp
index bfb6e8058..2b810e913 100644
--- a/src/core/audio/AudioSdl.cpp
+++ b/src/core/audio/AudioSdl.cpp
@@ -30,13 +30,9 @@
 #include <QLineEdit>
 
 #include "Engine.h"
-#include "debug.h"
 #include "ConfigManager.h"
 #include "gui_templates.h"
 #include "Mixer.h"
-#include "templates.h"
-
-
 
 
 AudioSdl::AudioSdl( bool & _success_ful, Mixer*  _mixer ) :
diff --git a/src/core/audio/AudioSndio.cpp b/src/core/audio/AudioSndio.cpp
index 94ed34690..3c7cf1b43 100644
--- a/src/core/audio/AudioSndio.cpp
+++ b/src/core/audio/AudioSndio.cpp
@@ -2,8 +2,6 @@
 
 /* license */
 
-#include "AudioSndio.h"
-
 #ifdef LMMS_HAVE_SNDIO
 
 #include <QtCore/QFileInfo>
diff --git a/src/core/audio/AudioSoundIo.cpp b/src/core/audio/AudioSoundIo.cpp
index cf2d1e97b..46a0315e7 100644
--- a/src/core/audio/AudioSoundIo.cpp
+++ b/src/core/audio/AudioSoundIo.cpp
@@ -35,7 +35,6 @@
 #include "gui_templates.h"
 #include "templates.h"
 #include "ComboBox.h"
-#include "LcdSpinBox.h"
 #include "Mixer.h"
 
 AudioSoundIo::AudioSoundIo( bool & outSuccessful, Mixer * _mixer ) :
diff --git a/src/core/base64.cpp b/src/core/base64.cpp
index 1730c45fe..4fb3008d9 100644
--- a/src/core/base64.cpp
+++ b/src/core/base64.cpp
@@ -23,13 +23,10 @@
  *
  */
 
-
-
 #include "base64.h"
 
 #include <QBuffer>
 #include <QDataStream>
-#include <QVariant>
 
 namespace base64
 {
diff --git a/src/core/main.cpp b/src/core/main.cpp
index f7657d9ed..31cdcf037 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -31,7 +31,6 @@
 
 #include <QFileInfo>
 #include <QLocale>
-#include <QDate>
 #include <QTimer>
 #include <QTranslator>
 #include <QApplication>
@@ -44,11 +43,7 @@
 #endif
 
 #ifdef LMMS_HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-#ifdef LMMS_HAVE_SYS_TIME_H
-#include <sys/time.h>
+#include "sched.h"
 #endif
 
 #ifdef LMMS_HAVE_PROCESS_H
@@ -71,7 +66,6 @@
 #include "MainWindow.h"
 #include "ProjectRenderer.h"
 #include "RenderManager.h"
-#include "DataFile.h"
 #include "Song.h"
 #include "SetupDialog.h"
 
diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp
index f22125db0..be1e623de 100644
--- a/src/core/midi/MidiAlsaSeq.cpp
+++ b/src/core/midi/MidiAlsaSeq.cpp
@@ -28,7 +28,6 @@
 #include "gui_templates.h"
 #include "Song.h"
 #include "MidiPort.h"
-#include "MidiTime.h"
 #include "Note.h"
 
 
diff --git a/src/core/midi/MidiApple.cpp b/src/core/midi/MidiApple.cpp
index 7ea1955dd..45f58e4bb 100644
--- a/src/core/midi/MidiApple.cpp
+++ b/src/core/midi/MidiApple.cpp
@@ -23,9 +23,10 @@
  *
  */
 
-
 #include "MidiApple.h"
 
+#ifdef LMMS_BUILD_APPLE
+
 #include <QtAlgorithms>
 #include <algorithm>
 
@@ -33,8 +34,6 @@
 #include "MidiPort.h"
 #include "Note.h"
 
-#ifdef LMMS_BUILD_APPLE
-
 #include <CoreMIDI/CoreMIDI.h>
 
 const unsigned int SYSEX_LENGTH=1024;
diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp
index 4c15f7c8a..72128e184 100644
--- a/src/core/midi/MidiController.cpp
+++ b/src/core/midi/MidiController.cpp
@@ -25,10 +25,8 @@
 
 #include <QDomElement>
 #include <QObject>
-#include <QVector>
 
 #include "Song.h"
-#include "Engine.h"
 #include "Mixer.h"
 #include "MidiClient.h"
 #include "MidiController.h"
diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp
index c041346f3..b6bae166d 100644
--- a/src/core/midi/MidiJack.cpp
+++ b/src/core/midi/MidiJack.cpp
@@ -27,13 +27,7 @@
 #ifdef LMMS_HAVE_JACK
 
 #include <QCompleter>
-#include <QDirModel>
 #include <QMessageBox>
-#include <QTranslator>
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #include "ConfigManager.h"
 #include "gui_templates.h"
diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp
index 540f010a2..a8e948efc 100644
--- a/src/core/midi/MidiOss.cpp
+++ b/src/core/midi/MidiOss.cpp
@@ -27,13 +27,6 @@
 
 #ifdef LMMS_HAVE_OSS
 
-
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-
 #include "ConfigManager.h"
 #include "gui_templates.h"
 
diff --git a/src/core/midi/MidiSndio.cpp b/src/core/midi/MidiSndio.cpp
index e997a851b..6327bad9b 100644
--- a/src/core/midi/MidiSndio.cpp
+++ b/src/core/midi/MidiSndio.cpp
@@ -2,8 +2,6 @@
 
 /* license */
 
-#include "MidiSndio.h"
-
 #ifdef LMMS_HAVE_SNDIO
 
 #include <QtGui/QLabel>
diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp
index b0bc21819..a59ebc69e 100644
--- a/src/core/midi/MidiWinMM.cpp
+++ b/src/core/midi/MidiWinMM.cpp
@@ -23,13 +23,8 @@
  */
 
 #include "MidiWinMM.h"
-#include "ConfigManager.h"
-#include "Engine.h"
-#include "gui_templates.h"
-#include "MidiPort.h"
 #include "Note.h"
 
-
 #ifdef LMMS_BUILD_WIN32
 
 
diff --git a/src/gui/AudioAlsaSetupWidget.cpp b/src/gui/AudioAlsaSetupWidget.cpp
index 4abbb10f1..26da660da 100644
--- a/src/gui/AudioAlsaSetupWidget.cpp
+++ b/src/gui/AudioAlsaSetupWidget.cpp
@@ -33,9 +33,6 @@
 #include "LcdSpinBox.h"
 #include "gui_templates.h"
 
-#include <iostream>
-
-
 
 AudioAlsaSetupWidget::AudioAlsaSetupWidget( QWidget * _parent ) :
 	AudioDeviceSetupWidget( AudioAlsa::name(), _parent ),
diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
index c0f7f6a43..66543816c 100644
--- a/src/gui/AutomationPatternView.cpp
+++ b/src/gui/AutomationPatternView.cpp
@@ -28,7 +28,6 @@
 #include <QMenu>
 
 #include "AutomationEditor.h"
-#include "AutomationPattern.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp
index ae655128a..1adf162e7 100644
--- a/src/gui/ControllerConnectionDialog.cpp
+++ b/src/gui/ControllerConnectionDialog.cpp
@@ -38,7 +38,6 @@
 #include "LcdSpinBox.h"
 #include "LedCheckbox.h"
 #include "ComboBox.h"
-#include "TabWidget.h"
 #include "GroupBox.h"
 #include "Song.h"
 #include "ToolButton.h"
diff --git a/src/gui/EffectControlDialog.cpp b/src/gui/EffectControlDialog.cpp
index 638f7d856..c43f451aa 100644
--- a/src/gui/EffectControlDialog.cpp
+++ b/src/gui/EffectControlDialog.cpp
@@ -28,7 +28,6 @@
 
 #include "EffectControlDialog.h"
 #include "EffectControls.h"
-#include "Effect.h"
 
 
 EffectControlDialog::EffectControlDialog( EffectControls * _controls ) :
diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp
index 663c35bb5..d993841fc 100644
--- a/src/gui/ExportProjectDialog.cpp
+++ b/src/gui/ExportProjectDialog.cpp
@@ -31,8 +31,6 @@
 #include "Song.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "BBTrackContainer.h"
-#include "BBTrack.h"
 
 
 ExportProjectDialog::ExportProjectDialog( const QString & _file_name,
diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index 2ebf22745..a9c949c37 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -37,7 +37,6 @@
 #include "FileBrowser.h"
 #include "BBTrackContainer.h"
 #include "ConfigManager.h"
-#include "debug.h"
 #include "embed.h"
 #include "Engine.h"
 #include "GuiApplication.h"
@@ -47,7 +46,6 @@
 #include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "DataFile.h"
 #include "PluginFactory.h"
 #include "PresetPreviewPlayHandle.h"
 #include "SamplePlayHandle.h"
diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp
index 530bf2c26..0e828c329 100644
--- a/src/gui/FxMixerView.cpp
+++ b/src/gui/FxMixerView.cpp
@@ -32,15 +32,14 @@
 #include <QMdiSubWindow>
 #include <QPainter>
 #include <QPushButton>
-#include <QToolButton>
 #include <QScrollArea>
 #include <QStyle>
 #include <QKeyEvent>
 
+#include "lmms_math.h"
+
 #include "FxMixerView.h"
 #include "Knob.h"
-#include "Engine.h"
-#include "embed.h"
 #include "FxLine.h"
 #include "FxMixer.h"
 #include "GuiApplication.h"
@@ -50,7 +49,6 @@
 #include "InstrumentTrack.h"
 #include "Song.h"
 #include "BBTrackContainer.h"
-#include "lmms_math.h"
 
 FxMixerView::FxMixerView() :
 	QWidget(),
diff --git a/src/gui/GuiApplication.cpp b/src/gui/GuiApplication.cpp
index 2c277d6de..5315a66a9 100644
--- a/src/gui/GuiApplication.cpp
+++ b/src/gui/GuiApplication.cpp
@@ -34,7 +34,6 @@
 #include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "FxMixerView.h"
-#include "InstrumentTrack.h"
 #include "MainWindow.h"
 #include "PianoRoll.h"
 #include "ProjectNotes.h"
diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp
index 784cbe649..9e8fc58c1 100644
--- a/src/gui/InstrumentView.cpp
+++ b/src/gui/InstrumentView.cpp
@@ -26,7 +26,6 @@
 
 #include "InstrumentView.h"
 #include "embed.h"
-#include "Instrument.h"
 #include "InstrumentTrack.h"
 #include "StringPairDrag.h"
 
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
index dfe64e581..9263d37e7 100644
--- a/src/gui/LfoControllerDialog.cpp
+++ b/src/gui/LfoControllerDialog.cpp
@@ -26,20 +26,17 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QPainter>
 
 #include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
-#include "Engine.h"
 #include "LedCheckbox.h"
 #include "MainWindow.h"
 #include "ToolTip.h"
 
 
 #include "LfoController.h"
-#include "ControllerDialog.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"
 #include "PixmapButton.h"
diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp
index 3b5b72dad..e58e72cea 100644
--- a/src/gui/LmmsPalette.cpp
+++ b/src/gui/LmmsPalette.cpp
@@ -26,7 +26,6 @@
 #include <QApplication>
 #include <QStyle>
 #include "LmmsPalette.h"
-#include "LmmsStyle.h"
 
 
 LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) : 
diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
index 9eee2e066..b883a2b2f 100644
--- a/src/gui/LmmsStyle.cpp
+++ b/src/gui/LmmsStyle.cpp
@@ -28,12 +28,10 @@
 #include <QApplication>
 #include <QFrame>
 #include <QPainter>
-#include <QPixmapCache>
 #include <QStyleFactory>
 #include <QStyleOption>
 
 #include "LmmsStyle.h"
-#include "LmmsPalette.h"
 
 QPalette * LmmsStyle::s_palette = NULL;
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 3ed4a988e..732ce2db8 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -30,7 +30,6 @@
 #include <QDomElement>
 #include <QFileInfo>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QShortcut>
@@ -42,7 +41,6 @@
 #include "AudioDummy.h"
 #include "AutomationEditor.h"
 #include "BBEditor.h"
-#include "ConfigManager.h"
 #include "ControllerRackView.h"
 #include "embed.h"
 #include "Engine.h"
@@ -50,11 +48,7 @@
 #include "FileDialog.h"
 #include "FxMixerView.h"
 #include "GuiApplication.h"
-#include "InstrumentTrack.h"
-#include "lmmsversion.h"
-#include "Mixer.h"
 #include "PianoRoll.h"
-#include "PianoView.h"
 #include "PluginBrowser.h"
 #include "PluginFactory.h"
 #include "PluginView.h"
@@ -62,14 +56,12 @@
 #include "ProjectNotes.h"
 #include "SetupDialog.h"
 #include "SideBar.h"
-#include "Song.h"
 #include "SongEditor.h"
-#include "SubWindow.h"
-#include "templates.h"
 #include "ToolButton.h"
 #include "ToolPlugin.h"
 #include "VersionedSaveDialog.h"
 
+#include "lmmsversion.h"
 
 
 
diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp
index f1a7826d3..8b728d08f 100644
--- a/src/gui/PeakControllerDialog.cpp
+++ b/src/gui/PeakControllerDialog.cpp
@@ -27,21 +27,17 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QMdiArea>
-#include <QMdiSubWindow>
 #include <QPainter>
 
 #include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
-#include "Engine.h"
 #include "MainWindow.h"
 #include "ToolTip.h"
 
 #include "PeakController.h"
-#include "ControllerDialog.h"
 #include "Knob.h"
 #include "TempoSyncKnob.h"
-#include "PixmapButton.h"
 
 
 PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) :
diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp
index b45337ec2..351806936 100644
--- a/src/gui/PianoView.cpp
+++ b/src/gui/PianoView.cpp
@@ -36,29 +36,22 @@
  * \todo write isWhite inline function and replace throughout
  */
 
+#include <cmath>
 
 #include <QCursor>
 #include <QKeyEvent>
-#include <QMouseEvent>
 #include <QPainter>
 #include <QVBoxLayout>
 
-
 #include "PianoView.h"
 #include "Piano.h"
 #include "CaptionMenu.h"
 #include "embed.h"
-#include "Engine.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"
 #include "StringPairDrag.h"
 #include "MainWindow.h"
-#include "MidiEvent.h"
-#include "templates.h"
-#include "update_event.h"
-
-
 
 
 /*! The scale of C Major - white keys only.
diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp
index a2f46a244..61fb965ef 100644
--- a/src/gui/PluginBrowser.cpp
+++ b/src/gui/PluginBrowser.cpp
@@ -24,17 +24,13 @@
 
 #include "PluginBrowser.h"
 
-#include <algorithm> // for std::sort
-
 #include <QLabel>
 #include <QPainter>
-#include <QCursor>
 #include <QMouseEvent>
 #include <QScrollArea>
 #include <QStyleOption>
 
 #include "embed.h"
-#include "debug.h"
 #include "templates.h"
 #include "gui_templates.h"
 #include "StringPairDrag.h"
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index 50dabdea2..5da148bd0 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -28,24 +28,20 @@
 #include <QLayout>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QSlider>
 #include <QWhatsThis>
 #include <QScrollArea>
 
 #include "SetupDialog.h"
 #include "TabBar.h"
 #include "TabButton.h"
-#include "TabWidget.h"
 #include "gui_templates.h"
 #include "Mixer.h"
 #include "MainWindow.h"
 #include "ProjectJournal.h"
-#include "ConfigManager.h"
 #include "embed.h"
 #include "Engine.h"
 #include "debug.h"
 #include "ToolTip.h"
-#include "LcdSpinBox.h"
 #include "FileDialog.h"
 
 
diff --git a/src/gui/StringPairDrag.cpp b/src/gui/StringPairDrag.cpp
index c51bbe571..a10d31c5c 100644
--- a/src/gui/StringPairDrag.cpp
+++ b/src/gui/StringPairDrag.cpp
@@ -27,7 +27,6 @@
 
 #include <QMimeData>
 #include <QDragEnterEvent>
-#include <QDropEvent>
 
 
 #include "StringPairDrag.h"
diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp
index 5966ffb1e..e92c4cbcb 100644
--- a/src/gui/SubWindow.cpp
+++ b/src/gui/SubWindow.cpp
@@ -28,7 +28,6 @@
 
 #include <QMdiArea>
 #include <QMoveEvent>
-#include <QResizeEvent>
 #include <QScrollBar>
 
 #include "embed.h"
diff --git a/src/gui/TimeLineWidget.cpp b/src/gui/TimeLineWidget.cpp
index 9657e783a..00bbc3127 100644
--- a/src/gui/TimeLineWidget.cpp
+++ b/src/gui/TimeLineWidget.cpp
@@ -34,8 +34,6 @@
 
 #include "TimeLineWidget.h"
 #include "embed.h"
-#include "Engine.h"
-#include "templates.h"
 #include "NStateButton.h"
 #include "GuiApplication.h"
 #include "TextFloat.h"
diff --git a/src/gui/ToolPluginView.cpp b/src/gui/ToolPluginView.cpp
index 6afb64cb5..7a8a15b86 100644
--- a/src/gui/ToolPluginView.cpp
+++ b/src/gui/ToolPluginView.cpp
@@ -27,10 +27,8 @@
 #include "ToolPluginView.h"
 
 #include <QIcon>
-#include <QMdiArea>
 
 #include "embed.h"
-#include "Engine.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
 
diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
index e20dab3d5..0f7d43d4c 100644
--- a/src/gui/TrackContainerView.cpp
+++ b/src/gui/TrackContainerView.cpp
@@ -24,33 +24,26 @@
 
 #include "TrackContainerView.h"
 
-#include <algorithm>
+#include <cmath>
 
 #include <QApplication>
 #include <QLayout>
 #include <QMdiArea>
-#include <QProgressDialog>
-#include <QScrollBar>
 #include <QWheelEvent>
 
-
 #include "TrackContainer.h"
 #include "BBTrack.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "debug.h"
 #include "FileBrowser.h"
 #include "ImportFilter.h"
 #include "Instrument.h"
-#include "InstrumentTrack.h"
-#include "DataFile.h"
-#include "Rubberband.h"
 #include "Song.h"
 #include "StringPairDrag.h"
-#include "Track.h"
 #include "GuiApplication.h"
 #include "PluginFactory.h"
 
+using namespace std;
 
 TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
 	QWidget(),
diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
index a04378281..772140159 100644
--- a/src/gui/editors/AutomationEditor.cpp
+++ b/src/gui/editors/AutomationEditor.cpp
@@ -27,8 +27,9 @@
 
 #include "AutomationEditor.h"
 
+#include <cmath>
+
 #include <QApplication>
-#include <QButtonGroup>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLayout>
@@ -36,25 +37,18 @@
 #include <QPainter>
 #include <QScrollBar>
 #include <QStyleOption>
-#include <QWheelEvent>
 #include <QToolTip>
-#include <QSignalMapper>
-
 
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
-
 #include "ActionGroup.h"
 #include "SongEditor.h"
 #include "MainWindow.h"
 #include "GuiApplication.h"
 #include "embed.h"
 #include "Engine.h"
-#include "PixmapButton.h"
-#include "templates.h"
 #include "gui_templates.h"
 #include "TimeLineWidget.h"
 #include "ToolTip.h"
@@ -63,7 +57,6 @@
 #include "BBTrackContainer.h"
 #include "PianoRoll.h"
 #include "debug.h"
-#include "MeterModel.h"
 #include "StringPairDrag.h"
 #include "ProjectJournal.h"
 
diff --git a/src/gui/editors/BBEditor.cpp b/src/gui/editors/BBEditor.cpp
index dec0df978..50ff0c1e3 100644
--- a/src/gui/editors/BBEditor.cpp
+++ b/src/gui/editors/BBEditor.cpp
@@ -26,20 +26,15 @@
 
 #include <QAction>
 #include <QKeyEvent>
-#include <QLabel>
 #include <QLayout>
-#include <QMdiArea>
 
 #include "ComboBox.h"
 #include "BBTrackContainer.h"
 #include "embed.h"
 #include "MainWindow.h"
 #include "Song.h"
-#include "ConfigManager.h"
-#include "DataFile.h"
 #include "StringPairDrag.h"
 
-#include "TrackContainer.h"
 #include "Pattern.h"
 
 
diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp
index bb1a474b8..bdc3e55d4 100644
--- a/src/gui/editors/Editor.cpp
+++ b/src/gui/editors/Editor.cpp
@@ -30,7 +30,6 @@
 #include "embed.h"
 
 #include <QAction>
-#include <QActionGroup>
 #include <QMdiArea>
 #include <QShortcut>
 
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 31bfcc936..661a8b026 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -25,7 +25,6 @@
  */
 
 #include <QApplication>
-#include <QButtonGroup>
 #include <QClipboard>
 #include <QKeyEvent>
 #include <QLabel>
@@ -34,8 +33,6 @@
 #include <QPainter>
 #include <QScrollBar>
 #include <QStyleOption>
-#include <QWheelEvent>
-#include <QString>
 #include <QSignalMapper>
 
 #ifndef __USE_XOPEN
@@ -43,7 +40,6 @@
 #endif
 
 #include <math.h>
-#include <algorithm>
 
 #include "AutomationEditor.h"
 #include "ActionGroup.h"
@@ -59,16 +55,10 @@
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
 #include "MainWindow.h"
-#include "MidiEvent.h"
-#include "DataFile.h"
 #include "Pattern.h"
-#include "Piano.h"
-#include "PixmapButton.h"
 #include "SongEditor.h"
-#include "templates.h"
 #include "TextFloat.h"
 #include "TimeLineWidget.h"
-#include "TextFloat.h"
 
 
 #if QT_VERSION < 0x040800
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 5a1140103..699fa5eac 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -26,16 +26,12 @@
 
 #include <QTimeLine>
 #include <QAction>
-#include <QButtonGroup>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLayout>
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QPainter>
-#include <QScrollBar>
-
-#include <math.h>
 
 #include "ActionGroup.h"
 #include "AutomatableSlider.h"
diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp
index 1ea9e9814..c574ea4dd 100644
--- a/src/gui/embed.cpp
+++ b/src/gui/embed.cpp
@@ -26,9 +26,7 @@
 #include <QImage>
 #include <QHash>
 #include <QImageReader>
-#include <QList>
 #include "embed.h"
-#include "ConfigManager.h"
 
 #ifndef PLUGIN_NAME
 namespace embed
diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp
index 62a353e28..d760ab06f 100644
--- a/src/gui/widgets/AutomatableButton.cpp
+++ b/src/gui/widgets/AutomatableButton.cpp
@@ -25,12 +25,9 @@
 
 #include "AutomatableButton.h"
 
-#include <QCursor>
 #include <QMouseEvent>
 
 #include "CaptionMenu.h"
-#include "Engine.h"
-#include "embed.h"
 #include "MainWindow.h"
 #include "StringPairDrag.h"
 
diff --git a/src/gui/widgets/AutomatableSlider.cpp b/src/gui/widgets/AutomatableSlider.cpp
index 984944de9..61799ce9c 100644
--- a/src/gui/widgets/AutomatableSlider.cpp
+++ b/src/gui/widgets/AutomatableSlider.cpp
@@ -25,12 +25,9 @@
 
 #include "AutomatableSlider.h"
 
-#include <QCursor>
 #include <QMouseEvent>
 
 #include "CaptionMenu.h"
-#include "embed.h"
-#include "Engine.h"
 #include "MainWindow.h"
 
 
diff --git a/src/gui/widgets/ComboBox.cpp b/src/gui/widgets/ComboBox.cpp
index 5c2bc6490..99a06c5d5 100644
--- a/src/gui/widgets/ComboBox.cpp
+++ b/src/gui/widgets/ComboBox.cpp
@@ -27,15 +27,12 @@
 #include "ComboBox.h"
 
 #include <QApplication>
-#include <QCursor>
 #include <QDesktopWidget>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPixmap>
 #include <QStyleOptionFrame>
 
 #include "CaptionMenu.h"
-#include "Engine.h"
 #include "embed.h"
 #include "gui_templates.h"
 #include "MainWindow.h"
diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp
index 51362418a..cf1cf3c83 100644
--- a/src/gui/widgets/ControllerRackView.cpp
+++ b/src/gui/widgets/ControllerRackView.cpp
@@ -28,11 +28,8 @@
 #include <QMdiSubWindow>
 #include <QPushButton>
 #include <QScrollArea>
-#include <QScrollBar>
-#include <QVBoxLayout>
 #include <QMdiArea>
 #include <QMessageBox>
-#include <QVBoxLayout>
 
 #include "Song.h"
 #include "embed.h"
diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp
index 032014a3b..769e77f18 100644
--- a/src/gui/widgets/ControllerView.cpp
+++ b/src/gui/widgets/ControllerView.cpp
@@ -39,7 +39,6 @@
 #include "ControllerDialog.h"
 #include "gui_templates.h"
 #include "embed.h"
-#include "Engine.h"
 #include "GuiApplication.h"
 #include "LedCheckbox.h"
 #include "MainWindow.h"
diff --git a/src/gui/widgets/EffectRackView.cpp b/src/gui/widgets/EffectRackView.cpp
index 148ffdf5e..2fa25d575 100644
--- a/src/gui/widgets/EffectRackView.cpp
+++ b/src/gui/widgets/EffectRackView.cpp
@@ -27,7 +27,6 @@
 #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 78b54749c..0a5e46b3f 100644
--- a/src/gui/widgets/EffectView.cpp
+++ b/src/gui/widgets/EffectView.cpp
@@ -33,10 +33,7 @@
 #include "EffectView.h"
 #include "DummyEffect.h"
 #include "CaptionMenu.h"
-#include "EffectControls.h"
-#include "EffectControlDialog.h"
 #include "embed.h"
-#include "Engine.h"
 #include "GuiApplication.h"
 #include "gui_templates.h"
 #include "Knob.h"
diff --git a/src/gui/widgets/FadeButton.cpp b/src/gui/widgets/FadeButton.cpp
index 46c48b7c0..d4244701a 100644
--- a/src/gui/widgets/FadeButton.cpp
+++ b/src/gui/widgets/FadeButton.cpp
@@ -26,7 +26,6 @@
 #include <QTimer>
 #include <QApplication>
 #include <QPainter>
-#include <QPixmap>
 
 #include "embed.h"
 #include "FadeButton.h"
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index a7a2d06fa..20a588220 100644
--- a/src/gui/widgets/Fader.cpp
+++ b/src/gui/widgets/Fader.cpp
@@ -44,20 +44,18 @@
  *
  */
 
+#include "Fader.h"
 
 #include <QInputDialog>
 #include <QMouseEvent>
-#include <QPaintEvent>
 #include <QPainter>
 
-#include "Fader.h"
+#include "lmms_math.h"
 #include "embed.h"
-#include "Engine.h"
 #include "CaptionMenu.h"
 #include "ConfigManager.h"
 #include "TextFloat.h"
 #include "MainWindow.h"
-#include "lmms_math.h"
 
 
 TextFloat * Fader::s_textFloat = NULL;
diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp
index 084f7cc6c..c6e6fd9ae 100644
--- a/src/gui/widgets/FxLine.cpp
+++ b/src/gui/widgets/FxLine.cpp
@@ -26,19 +26,12 @@
 #include "FxLine.h"
 
 #include <QGraphicsProxyWidget>
-#include <QGraphicsScene>
-#include <QPainter>
-#include <QLineEdit>
 #include <QWhatsThis>
 
 #include "CaptionMenu.h"
-#include "embed.h"
-#include "Engine.h"
 #include "FxMixer.h"
-#include "FxMixerView.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"
-#include "SendButtonIndicator.h"
 #include "Song.h"
 
 
diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp
index 61729f895..44c37165e 100644
--- a/src/gui/widgets/Graph.cpp
+++ b/src/gui/widgets/Graph.cpp
@@ -31,7 +31,6 @@
 #include "StringPairDrag.h"
 #include "SampleBuffer.h"
 #include "Oscillator.h"
-#include "Engine.h"
 
 
 Graph::Graph( QWidget * _parent, graphStyle _style, int _width,
diff --git a/src/gui/widgets/GroupBox.cpp b/src/gui/widgets/GroupBox.cpp
index ee9fca69d..fbcf88ed7 100644
--- a/src/gui/widgets/GroupBox.cpp
+++ b/src/gui/widgets/GroupBox.cpp
@@ -29,8 +29,6 @@
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
-
 #include "GroupBox.h"
 #include "embed.h"
 #include "gui_templates.h"
diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp
index 57c5df0db..6f6738c40 100644
--- a/src/gui/widgets/InstrumentFunctionViews.cpp
+++ b/src/gui/widgets/InstrumentFunctionViews.cpp
@@ -28,12 +28,9 @@
 #include "InstrumentFunctions.h"
 #include "InstrumentFunctionViews.h"
 #include "ComboBox.h"
-#include "embed.h"
-#include "Engine.h"
 #include "GroupBox.h"
 #include "gui_templates.h"
 #include "Knob.h"
-#include "PixmapButton.h"
 #include "TempoSyncKnob.h"
 #include "ToolTip.h"
 
diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp
index 91c99e5c3..76ab44f98 100644
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -39,7 +39,6 @@
 #include "ToolTip.h"
 #include "InstrumentTrack.h"
 #include "LedCheckbox.h"
-#include "QLabel"
 
 
 InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) :
diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
index 4478fbe7f..2c1739540 100644
--- a/src/gui/widgets/Knob.cpp
+++ b/src/gui/widgets/Knob.cpp
@@ -28,7 +28,6 @@
 #include <QInputDialog>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPalette>
 #include <QWhatsThis>
 
 #ifndef __USE_XOPEN
@@ -41,14 +40,12 @@
 #include "ConfigManager.h"
 #include "ControllerConnection.h"
 #include "embed.h"
-#include "Engine.h"
 #include "gui_templates.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
 #include "ProjectJournal.h"
 #include "Song.h"
 #include "StringPairDrag.h"
-#include "templates.h"
 #include "TextFloat.h"
 
 TextFloat * Knob::s_textFloat = NULL;
diff --git a/src/gui/widgets/LcdSpinBox.cpp b/src/gui/widgets/LcdSpinBox.cpp
index fcda48e21..90a58728c 100644
--- a/src/gui/widgets/LcdSpinBox.cpp
+++ b/src/gui/widgets/LcdSpinBox.cpp
@@ -27,17 +27,12 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QFontMetrics>
 #include <QStyleOptionFrameV2>
 #include <QInputDialog>
 
 #include "LcdSpinBox.h"
 #include "CaptionMenu.h"
-#include "Engine.h"
-#include "embed.h"
 #include "GuiApplication.h"
-#include "gui_templates.h"
-#include "templates.h"
 #include "MainWindow.h"
 
 
diff --git a/src/gui/widgets/LcdWidget.cpp b/src/gui/widgets/LcdWidget.cpp
index c8051ab42..2b85a64ed 100644
--- a/src/gui/widgets/LcdWidget.cpp
+++ b/src/gui/widgets/LcdWidget.cpp
@@ -29,11 +29,9 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QFontMetrics>
 #include <QStyleOptionFrameV2>
 
 #include "LcdWidget.h"
-#include "Engine.h"
 #include "embed.h"
 #include "gui_templates.h"
 #include "MainWindow.h"
diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp
index d50023ec5..13aefa39d 100644
--- a/src/gui/widgets/MeterDialog.cpp
+++ b/src/gui/widgets/MeterDialog.cpp
@@ -30,7 +30,6 @@
 
 #include "MeterDialog.h"
 #include "MeterModel.h"
-#include "embed.h"
 #include "gui_templates.h"
 #include "LcdSpinBox.h"
 
diff --git a/src/gui/widgets/NStateButton.cpp b/src/gui/widgets/NStateButton.cpp
index ed99acb09..44736f33c 100644
--- a/src/gui/widgets/NStateButton.cpp
+++ b/src/gui/widgets/NStateButton.cpp
@@ -26,7 +26,6 @@
 #include <QMouseEvent>
 
 #include "NStateButton.h"
-#include "embed.h"
 #include "ToolTip.h"
 
 
diff --git a/src/gui/widgets/ProjectNotes.cpp b/src/gui/widgets/ProjectNotes.cpp
index ae7bf4146..209b89887 100644
--- a/src/gui/widgets/ProjectNotes.cpp
+++ b/src/gui/widgets/ProjectNotes.cpp
@@ -32,7 +32,6 @@
 #include <QFontDatabase>
 #include <QLineEdit>
 #include <QMdiArea>
-#include <QTextCursor>
 #include <QTextEdit>
 #include <QToolBar>
 #include <QDomCDATASection>
diff --git a/src/gui/widgets/SendButtonIndicator.cpp b/src/gui/widgets/SendButtonIndicator.cpp
index 5ac55b761..ad8d631ba 100644
--- a/src/gui/widgets/SendButtonIndicator.cpp
+++ b/src/gui/widgets/SendButtonIndicator.cpp
@@ -1,8 +1,6 @@
 #include "SendButtonIndicator.h"
 
-#include "Engine.h"
 #include "FxMixer.h"
-#include "Model.h"
 
 QPixmap * SendButtonIndicator::s_qpmOff = NULL;
 QPixmap * SendButtonIndicator::s_qpmOn = NULL;
diff --git a/src/gui/widgets/SideBarWidget.cpp b/src/gui/widgets/SideBarWidget.cpp
index 4731816e2..c1b46cfa6 100644
--- a/src/gui/widgets/SideBarWidget.cpp
+++ b/src/gui/widgets/SideBarWidget.cpp
@@ -27,8 +27,6 @@
 #include <QPainter>
 
 #include "SideBarWidget.h"
-#include "gui_templates.h"
-
 
 
 SideBarWidget::SideBarWidget( const QString & _title, const QPixmap & _icon,
diff --git a/src/gui/widgets/TabWidget.cpp b/src/gui/widgets/TabWidget.cpp
index 906c8cdae..8048ecc0e 100644
--- a/src/gui/widgets/TabWidget.cpp
+++ b/src/gui/widgets/TabWidget.cpp
@@ -27,8 +27,6 @@
 
 #include <QMouseEvent>
 #include <QPainter>
-#include <QPixmap>
-#include <QWheelEvent>
 
 #include "gui_templates.h"
 
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index b1e74e482..5027a5ade 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -30,8 +30,6 @@
 #include "gui_templates.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "Engine.h"
-
 
 
 TextFloat::TextFloat() :
diff --git a/src/gui/widgets/VisualizationWidget.cpp b/src/gui/widgets/VisualizationWidget.cpp
index c006efef5..1fd4e4c00 100644
--- a/src/gui/widgets/VisualizationWidget.cpp
+++ b/src/gui/widgets/VisualizationWidget.cpp
@@ -31,14 +31,11 @@
 #include "gui_templates.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "embed.h"
 #include "Engine.h"
 #include "ToolTip.h"
 #include "Song.h"
 
 #include "BufferManager.h"
-#include "ConfigManager.h"
-
 
 
 VisualizationWidget::VisualizationWidget( const QPixmap & _bg, QWidget * _p,
diff --git a/src/tracks/BBTrack.cpp b/src/tracks/BBTrack.cpp
index dbb667937..2e6e34078 100644
--- a/src/tracks/BBTrack.cpp
+++ b/src/tracks/BBTrack.cpp
@@ -23,7 +23,6 @@
  */
 #include "BBTrack.h"
 
-#include <QDomElement>
 #include <QColorDialog>
 #include <QMenu>
 #include <QPainter>
@@ -39,7 +38,6 @@
 #include "RenameDialog.h"
 #include "Song.h"
 #include "SongEditor.h"
-#include "templates.h"
 #include "TrackLabelButton.h"
 
 
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index 2d0065e74..1466eb645 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <QDir>
-#include <QFile>
 #include <QQueue>
 #include <QApplication>
 #include <QCloseEvent>
@@ -36,26 +35,21 @@
 #include <QMessageBox>
 #include <QMdiSubWindow>
 #include <QPainter>
-#include <QWidget>
 
 #include "FileDialog.h"
 #include "InstrumentTrack.h"
-#include "AudioPort.h"
 #include "AutomationPattern.h"
 #include "BBTrack.h"
 #include "CaptionMenu.h"
 #include "ConfigManager.h"
 #include "ControllerConnection.h"
-#include "debug.h"
 #include "EffectChain.h"
 #include "EffectRackView.h"
 #include "embed.h"
-#include "Engine.h"
 #include "FileBrowser.h"
 #include "FxMixer.h"
 #include "FxMixerView.h"
 #include "GuiApplication.h"
-#include "InstrumentSoundShaping.h"
 #include "InstrumentSoundShapingView.h"
 #include "FadeButton.h"
 #include "gui_templates.h"
@@ -71,20 +65,14 @@
 #include "MidiPortMenu.h"
 #include "Mixer.h"
 #include "MixHelpers.h"
-#include "DataFile.h"
-#include "NotePlayHandle.h"
 #include "Pattern.h"
 #include "PluginFactory.h"
 #include "PluginView.h"
 #include "SamplePlayHandle.h"
 #include "Song.h"
 #include "StringPairDrag.h"
-#include "TabWidget.h"
-#include "ToolTip.h"
 #include "TrackContainerView.h"
 #include "TrackLabelButton.h"
-#include "ValueBuffer.h"
-#include "volume.h"
 
 
 const char * volume_help = QT_TRANSLATE_NOOP( "InstrumentTrack",
diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp
index d3e3c1bda..6757df22b 100644
--- a/src/tracks/Pattern.cpp
+++ b/src/tracks/Pattern.cpp
@@ -24,28 +24,20 @@
  */
 #include "Pattern.h"
 
-#include <QDomElement>
 #include <QTimer>
 #include <QMenu>
-#include <QMessageBox>
 #include <QMouseEvent>
 #include <QPainter>
-#include <QProgressBar>
 #include <QPushButton>
-#include <QtAlgorithms>
 
 #include "InstrumentTrack.h"
-#include "templates.h"
 #include "gui_templates.h"
 #include "embed.h"
 #include "GuiApplication.h"
 #include "PianoRoll.h"
-#include "TrackContainer.h"
 #include "RenameDialog.h"
 #include "SampleBuffer.h"
 #include "AudioSampleRecorder.h"
-#include "Song.h"
-#include "ToolTip.h"
 #include "BBTrackContainer.h"
 #include "StringPairDrag.h"
 #include "MainWindow.h"
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index e699fb7bf..2152c0cc1 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -24,7 +24,6 @@
  */
 #include "SampleTrack.h"
 
-#include <QDomElement>
 #include <QDropEvent>
 #include <QMenu>
 #include <QLayout>
@@ -37,9 +36,7 @@
 #include "GuiApplication.h"
 #include "Song.h"
 #include "embed.h"
-#include "Engine.h"
 #include "ToolTip.h"
-#include "AudioPort.h"
 #include "BBTrack.h"
 #include "SamplePlayHandle.h"
 #include "SampleRecordHandle.h"
@@ -49,12 +46,8 @@
 #include "Knob.h"
 #include "MainWindow.h"
 #include "Mixer.h"
-#include "GuiApplication.h"
 #include "EffectRackView.h"
 #include "TrackLabelButton.h"
-#include "ConfigManager.h"
-#include "panning_constants.h"
-#include "volume.h"
 
 SampleTCO::SampleTCO( Track * _track ) :
 	TrackContentObject( _track ),