Improve includes (#6320)

* Update ringbuffer submodule to fix includes

* Remove cyclic includes

* Remove Qt include prefixes

* Include C++ versions of C headers

E.g.: assert.h -> cassert

* Move CLIP_BORDER_WIDTH into ClipView

This allows to remove includes to TrackView.h in ClipView cpp files.

* Elliminate useless includes

This improves the include structure by elliminating includes that are
not used. Most of this was done by using `include-what-you-use` with
`CMAKE_C_INCLUDE_WHAT_YOU_USE` and `CMAKE_CXX_INCLUDE_WHAT_YOU_USE`
set to (broken down here):

```
include-what-you-use;
    -Xiwyu;--mapping_file=/usr/share/include-what-you-use/qt5_11.imp;
    -Xiwyu;--keep=*/xmmintrin.h;
    -Xiwyu;--keep=*/lmmsconfig.h;
    -Xiwyu;--keep=*/weak_libjack.h;
    -Xiwyu;--keep=*/sys/*;
    -Xiwyu;--keep=*/debug.h;
    -Xiwyu;--keep=*/SDL/*;
    -Xiwyu;--keep=*/alsa/*;
    -Xiwyu;--keep=*/FL/x.h;
    -Xiwyu;--keep=*/MidiApple.h;
    -Xiwyu;--keep=*/MidiWinMM.h;
    -Xiwyu;--keep=*/AudioSoundIo.h
```

* Fixup: Remove empty #if-#ifdef pairs

* Remove LMMS_HAVE_STD(LIB|INT)_H

src/core/AudioEngineWorkerThread.cpp

@@ -30,6 +30,7 @@
 
 #include "denormals.h"
 #include "AudioEngine.h"
+#include "MemoryManager.h"
 #include "ThreadableJob.h"
 
 #if __SSE__

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"

src/core/BufferManager.cpp

@@ -26,7 +26,8 @@
 
 #include "BufferManager.h"
 
-#include "Engine.h"
+#include <cstring>
+
 #include "MemoryManager.h"
 
 static fpp_t framesPerPeriod;

src/core/Clipboard.cpp

@@ -27,7 +27,6 @@
 #include <QMimeData>
 
 #include "Clipboard.h"
-#include "JournallingObject.h"
 
 
 namespace Clipboard

src/core/ComboBoxModel.cpp

@@ -23,7 +23,8 @@
  */
 
 #include "ComboBoxModel.h"
-#include "embed.h"
+
+#include <cassert>
 
 using std::unique_ptr;
 using std::move;

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"

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"

src/core/DataFile.cpp

@@ -26,7 +26,7 @@
 
 #include "DataFile.h"
 
-#include <math.h>
+#include <cmath>
 #include <map>
 
 #include <QDebug>

src/core/EffectChain.cpp

@@ -30,7 +30,6 @@
 #include "Effect.h"
 #include "DummyEffect.h"
 #include "MixHelpers.h"
-#include "Song.h"
 
 
 EffectChain::EffectChain( Model * _parent ) :

src/core/InstrumentSoundShaping.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtCore/QVarLengthArray>
+#include <QVarLengthArray>
 #include <QDomElement>
 
 #include "InstrumentSoundShaping.h"

src/core/Keymap.cpp

@@ -26,6 +26,8 @@
 
 #include <QDomElement>
 
+#include "Note.h"
+
 
 Keymap::Keymap() :
 	m_description(tr("empty")),

src/core/LadspaControl.cpp

@@ -25,6 +25,8 @@
 
 #include <cstdio>
 
+#include <QDomElement>
+
 #include "LadspaControl.h"
 #include "LadspaBase.h"
 

src/core/LadspaManager.cpp

@@ -29,7 +29,7 @@
 #include <QDir>
 #include <QLibrary>
 
-#include <math.h>
+#include <cmath>
 
 #include "ConfigManager.h"
 #include "LadspaManager.h"

src/core/LfoController.cpp

@@ -24,7 +24,6 @@
  */
 
 #include <QDomElement>
-#include <QObject>
 
 
 #include "LfoController.h"

src/core/LocklessAllocator.cpp

@@ -25,7 +25,7 @@
 #include "LocklessAllocator.h"
 
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>
 
 #include "lmmsconfig.h"
 

src/core/MemoryHelper.cpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "lmms_basics.h"
 #include "MemoryHelper.h"

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

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"
 

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;

src/core/Note.cpp

@@ -25,7 +25,7 @@
 
 #include <QDomElement>
 
-#include <math.h>
+#include <cmath>
 
 #include "Note.h"
 #include "DetuningHelper.h"

src/core/NotePlayHandle.cpp

@@ -25,7 +25,6 @@
 
 #include "NotePlayHandle.h"
 
-#include "lmms_constants.h"
 #include "AudioEngine.h"
 #include "BasicFilters.h"
 #include "DetuningHelper.h"

src/core/PathUtil.cpp

@@ -1,6 +1,5 @@
 #include "PathUtil.h"
 
-#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 

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) :

src/core/PatternStore.cpp

