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

CMakeLists.txt

@@ -128,8 +128,6 @@ ENDIF()
 
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
-CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
 CHECK_INCLUDE_FILES(semaphore.h LMMS_HAVE_SEMAPHORE_H)
 CHECK_INCLUDE_FILES(unistd.h LMMS_HAVE_UNISTD_H)

include/AudioDevice.h

@@ -25,7 +25,7 @@
 #ifndef AUDIO_DEVICE_H
 #define AUDIO_DEVICE_H
 
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <samplerate.h>
 
 #include "lmms_basics.h"

include/AudioEngine.h

@@ -25,16 +25,15 @@
 #ifndef AUDIO_ENGINE_H
 #define AUDIO_ENGINE_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QVector>
-#include <QtCore/QWaitCondition>
+#include <QMutex>
+#include <QThread>
+#include <QVector>
+#include <QWaitCondition>
 #include <samplerate.h>
 
 
 #include "lmms_basics.h"
 #include "LocklessList.h"
-#include "Note.h"
 #include "FifoBuffer.h"
 #include "AudioEngineProfiler.h"
 #include "PlayHandle.h"

include/AudioEngineWorkerThread.h

@@ -25,7 +25,7 @@
 #ifndef AUDIO_ENGINE_WORKER_THREAD_H
 #define AUDIO_ENGINE_WORKER_THREAD_H
 
-#include <QtCore/QThread>
+#include <QThread>
 
 #include <atomic>
 

include/AudioFileDevice.h

@@ -26,7 +26,7 @@
 #ifndef AUDIO_FILE_DEVICE_H
 #define AUDIO_FILE_DEVICE_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "AudioDevice.h"
 #include "OutputSettings.h"

include/AudioJack.h

@@ -35,9 +35,7 @@
 #endif
 
 #include <atomic>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QMap>
+#include <QVector>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"

include/AudioPort.h

@@ -26,9 +26,8 @@
 #define AUDIO_PORT_H
 
 #include <memory>
-#include <QtCore/QString>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
+#include <QString>
+#include <QMutex>
 
 #include "MemoryManager.h"
 #include "PlayHandle.h"

include/AudioPortAudio.h

@@ -25,7 +25,7 @@
 #ifndef AUDIO_PORTAUDIO_H
 #define AUDIO_PORTAUDIO_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmmsconfig.h"
 #include "ComboBoxModel.h"
@@ -48,7 +48,6 @@ public:
 
 #include <portaudio.h>
 
-#include <QtCore/QSemaphore>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"

include/AudioSampleRecorder.h

@@ -26,8 +26,8 @@
 #ifndef AUDIO_SAMPLE_RECORDER_H
 #define AUDIO_SAMPLE_RECORDER_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QList>
+#include <QPair>
 
 #include "AudioDevice.h"
 

include/AudioSdl.h

@@ -30,7 +30,6 @@
 #ifdef LMMS_HAVE_SDL
 
 #ifdef LMMS_HAVE_SDL2
-#include <SDL2/SDL.h>
 #include <SDL2/SDL_audio.h>
 #else
 #include <SDL/SDL.h>

include/AudioSoundIo.h

@@ -25,10 +25,8 @@
 #ifndef AUDIO_SOUNDIO_H
 #define AUDIO_SOUNDIO_H
 
-#include <QtCore/QObject>
 
 #include "lmmsconfig.h"
-#include "ComboBoxModel.h"
 
 #ifdef LMMS_HAVE_SOUNDIO
 

include/AutomatableModel.h

@@ -25,8 +25,8 @@
 #ifndef AUTOMATABLE_MODEL_H
 #define AUTOMATABLE_MODEL_H
 
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
+#include <QMap>
+#include <QMutex>
 
 #include "JournallingObject.h"
 #include "Model.h"

include/AutomationClip.h

@@ -27,8 +27,8 @@
 #ifndef AUTOMATION_CLIP_H
 #define AUTOMATION_CLIP_H
 
-#include <QtCore/QMap>
-#include <QtCore/QPointer>
+#include <QMap>
+#include <QPointer>
 
 #include "AutomationNode.h"
 #include "Clip.h"