@@ -25,6 +25,7 @@
 
 #include "PatternStore.h"
 
+#include "Clip.h"
 #include "Engine.h"
 #include "PatternTrack.h"
 #include "Song.h"

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),

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"

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");

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[] =
 {
 

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

src/core/RenderManager.cpp

@@ -22,13 +22,11 @@
  *
  */
 
-#include <QDebug>
 #include <QDir>
 
 #include "RenderManager.h"
 
 #include "PatternStore.h"
-#include "PatternTrack.h"
 #include "Song.h"
 
 

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"

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 );
-}
+}

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"
 
 
 

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"
 
 

src/core/Scale.cpp

@@ -24,6 +24,7 @@
 
 #include "Scale.h"
 
+#include <cmath>
 #include <QDomElement>
 
 

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"

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;
 

src/core/Track.cpp

@@ -29,6 +29,7 @@
 
 #include "Track.h"
 
+#include <QDomElement>
 #include <QVariant>
 
 #include "AutomationClip.h"

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"

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>

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 ) :

src/core/audio/AudioFileMP3.cpp

@@ -27,7 +27,6 @@
 
 #ifdef LMMS_HAVE_MP3LAME
 
-#include "AudioEngine.h"
 
 #include <cassert>
 

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,

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"

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"

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"
 

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"
 
 

src/core/lv2/Lv2ControlBase.cpp

@@ -27,6 +27,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <algorithm>
+#include <QDebug>
 #include <QtGlobal>
 
 #include "Engine.h"

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"

src/core/lv2/Lv2Proc.cpp

@@ -41,6 +41,7 @@
 #include "Lv2Manager.h"
 #include "Lv2Ports.h"
 #include "Lv2Evbuf.h"
+#include "MidiEvent.h"
 #include "MidiEventToByteSeq.h"
 
 

src/core/lv2/Lv2SubPluginFeatures.cpp

@@ -28,7 +28,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <QDebug>
 #include <QHBoxLayout>
 #include <QLabel>
 

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

src/core/midi/MidiAlsaRaw.cpp

@@ -24,7 +24,6 @@
 
 #include "MidiAlsaRaw.h"
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 #ifdef LMMS_HAVE_ALSA

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

src/core/midi/MidiClient.cpp

@@ -25,7 +25,6 @@
 
 #include "MidiClient.h"
 #include "MidiPort.h"
-#include "Note.h"
 
 
 MidiClient::MidiClient()

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"
 
 

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"

src/core/midi/MidiOss.cpp

@@ -28,7 +28,6 @@
 #ifdef LMMS_HAVE_OSS
 
 #include "ConfigManager.h"
-#include "gui_templates.h"
 
 
 

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"
 

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 ) :

src/core/midi/MidiWinMM.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "MidiWinMM.h"
-#include "Note.h"
 
 #ifdef LMMS_BUILD_WIN32
 

src/gui/AutomatableModelView.cpp

@@ -22,7 +22,6 @@
  *
  */
 
-#include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
 

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 ) );

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();
-}
+}

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);

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"
 
 

src/gui/EffectControlDialog.cpp

@@ -23,7 +23,6 @@
  *
  */
 
-#include <QMessageBox>
 #include <QCloseEvent>
 
 #include "EffectControlDialog.h"

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"
 

src/gui/ExportProjectDialog.cpp

@@ -23,9 +23,7 @@
  */
 
 #include <QFileInfo>
-#include <QDir>
 #include <QMessageBox>
-#include <QDebug>
 
 #include "ExportProjectDialog.h"
 #include "Song.h"

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"

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>
 

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"

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"

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 ) :

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() ) );

src/gui/LmmsStyle.cpp

@@ -26,7 +26,6 @@
 
 #include <QFile>
 #include <QApplication>
-#include <QFrame>
 #include <QPainter>
 #include <QPainterPath>
 #include <QStyleFactory>

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"

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"

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) :

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 ) );

src/gui/MidiSetupWidget.cpp

@@ -24,6 +24,7 @@
 
 #include "MidiSetupWidget.h"
 
+#include <QLabel>
 #include <QLineEdit>
 
 #include "ConfigManager.h"

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() :

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 ) );

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) :

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 ) :

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.

src/gui/PluginBrowser.cpp

@@ -34,7 +34,6 @@
 
 #include "embed.h"
 #include "Engine.h"
-#include "gui_templates.h"
 #include "StringPairDrag.h"
 #include "PluginFactory.h"
 

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; }
-}
+}

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);
-}
+}

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);
 	}
-}
+}

src/gui/SetupDialog.cpp

@@ -28,7 +28,6 @@
 #include <QLabel>
 #include <QLayout>
 #include <QLineEdit>
-#include <QMessageBox>
 #include <QScrollArea>
 
 #include "AudioDeviceSetupWidget.h"

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"
 

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;

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"
 

src/gui/TrackView.cpp

@@ -27,7 +27,6 @@
 
 #include <QApplication>
 #include <QHBoxLayout>
-#include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QStyleOption>

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"

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"

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"

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>