include/AutomationClipView.h

@@ -27,11 +27,10 @@
 
 #include <QStaticText>
 
-#include "AutomationClip.h"
-#include "Song.h"
-#include "SongEditor.h"
 #include "ClipView.h"
 
+class AutomationClip;
+
 
 class AutomationClipView : public ClipView
 {

include/AutomationEditor.h

@@ -26,7 +26,6 @@
 #ifndef AUTOMATION_EDITOR_H
 #define AUTOMATION_EDITOR_H
 
-#include <QVector>
 #include <QWidget>
 
 #include "Editor.h"
@@ -36,13 +35,13 @@
 #include "TimePos.h"
 #include "AutomationClip.h"
 #include "ComboBoxModel.h"
-#include "Knob.h"
 
 class QPainter;
 class QPixmap;
 class QScrollBar;
 
 class ComboBox;
+class Knob;
 class NotePlayHandle;
 class TimeLineWidget;
 

include/AutomationTrackView.h

@@ -26,9 +26,10 @@
 #ifndef AUTOMATION_TRACK_VIEW_H
 #define AUTOMATION_TRACK_VIEW_H
 
-#include "AutomationTrack.h"
 #include "TrackView.h"
 
+class AutomationTrack;
+
 
 class AutomationTrackView : public TrackView
 {

include/BasicFilters.h

@@ -36,7 +36,7 @@
 #define __USE_XOPEN
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include "lmms_basics.h"
 #include "lmms_constants.h"

include/CPULoadWidget.h

@@ -27,7 +27,7 @@
 #ifndef CPULOAD_WIDGET_H
 #define CPULOAD_WIDGET_H
 
-#include <QtCore/QTimer>
+#include <QTimer>
 #include <QPixmap>
 #include <QWidget>
 

include/Clip.h

@@ -28,7 +28,6 @@
 #include <QColor>
 
 #include "AutomatableModel.h"
-#include "lmms_basics.h"
 
 
 class Track;

include/ClipView.h

@@ -26,7 +26,7 @@
 #define TRACK_CONTENT_OBJECT_VIEW_H
 
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "ModelView.h"
 #include "Rubberband.h"
@@ -61,6 +61,8 @@ class ClipView : public selectableObject, public ModelView
 	Q_PROPERTY( QSize mouseHotspotKnife MEMBER m_mouseHotspotKnife )
 
 public:
+	const static int BORDER_WIDTH = 2;
+
 	ClipView( Clip * clip, TrackView * tv );
 	virtual ~ClipView();
 

include/Clipboard.h

@@ -25,7 +25,7 @@
 #ifndef CLIPBOARD_H
 #define CLIPBOARD_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QDomElement>
 
 class QMimeData;

include/ComboBoxModel.h

@@ -25,7 +25,6 @@
 #ifndef COMBOBOX_MODEL_H
 #define COMBOBOX_MODEL_H
 
-#include <cassert>
 #include <memory>
 #include <utility>
 #include <vector>

include/ConfigManager.h

@@ -28,11 +28,11 @@
 
 #include "lmmsconfig.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
-#include <QtCore/QObject>
+#include <QMap>
+#include <QPair>
+#include <QStringList>
+#include <QVector>
+#include <QObject>
 
 #include "lmms_export.h"
 

include/ControllerConnection.h

@@ -30,8 +30,8 @@
 #ifndef CONTROLLER_CONNECTION_H
 #define CONTROLLER_CONNECTION_H
 
-#include <QtCore/QObject>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QVector>
 
 #include "Controller.h"
 #include "JournallingObject.h"

include/Controls.h

@@ -26,7 +26,6 @@
 #define CONTROLS_H
 
 
-#include "Model.h"
 
 // headers only required for covariance
 #include "AutomatableModel.h"

include/DataFile.h

@@ -32,8 +32,8 @@
 
 #include "lmms_export.h"
 #include "MemoryManager.h"
-#include "ProjectVersion.h"
 
+class ProjectVersion;
 class QTextStream;
 
 class LMMS_EXPORT DataFile : public QDomDocument

include/DummyEffect.h

@@ -25,10 +25,14 @@
 #ifndef DUMMY_EFFECT_H
 #define DUMMY_EFFECT_H
 
+#include <QDomElement>
+
 #include "Effect.h"
 #include "EffectControls.h"
 #include "EffectControlDialog.h"
 
+class Knob;
+
 
 class DummyEffectControlDialog : public EffectControlDialog
 {

include/DummyInstrument.h

@@ -30,7 +30,7 @@
 #include "InstrumentView.h"
 #include "Engine.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "AudioEngine.h"
 

include/EffectSelectDialog.h

@@ -29,7 +29,6 @@
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 
-#include "EffectChain.h"
 #include "Effect.h"
 
 

include/Engine.h

@@ -26,8 +26,8 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QString>
+#include <QObject>
 
 
 #include "lmmsconfig.h"

include/EnvelopeAndLfoParameters.h

@@ -25,7 +25,7 @@
 #ifndef ENVELOPE_AND_LFO_PARAMETERS_H
 #define ENVELOPE_AND_LFO_PARAMETERS_H
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "JournallingObject.h"
 #include "AutomatableModel.h"

include/ExportFilter.h

@@ -26,7 +26,7 @@
 #ifndef EXPORT_FILTER_H
 #define EXPORT_FILTER_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "TrackContainer.h"
 #include "Plugin.h"

include/FifoBuffer.h

@@ -25,7 +25,7 @@
 #ifndef FIFO_BUFFER_H
 #define FIFO_BUFFER_H
 
-#include <QtCore/QSemaphore>
+#include <QSemaphore>
 
 
 template<typename T>

include/FileBrowser.h

@@ -27,8 +27,8 @@
 #define FILE_BROWSER_H
 
 #include <QCheckBox>
-#include <QtCore/QDir>
-#include <QtCore/QMutex>
+#include <QDir>
+#include <QMutex>
 #include <QTreeWidget>
 
 

include/GuiApplication.h

@@ -25,7 +25,7 @@
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 #include "lmms_export.h"
 #include "lmmsconfig.h"

include/ImportFilter.h

@@ -26,7 +26,7 @@
 #ifndef IMPORT_FILTER_H
 #define IMPORT_FILTER_H
 
-#include <QtCore/QFile>
+#include <QFile>
 
 #include "Plugin.h"
 

include/InstrumentTrack.h

@@ -35,10 +35,8 @@
 #include "MidiPort.h"
 #include "NotePlayHandle.h"
 #include "Piano.h"
-#include "Pitch.h"
 #include "Plugin.h"
 #include "Track.h"
-#include "TrackView.h"
 
 
 class Instrument;

include/InstrumentTrackView.h

@@ -28,11 +28,11 @@
 #include "TrackView.h"
 
 #include "InstrumentTrack.h"
-#include "MidiCCRackView.h"
 
 
 class InstrumentTrackWindow;
 class Knob;
+class MidiCCRackView;
 class TrackContainerView;
 class TrackLabelButton;
 

include/JournallingObject.h

@@ -25,7 +25,7 @@
 #ifndef JOURNALLING_OBJECT_H
 #define JOURNALLING_OBJECT_H
 
-#include <QtCore/QStack>
+#include <QStack>
 
 #include "lmms_basics.h"
 #include "SerializingObject.h"

include/Keymap.h

@@ -29,7 +29,6 @@
 #include <QObject>
 #include <QString>
 
-#include "Note.h"
 #include "SerializingObject.h"
 
 class Keymap : public QObject, public SerializingObject

include/Knob.h

@@ -29,7 +29,7 @@
 #include <memory>
 #include <QPixmap>
 #include <QWidget>
-#include <QtCore/QPoint>
+#include <QPoint>
 #include <QTextDocument>
 
 #include "AutomatableModelView.h"

include/LadspaManager.h

@@ -30,10 +30,10 @@
 
 #include <ladspa.h>
 
-#include <QtCore/QMap>
-#include <QtCore/QPair>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QMap>
+#include <QPair>
+#include <QString>
+#include <QStringList>
 
 
 #include "lmms_export.h"

include/LcdWidget.h

@@ -26,7 +26,7 @@
 #ifndef LCD_WIDGET_H
 #define LCD_WIDGET_H
 
-#include <QtCore/QMap>
+#include <QMap>
 #include <QWidget>
 
 #include "lmms_export.h"

include/LeftRightNav.h

@@ -27,7 +27,6 @@
 
 #include "PixmapButton.h"
 
-#include <QLayout>
 
 class LeftRightNav : public QWidget
 {

include/LinkedModelGroupViews.h

@@ -28,7 +28,6 @@
 
 #include <cstddef>
 #include <memory>
-#include <vector>
 #include <QWidget>
 
 

include/LinkedModelGroups.h

@@ -27,8 +27,6 @@
 
 
 #include <cstddef>
-#include <memory>
-#include <vector>
 
 #include "Model.h"
 

include/LocklessAllocator.h

@@ -26,7 +26,7 @@
 #define LOCKLESS_ALLOCATOR_H
 
 #include <atomic>
-#include <stddef.h>
+#include <cstddef>
 
 class LocklessAllocator
 {

include/Lv2ControlBase.h

@@ -30,6 +30,7 @@
 #ifdef LMMS_HAVE_LV2
 
 #include <lilv/lilv.h>
+#include <memory>
 
 #include "DataFile.h"
 #include "LinkedModelGroups.h"

include/Lv2Features.h

@@ -29,7 +29,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <lv2.h>
 #include <map>
 #include <vector>
 #include "Lv2Manager.h"

include/Lv2Proc.h

@@ -31,18 +31,17 @@
 
 #include <lilv/lilv.h>
 #include <memory>
-#include <QObject>
 
 #include "Lv2Basics.h"
 #include "Lv2Features.h"
 #include "Lv2Options.h"
 #include "LinkedModelGroups.h"
-#include "MidiEvent.h"
 #include "Plugin.h"
-#include "PluginIssue.h"
 #include "../src/3rdparty/ringbuffer/include/ringbuffer/ringbuffer.h"
 #include "TimePos.h"
 
+class PluginIssue;
+
 // forward declare port structs/enums
 namespace Lv2Ports
 {

include/Lv2UridCache.h

@@ -29,7 +29,6 @@
 
 #ifdef LMMS_HAVE_LV2
 
-#include <QtGlobal>
 #include <cstdint>
 
 //! Cached URIDs for fast access (for use in real-time code)

include/Lv2ViewBase.h

@@ -30,8 +30,6 @@
 #ifdef LMMS_HAVE_LV2
 
 
-#include <QString>
-#include <QVector>
 
 #include "LinkedModelGroupViews.h"
 #include "lmms_export.h"

include/MainWindow.h

@@ -25,13 +25,12 @@
 #ifndef MAIN_WINDOW_H
 #define MAIN_WINDOW_H
 
-#include <QtCore/QBasicTimer>
-#include <QtCore/QTimer>
-#include <QtCore/QList>
+#include <QBasicTimer>
+#include <QTimer>
+#include <QList>
 #include <QMainWindow>
 
 #include "ConfigManager.h"
-#include "SubWindow.h"
 
 class QAction;
 class QDomElement;
@@ -40,6 +39,7 @@ class QMdiArea;
 
 class ConfigManager;
 class PluginView;
+class SubWindow;
 class ToolButton;
 
 

include/Microtuner.h

@@ -28,8 +28,6 @@
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
 #include "JournallingObject.h"
-#include "lmms_constants.h"
-#include "Note.h"
 
 class LMMS_EXPORT Microtuner : public Model, public JournallingObject
 {

include/MicrotunerConfig.h

@@ -25,17 +25,16 @@
 #ifndef MICROTUNER_CONFIG_H
 #define MICROTUNER_CONFIG_H
 
-#include <QCloseEvent>
-#include <QLineEdit>
-#include <QMainWindow>
-#include <QPlainTextEdit>
+
+#include <QWidget>
 
 #include "AutomatableModel.h"
 #include "ComboBoxModel.h"
-#include "LcdFloatSpinBox.h"
-#include "LcdSpinBox.h"
 #include "SerializingObject.h"
 
+class QLineEdit;
+class QPlainTextEdit;
+
 class LMMS_EXPORT MicrotunerConfig : public QWidget, public SerializingObject
 {
 	Q_OBJECT

include/MidiAlsaRaw.h

@@ -31,7 +31,8 @@
 
 #include <alsa/asoundlib.h>
 
-#include <QtCore/QThread>
+#include <QMap>
+#include <QThread>
 
 #include "MidiClient.h"
 

include/MidiAlsaSeq.h

@@ -30,9 +30,10 @@
 #ifdef LMMS_HAVE_ALSA
 #include <alsa/asoundlib.h>
 
-#include <QtCore/QMutex>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
+#include <QMap>
+#include <QMutex>
+#include <QThread>
+#include <QTimer>
 
 
 #include "MidiClient.h"

include/MidiCCRackView.h

@@ -3,12 +3,12 @@
 
 #include <QWidget>
 
-#include "GroupBox.h"
-#include "Knob.h"
 #include "Midi.h"
 #include "SerializingObject.h"
 
+class GroupBox;
 class InstrumentTrack;
+class Knob;
 
 class MidiCCRackView : public QWidget, public SerializingObject
 {

include/MidiClient.h

@@ -25,16 +25,16 @@
 #ifndef MIDI_CLIENT_H
 #define MIDI_CLIENT_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QStringList>
+#include <QVector>
 
 
 #include "MidiEvent.h"
-#include "MidiEventProcessor.h"
-#include "TabWidget.h"
 
 
 class MidiPort;
+class QObject;
+class TimePos;
 
 
 // base-class for all MIDI-clients

include/MidiClip.h

@@ -26,11 +26,9 @@
 #ifndef MIDI_CLIP_H
 #define MIDI_CLIP_H
 
-#include <QStaticText>
 
+#include "Clip.h"
 #include "Note.h"
-#include "MidiClipView.h"
-#include "ClipView.h"
 
 
 class InstrumentTrack;

include/MidiClipView.h

@@ -25,7 +25,8 @@
 #ifndef MIDI_CLIP_VIEW_H
 #define MIDI_CLIP_VIEW_H
  
-#include "MidiClip.h"
+#include <QStaticText>
+
 #include "ClipView.h"
 
 class MidiClip;

include/MidiJack.h

@@ -35,15 +35,13 @@
 #include "weak_libjack.h"
 #endif
 
-#include <QtCore/QThread>
-#include <QMutex>
-#include <QtCore/QFile>
+#include <QThread>
 
 #include "MidiClient.h"
-#include "AudioJack.h"
 
 constexpr size_t JACK_MIDI_BUFFER_MAX = 64; /* events */
 
+class AudioJack;
 class QLineEdit;
 
 class MidiJack : public QThread, public MidiClientRaw

include/MidiOss.h

@@ -29,8 +29,8 @@
 
 #ifdef LMMS_HAVE_OSS
 
-#include <QtCore/QThread>
-#include <QtCore/QFile>
+#include <QThread>
+#include <QFile>
 
 #include "MidiClient.h"
 

include/MidiPort.h

@@ -26,9 +26,9 @@
 #ifndef MIDI_PORT_H
 #define MIDI_PORT_H
 
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QMap>
+#include <QString>
+#include <QList>
+#include <QMap>
 
 #include "Midi.h"
 #include "TimePos.h"

include/MidiSetupWidget.h

@@ -25,7 +25,6 @@
 #ifndef MIDISETUPWIDGET_H
 #define MIDISETUPWIDGET_H
 
-#include <QLabel>
 
 #include "TabWidget.h"
 

include/MidiSndio.h

@@ -30,10 +30,8 @@
 
 #ifdef LMMS_HAVE_SNDIO
 
-#include <QtCore/QThread>
-#include <QtCore/QFile>
+#include <QThread>
 
-#include <sndio.h>
 
 #include "MidiClient.h"
 

include/MixerLine.h

@@ -26,18 +26,15 @@
 #ifndef MIXER_LINE_H
 #define MIXER_LINE_H
 
-#include <QColorDialog>
-#include <QGraphicsView>
-#include <QLineEdit>
 #include <QWidget>
 
-#include "ColorChooser.h"
-#include "Knob.h"
-#include "LcdWidget.h"
-#include "SendButtonIndicator.h"
 
 
 
+class QGraphicsView;
+class QLineEdit;
+class Knob;
+class LcdWidget;
 class MixerView;
 class SendButtonIndicator;
 

include/Model.h

@@ -25,8 +25,8 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QString>
+#include <QObject>
 
 #include "lmms_export.h"
 

include/ModelView.h

@@ -25,7 +25,7 @@
 #ifndef MODEL_VIEW_H
 #define MODEL_VIEW_H
 
-#include <QtCore/QPointer>
+#include <QPointer>
 #include "Model.h"
 
 

include/NStateButton.h

@@ -27,8 +27,8 @@
 #define NSTATE_BUTTON_H
 
 #include <QPixmap>
-#include <QtCore/QVector>
-#include <QtCore/QPair>
+#include <QVector>
+#include <QPair>
 
 #include "ToolButton.h"
 

include/Note.h

@@ -26,7 +26,7 @@
 #ifndef NOTE_H
 #define NOTE_H
 
-#include <QtCore/QVector>
+#include <QVector>
 
 #include "volume.h"
 #include "panning.h"

include/Oscillator.h

@@ -28,11 +28,7 @@
 
 #include <cassert>
 #include <fftw3.h>
-#include <math.h>
-
-#ifdef LMMS_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+#include <cstdlib>
 
 #include "Engine.h"
 #include "lmms_constants.h"

include/PatternClip.h

@@ -26,8 +26,7 @@
 #ifndef PATTERN_CLIP_H
 #define PATTERN_CLIP_H
 
-#include "ClipView.h"
-
+#include "Clip.h"
 
 /*! \brief Dummy clip for PatternTracks
  *

include/PatternClipView.h

@@ -26,10 +26,13 @@
 #ifndef PATTERN_CLIP_VIEW_H
 #define PATTERN_CLIP_VIEW_H
 
-#include "PatternClip.h"
 
 #include <QStaticText>
 
+#include "ClipView.h"
+
+class PatternClip;
+
 
 class PatternClipView : public ClipView
 {

include/PatternTrack.h

@@ -27,9 +27,8 @@
 #define PATTERN_TRACK_H
 
 
-#include <QtCore/QMap>
+#include <QMap>
 
-#include "PatternClipView.h"
 #include "Track.h"
 
 class TrackLabelButton;

include/PatternTrackView.h

@@ -26,11 +26,12 @@
 #ifndef PATTERN_TRACK_VIEW_H
 #define PATTERN_TRACK_VIEW_H
 
-#include <QtCore/QObject>
 
-#include "PatternTrack.h"
 #include "TrackView.h"
 
+class PatternTrack;
+class TrackLabelButton;
+
 
 class PatternTrackView : public TrackView
 {

include/PeakController.h

@@ -25,7 +25,6 @@
 #ifndef PEAK_CONTROLLER_H
 #define PEAK_CONTROLLER_H
 
-#include "Model.h"
 #include "Controller.h"
 #include "ControllerDialog.h"
 

include/PerfLog.h

@@ -26,7 +26,7 @@
 #define PERFLOG_H
 
 #include <ctime>
-#include <QtCore/QString>
+#include <QString>
 
 /// \brief CPU time point
 ///

include/PianoRoll.h

@@ -29,7 +29,6 @@
 
 #include <QVector>
 #include <QWidget>
-#include <QInputDialog>
 
 #include "Editor.h"
 #include "ComboBoxModel.h"
@@ -37,13 +36,12 @@
 #include "Note.h"
 #include "lmms_basics.h"
 #include "Song.h"
-#include "ToolTip.h"
 #include "StepRecorder.h"
 #include "StepRecorderWidget.h"
-#include "PositionLine.h"
 
 class QPainter;
 class QPixmap;
+class QPushButton;
 class QScrollBar;
 class QString;
 class QMenu;
@@ -52,6 +50,8 @@ class QToolButton;
 class ComboBox;
 class NotePlayHandle;
 class MidiClip;
+class PositionLine;
+class TextFloat;
 class TimeLineWidget;
 
 class PianoRoll : public QWidget

include/PlayHandle.h

@@ -25,12 +25,11 @@
 #ifndef PLAY_HANDLE_H
 #define PLAY_HANDLE_H
 
-#include <QtCore/QList>
-#include <QtCore/QMutex>
+#include <QList>
+#include <QMutex>
 
 #include "lmms_export.h"
 
-#include "MemoryManager.h"
 
 #include "ThreadableJob.h"
 #include "lmms_basics.h"

include/Plugin.h

@@ -25,9 +25,8 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
-#include <QtXml/QDomDocument>
+#include <QStringList>
+#include <QMap>
 
 #include "JournallingObject.h"
 #include "Model.h"

include/PluginBrowser.h

@@ -25,7 +25,6 @@
 #ifndef PLUGIN_BROWSER_H
 #define PLUGIN_BROWSER_H
 
-#include <QtCore/QTimer>
 #include <QPixmap>
 
 #include "SideBarWidget.h"

include/PluginFactory.h

@@ -28,11 +28,10 @@
 #include <memory>
 #include <string>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QFileInfo>
+#include <QList>
+#include <QString>
+#include <QVector>
 
 #include "lmms_export.h"
 #include "Plugin.h"

include/ProjectJournal.h

@@ -25,8 +25,8 @@
 #ifndef PROJECT_JOURNAL_H
 #define PROJECT_JOURNAL_H
 
-#include <QtCore/QHash>
-#include <QtCore/QStack>
+#include <QHash>
+#include <QStack>
 
 #include "lmms_basics.h"
 #include "DataFile.h"

include/ProjectNotes.h

@@ -27,7 +27,6 @@
 #define PROJECT_NOTES_H
 
 #include <QMainWindow>
-#include <QCloseEvent>
 
 #include "SerializingObject.h"
 

include/ProjectVersion.h

@@ -27,8 +27,8 @@
 #ifndef PROJECT_VERSION_H
 #define PROJECT_VERSION_H
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 
 #include <limits>
 

include/RemotePlugin.h

@@ -45,8 +45,8 @@
 #include <process.h>
 #endif
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QSystemSemaphore>
+#include <QtGlobal>
+#include <QSystemSemaphore>
 #endif
 
 
@@ -59,8 +59,8 @@
 #else
 #define USE_QT_SHMEM
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QSharedMemory>
+#include <QtGlobal>
+#include <QSharedMemory>
 
 #if !defined(LMMS_HAVE_SYS_TYPES_H) || defined(LMMS_BUILD_WIN32)
 typedef int32_t key_t;
@@ -69,7 +69,7 @@ typedef int32_t key_t;
 
 
 #ifdef LMMS_HAVE_LOCALE_H
-#include <locale.h>
+#include <clocale>
 #endif
 
 #ifdef LMMS_HAVE_PTHREAD_H
@@ -89,10 +89,10 @@ typedef int32_t key_t;
 
 #else
 #include "lmms_export.h"
-#include <QtCore/QMutex>
-#include <QtCore/QProcess>
-#include <QtCore/QThread>
-#include <QtCore/QString>
+#include <QMutex>
+#include <QProcess>
+#include <QThread>
+#include <QString>
 
 #ifndef SYNC_WITH_SHM_FIFO
 #include <poll.h>
@@ -1012,7 +1012,7 @@ private:
 #ifdef COMPILE_REMOTE_PLUGIN_BASE
 
 #ifndef BUILD_REMOTE_PLUGIN_CLIENT
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
 #endif
 
 

include/RingBuffer.h

@@ -27,9 +27,9 @@
 #ifndef RINGBUFFER_H
 #define RINGBUFFER_H
 
+#include <cmath>
 #include <QObject>
 #include "lmms_basics.h"
-#include "lmms_math.h"
 #include "MemoryManager.h"
 
 /** \brief A basic LMMS ring buffer for single-thread use. For thread and realtime safe alternative see LocklessRingBuffer.

include/Rubberband.h

@@ -28,7 +28,7 @@
 #define RUBBERBAND_H
 
 #include <QRubberBand>
-#include <QtCore/QVector>
+#include <QVector>
 
 
 class selectableObject : public QWidget

include/SampleBuffer.h

@@ -27,8 +27,8 @@
 #define SAMPLE_BUFFER_H
 
 #include <memory>
-#include <QtCore/QReadWriteLock>
-#include <QtCore/QObject>
+#include <QReadWriteLock>
+#include <QObject>
 
 #include <samplerate.h>
 

include/SampleClip.h

@@ -25,10 +25,10 @@
 #ifndef SAMPLE_CLIP_H
 #define SAMPLE_CLIP_H
 
-#include "SampleBuffer.h"
-#include "SampleTrack.h"
 #include "Clip.h"
- 
+
+class SampleBuffer;
+
 
 class SampleClip : public Clip
 {

include/SampleClipView.h

@@ -25,11 +25,10 @@
 #ifndef SAMPLE_CLIP_VIEW_H
 #define SAMPLE_CLIP_VIEW_H
 
-#include "SampleClipView.h"
-
-#include "SampleClip.h"
 #include "ClipView.h"
 
+class SampleClip;
+
 class SampleClipView : public ClipView
 {
 	Q_OBJECT
@@ -62,4 +61,4 @@ private:
 
 
 
-#endif
+#endif

include/SampleRecordHandle.h

@@ -26,8 +26,8 @@
 #ifndef SAMPLE_RECORD_HANDLE_H
 #define SAMPLE_RECORD_HANDLE_H
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
+#include <QList>
+#include <QPair>
 
 #include "PlayHandle.h"
 #include "TimePos.h"

include/SampleTrack.h

@@ -25,13 +25,8 @@
 #ifndef SAMPLE_TRACK_H
 #define SAMPLE_TRACK_H
 
-#include <QLayout>
 
 #include "AudioPort.h"
-#include "FadeButton.h"
-#include "Mixer.h"
-#include "SampleClip.h"
-#include "SampleTrackView.h"
 #include "Track.h"
 
 

include/SampleTrackView.h

@@ -25,7 +25,6 @@
 #ifndef SAMPLE_TRACK_VIEW_H
 #define SAMPLE_TRACK_VIEW_H
 
-#include "SampleTrack.h"
 
 #include "TrackView.h"
 

include/SampleTrackWindow.h

@@ -26,12 +26,19 @@
 #ifndef SAMPLE_TRACK_WINDOW_H
 #define SAMPLE_TRACK_WINDOW_H
 
-#include "MixerLineLcdSpinBox.h"
 
-#include <QLineEdit>
 
-#include "EffectRackView.h"
+#include <QWidget>
+
+#include "ModelView.h"
 #include "SampleTrack.h"
+#include "SerializingObject.h"
+
+class EffectRackView;
+class Knob;
+class MixerLineLcdSpinBox;
+class QLineEdit;
+class SampleTrackView;
  
 
 class SampleTrackWindow : public QWidget, public ModelView, public SerializingObjectHook
@@ -89,4 +96,4 @@ private:
 
 
 
-#endif
+#endif

include/Scale.h

@@ -25,7 +25,6 @@
 #ifndef SCALE_H
 #define SCALE_H
 
-#include <cmath>
 #include <cstdint>
 #include <vector>
 #include <QObject>

include/SendButtonIndicator.h

@@ -1,13 +1,10 @@
 #ifndef SENDBUTTONINDICATOR_H
 #define SENDBUTTONINDICATOR_H
 
-#include <QDebug>
 #include <QLabel>
-#include <QPixmap>
 
-#include "MixerLine.h"
-#include "MixerView.h"
 
+class FloatModel;
 class MixerLine;
 class MixerView;
 

include/SerializingObject.h

@@ -25,7 +25,7 @@
 #ifndef SERIALIZING_OBJECT_H
 #define SERIALIZING_OBJECT_H
 
-#include <QtCore/QString>
+#include <QString>
 
 #include "lmms_export.h"
 

include/SetupDialog.h

@@ -27,7 +27,7 @@
 #define SETUP_DIALOG_H
 
 #include <QDialog>
-#include <QtCore/QMap>
+#include <QMap>
 
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"