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

plugins/Amplifier/Amplifier.h

@@ -29,7 +29,6 @@
 
 #include "Effect.h"
 #include "AmplifierControls.h"
-#include "ValueBuffer.h"
 
 class AmplifierEffect : public Effect
 {

plugins/Amplifier/AmplifierControlDialog.cpp

@@ -23,11 +23,11 @@
  *
  */
 
-#include <QLayout>
 
 #include "AmplifierControlDialog.h"
 #include "AmplifierControls.h"
 #include "embed.h"
+#include "Knob.h"
 
 
 

plugins/Amplifier/AmplifierControls.cpp

@@ -28,8 +28,6 @@
 
 #include "AmplifierControls.h"
 #include "Amplifier.h"
-#include "Engine.h"
-#include "Song.h"
 
 
 AmplifierControls::AmplifierControls( AmplifierEffect* effect ) :

plugins/Amplifier/AmplifierControls.h

@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "AmplifierControlDialog.h"
-#include "Knob.h"
 
 
 class AmplifierEffect;

plugins/BassBooster/BassBoosterControlDialog.cpp

@@ -22,11 +22,14 @@
  *
  */
 
-#include <QLayout>
+
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 #include "BassBoosterControlDialog.h"
 #include "BassBoosterControls.h"
 #include "embed.h"
+#include "Knob.h"
 
 
 

plugins/BassBooster/BassBoosterControls.h

@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "BassBoosterControlDialog.h"
-#include "Knob.h"
 
 
 class BassBoosterEffect;

plugins/Bitcrush/Bitcrush.h

@@ -29,8 +29,6 @@
 
 #include "Effect.h"
 #include "BitcrushControls.h"
-#include "ValueBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class BitcrushEffect : public Effect

plugins/Bitcrush/BitcrushControlDialog.cpp

@@ -24,12 +24,11 @@
  */
 
 
-#include <QLayout>
 #include <QLabel>
 
+#include "embed.h"
 #include "BitcrushControlDialog.h"
 #include "BitcrushControls.h"
-#include "embed.h"
 #include "ToolTip.h"
 #include "LedCheckbox.h"
 #include "Knob.h"

plugins/Bitcrush/BitcrushControls.cpp

@@ -28,7 +28,6 @@
 
 #include "BitcrushControls.h"
 #include "Bitcrush.h"
-#include "lmms_math.h"
 
 
 BitcrushControls::BitcrushControls( BitcrushEffect * eff ) :

plugins/Compressor/Compressor.h

@@ -29,8 +29,6 @@
 #include "CompressorControls.h"
 
 #include "Effect.h"
-#include "ValueBuffer.h"
-#include "RmsHelper.h"
 
 
 constexpr float COMP_LOG = -2.2;

plugins/Compressor/CompressorControlDialog.cpp

@@ -27,14 +27,17 @@
 #include "CompressorControls.h"
 
 #include <QLabel>
-#include <QLayout>
 #include <QPainter>
+#include <QWheelEvent>
 
+#include "AutomatableButton.h"
 #include "embed.h"
+#include "../Eq/EqFader.h"
 #include "GuiApplication.h"
-#include "gui_templates.h"
 #include "interpolation.h"
+#include "Knob.h"
 #include "MainWindow.h"
+#include "PixmapButton.h"
 #include "ToolTip.h"
 
 CompressorControlDialog::CompressorControlDialog(CompressorControls* controls) :

plugins/Compressor/CompressorControlDialog.h

@@ -26,17 +26,10 @@
 #define COMPRESSOR_CONTROL_DIALOG_H
 
 #include <QBasicTimer>
-#include <QLabel>
-#include <QMouseEvent>
+#include <QElapsedTimer>
 #include <QPainter>
-#include <QTime>
 
-#include "../Eq/EqFader.h"
 #include "EffectControlDialog.h"
-#include "GuiApplication.h"
-#include "Knob.h"
-#include "MainWindow.h"
-#include "PixmapButton.h"
 
 
 constexpr int COMP_MILLI_PER_PIXEL = 6;
@@ -58,7 +51,12 @@ constexpr float COMP_NOISE_FLOOR = 0.000001;// -120 dbFs
 
 
 
+class automatableButtonGroup;
 class CompressorControls;
+class EqFader;
+class Knob;
+class PixmapButton;
+class QLabel;
 
 class CompressorControlDialog : public EffectControlDialog
 {

plugins/Compressor/CompressorControls.cpp

@@ -28,8 +28,6 @@
 
 #include <QDomElement>
 
-#include "Engine.h"
-#include "Song.h"
 
 
 CompressorControls::CompressorControls(CompressorEffect* effect) :

plugins/Compressor/CompressorControls.h

@@ -28,7 +28,6 @@
 #include "CompressorControlDialog.h"
 
 #include "EffectControls.h"
-#include "Knob.h"
 
 
 class CompressorEffect;

plugins/CrossoverEQ/CrossoverEQ.h

@@ -29,8 +29,6 @@
 
 #include "Effect.h"
 #include "CrossoverEQControls.h"
-#include "ValueBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class CrossoverEQEffect : public Effect

plugins/CrossoverEQ/CrossoverEQControlDialog.cpp

@@ -24,8 +24,6 @@
  *
  */
  
-#include <QLayout>
-#include <QLabel>
 
 #include "CrossoverEQControlDialog.h"
 #include "CrossoverEQControls.h"

plugins/Delay/DelayControls.cpp

@@ -22,12 +22,11 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "DelayControls.h"
 #include "DelayEffect.h"
 #include "Engine.h"
-#include "Song.h"
 
 DelayControls::DelayControls( DelayEffect* effect ):
 	EffectControls( effect ),

plugins/Delay/DelayControls.h

@@ -26,7 +26,6 @@
 #define DELAYCONTROLS_H
 
 #include "EffectControls.h"
-#include "Knob.h"
 #include "DelayControlsDialog.h"
 
 

plugins/Delay/DelayControlsDialog.cpp

@@ -22,6 +22,7 @@
  *
  */
 
+#include "AutomatableModel.h"
 #include "DelayControlsDialog.h"
 #include "DelayControls.h"
 #include "embed.h"

plugins/Delay/DelayControlsDialog.h

@@ -26,9 +26,9 @@
 #define DELAYCONTROLSDIALOG_H
 
 #include "EffectControlDialog.h"
-#include "AutomatableModel.h"
 
 class DelayControls;
+class FloatModel;
 
 class DelayControlsDialog : public EffectControlDialog
 {

plugins/Delay/DelayEffect.cpp

@@ -25,8 +25,10 @@
 #include "DelayEffect.h"
 #include "Engine.h"
 #include "embed.h"
-#include "interpolation.h"
+#include "Lfo.h"
+#include "lmms_math.h"
 #include "plugin_export.h"
+#include "StereoDelay.h"
 
 extern "C"
 {

plugins/Delay/DelayEffect.h

@@ -27,9 +27,9 @@
 
 #include "Effect.h"
 #include "DelayControls.h"
-#include "Lfo.h"
-#include "StereoDelay.h"
-#include "ValueBuffer.h"
+
+class Lfo;
+class StereoDelay;
 
 class DelayEffect : public Effect
 {

plugins/Delay/Lfo.cpp

@@ -23,7 +23,8 @@
  */
 
 #include "Lfo.h"
-#include "lmms_math.h"
+
+#include <cmath>
 
 
 

plugins/Delay/Lfo.h

@@ -25,7 +25,8 @@
 #ifndef LFO_H
 #define LFO_H
 
-#include "lmms_math.h"
+#include "lmms_constants.h"
+
 
 class Lfo
 {

plugins/Delay/StereoDelay.cpp

@@ -23,10 +23,7 @@
  */
 
 #include "StereoDelay.h"
-#include <cstdlib>
 #include "lmms_basics.h"
-#include "interpolation.h"
-#include "lmms_math.h"
 
 
 StereoDelay::StereoDelay( int maxTime, int sampleRate )

plugins/DualFilter/DualFilterControlDialog.cpp

@@ -23,11 +23,10 @@
  *
  */
 
-#include <QLayout>
 
 #include "DualFilterControlDialog.h"
 #include "DualFilterControls.h"
-#include "embed.h"
+#include "Knob.h"
 #include "LedCheckbox.h"
 #include "ComboBox.h"
 #include "ToolTip.h"

plugins/DualFilter/DualFilterControls.cpp

@@ -31,7 +31,6 @@
 #include "DualFilter.h"
 #include "embed.h"
 #include "Engine.h"
-#include "Song.h"
 
 DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
 	EffectControls( effect ),

plugins/DualFilter/DualFilterControls.h

@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "DualFilterControlDialog.h"
-#include "Knob.h"
 #include "ComboBoxModel.h"
 
 class DualFilterEffect;

plugins/Eq/EqControls.cpp

@@ -24,7 +24,7 @@
 
 #include "EqControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "EqControlsDialog.h"
 #include "EqEffect.h"

plugins/Eq/EqControlsDialog.cpp

@@ -25,15 +25,11 @@
 
 #include "EqControlsDialog.h"
 
-#include <QGraphicsView>
-#include <QLayout>
 #include <QWidget>
 
 #include "AutomatableButton.h"
 #include "embed.h"
-#include "Engine.h"
 #include "Knob.h"
-#include "Fader.h"
 #include "LedCheckbox.h"
 #include "PixmapButton.h"
 

plugins/Eq/EqControlsDialog.h

@@ -25,8 +25,6 @@
 #ifndef EQCONTROLSDIALOG_H
 #define EQCONTROLSDIALOG_H
 
-#include <QLabel>
-#include <QPushButton>
 
 #include "EffectControlDialog.h"
 

plugins/Eq/EqCurve.cpp

@@ -23,9 +23,15 @@
  */
 #include "EqCurve.h"
 
-#include "Effect.h"
+#include <cmath>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+
+#include "AudioEngine.h"
 #include "embed.h"
-#include "lmms_math.h"
+#include "Engine.h"
+#include "lmms_constants.h"
+
 
 EqHandle::EqHandle( int num, int x, int y ):
 	m_numb( num ),

plugins/Eq/EqCurve.h

@@ -25,11 +25,8 @@
 #ifndef EQCURVE_H
 #define EQCURVE_H
 
-#include <QGraphicsItem>
-#include <QPainter>
-#include <QGraphicsSceneWheelEvent>
-#include "lmms_math.h"
-#include "AutomatableModelView.h"
+#include <QGraphicsObject>
+
 
 
 enum{

plugins/Eq/EqEffect.cpp

@@ -25,8 +25,6 @@
 #include "EqEffect.h"
 
 #include "Engine.h"
-#include "EqFader.h"
-#include "interpolation.h"
 #include "lmms_math.h"
 
 #include "embed.h"

plugins/Eq/EqEffect.h

@@ -24,11 +24,9 @@
 #ifndef EQEFFECT_H
 #define EQEFFECT_H
 
-#include "BasicFilters.h"
 #include "Effect.h"
 #include "EqControls.h"
 #include "EqFilter.h"
-#include "lmms_math.h"
 
 
 

plugins/Eq/EqParameterWidget.cpp

@@ -25,13 +25,18 @@
 
 #include "EqParameterWidget.h"
 
+#include <cmath>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QMouseEvent>
+#include <QPainter>
+#include <QPen>
 #include <QWidget>
 
-#include "EqControls.h"
-#include "lmms_math.h"
+#include "AutomatableModel.h"
+#include "EqCurve.h"
+#include "EqParameterWidget.h"
+#include "lmms_constants.h"
+
 
 
 EqParameterWidget::EqParameterWidget( QWidget *parent, EqControls * controls ) :

plugins/Eq/EqParameterWidget.h

@@ -29,11 +29,12 @@
 
 #include <QWidget>
 
-#include "EffectControls.h"
-#include "EqCurve.h"
-#include "TextFloat.h"
 
+class BoolModel;
 class EqControls;
+class EqCurve;
+class EqHandle;
+class FloatModel;
 
 class EqBand
 {

plugins/Eq/EqSpectrumView.cpp

@@ -22,11 +22,16 @@
 
 #include "EqSpectrumView.h"
 
+#include <cmath>
+#include <QPainter>
+#include <QPen>
+
 #include "AudioEngine.h"
 #include "Engine.h"
 #include "EqCurve.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "lmms_constants.h"
 
 EqAnalyser::EqAnalyser() :
 	m_framesFilledUp ( 0 ),

plugins/Eq/EqSpectrumView.h

@@ -23,13 +23,11 @@
 #ifndef EQSPECTRUMVIEW_H
 #define EQSPECTRUMVIEW_H
 
-#include <QPainter>
 #include <QPainterPath>
 #include <QWidget>
 
 #include "fft_helpers.h"
 #include "lmms_basics.h"
-#include "lmms_math.h"
 
 
 const int MAX_BANDS = 2048;

plugins/Flanger/FlangerControls.cpp

@@ -22,7 +22,7 @@
  *
  */
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "FlangerControls.h"
 #include "FlangerEffect.h"

plugins/Flanger/FlangerControls.h

@@ -26,7 +26,6 @@
 #define FLANGERCONTROLS_H
 
 #include "EffectControls.h"
-#include "Knob.h"
 #include "FlangerControlsDialog.h"
 
 

plugins/Flanger/FlangerControlsDialog.cpp

@@ -23,8 +23,9 @@
  */
 
 #include "FlangerControlsDialog.h"
-#include "FlangerControls.h"
+
 #include "embed.h"
+#include "FlangerControls.h"
 #include "LedCheckbox.h"
 #include "TempoSyncKnob.h"
 

plugins/Flanger/FlangerEffect.h

@@ -28,9 +28,13 @@
 
 #include "Effect.h"
 #include "FlangerControls.h"
-#include "QuadratureLfo.h"
 #include "MonoDelay.h"
 #include "Noise.h"
+#include "QuadratureLfo.h"
+
+class MonoDelay;
+class Noise;
+class QuadratureLfo;
 
 
 class FlangerEffect : public Effect

plugins/Flanger/MonoDelay.cpp

@@ -23,8 +23,6 @@
  */
 
 #include "MonoDelay.h"
-#include "interpolation.h"
-#include "lmms_math.h"
 #include "string.h"
 
 MonoDelay::MonoDelay( int maxTime , int sampleRate )

plugins/FreeBoy/FreeBoy.cpp

@@ -25,11 +25,9 @@
 
 #include <cmath>
 
-#include <QPainter>
 #include <QDomElement>
 #include "FreeBoy.h"
 #include "Gb_Apu_Buffer.h"
-#include "Multi_Buffer.h"
 #include "base64.h"
 #include "InstrumentTrack.h"
 #include "Knob.h"

plugins/FreeBoy/FreeBoy.h

@@ -26,14 +26,14 @@
 #ifndef FREEBOY_H
 #define FREEBOY_H
 
-#include <QObject>
+#include "AutomatableModel.h"
+#include "Blip_Buffer.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 #include "Graph.h"
-#include "Gb_Apu.h"
 
 class FreeBoyInstrumentView;
+class Knob;
 class NotePlayHandle;
 class PixmapButton;
 

plugins/HydrogenImport/HydrogenImport.cpp

@@ -1,10 +1,4 @@
 #include <QDomDocument>
-#include <QDir>
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QTextStream>
-#include <stdlib.h>
 
 #include "LocalFileMng.h"
 #include "HydrogenImport.h"
@@ -15,9 +9,7 @@
 #include "Note.h"
 #include "MidiClip.h"
 #include "PatternStore.h"
-#include "PatternTrack.h"
 #include "Track.h"
-#include "Instrument.h"
 
 #include "plugin_export.h"
 

plugins/HydrogenImport/HydrogenImport.h

@@ -2,8 +2,6 @@
 #define _HYDROGEN_IMPORT_H
 
 #include <QString>
-#include <QPair>
-#include <QVector>
 
 #include "ImportFilter.h"
 

plugins/HydrogenImport/local_file_mgr.cpp

@@ -1,16 +1,11 @@
-#include <cstdlib>
-#include <cassert>
 #include <sys/stat.h>
-#include <ctype.h>
+#include <cctype>
 
-#include <QDir>
-#include <QApplication>
-#include <QVector>
 #include <QDomDocument>
+#include <QFile>
 #include <QLocale>
 #include <QTextCodec>
 
-#include <algorithm>
 #include "LocalFileMng.h"
 
 

plugins/LadspaEffect/LadspaControlDialog.cpp

@@ -26,10 +26,13 @@
 
 #include <cmath>
 
+#include <QHBoxLayout>
 #include <QGroupBox>
-#include <QLayout>
+#include <QVBoxLayout>
 
-#include "LadspaEffect.h"
+#include "LadspaBase.h"
+#include "LadspaControl.h"
+#include "LadspaControls.h"
 #include "LadspaControlDialog.h"
 #include "LadspaControlView.h"
 #include "LedCheckbox.h"

plugins/LadspaEffect/LadspaControls.cpp

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

plugins/LadspaEffect/LadspaControls.h

@@ -26,10 +26,10 @@
 #define LADSPA_CONTROLS_H
 
 #include "EffectControls.h"
-#include "LadspaControl.h"
 #include "LadspaControlDialog.h"
 
 
+class LadspaControl;
 typedef QVector<LadspaControl *> control_list_t;
 
 class LadspaEffect;

plugins/LadspaEffect/LadspaEffect.cpp

@@ -24,20 +24,18 @@
  */
 
 
-#include <QtCore/QVarLengthArray>
+#include <QVarLengthArray>
 #include <QMessageBox>
 
 #include "LadspaEffect.h"
 #include "DataFile.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
-#include "ConfigManager.h"
 #include "Ladspa2LMMS.h"
+#include "LadspaBase.h"
 #include "LadspaControl.h"
 #include "LadspaSubPluginFeatures.h"
-#include "EffectChain.h"
 #include "AutomationClip.h"
-#include "ControllerConnection.h"
 #include "MemoryManager.h"
 #include "ValueBuffer.h"
 #include "Song.h"

plugins/LadspaEffect/LadspaEffect.h

@@ -29,10 +29,12 @@
 #include <QMutex>
 
 #include "Effect.h"
-#include "LadspaBase.h"
+#include "ladspa.h"
 #include "LadspaControls.h"
+#include "LadspaManager.h"
 
 
+typedef struct PortDescription port_desc_t;
 typedef QVector<port_desc_t *> multi_proc_t;
 
 class LadspaEffect : public Effect

plugins/Lv2Effect/Lv2Effect.cpp

@@ -24,8 +24,6 @@
 
 #include "Lv2Effect.h"
 
-#include <QDebug>
-#include <lv2.h>
 
 #include "Lv2SubPluginFeatures.h"
 

plugins/Lv2Effect/Lv2FxControlDialog.cpp

@@ -24,11 +24,8 @@
 
 #include "Lv2FxControlDialog.h"
 
-#include <QDebug>
 #include <QPushButton>
-#include <lv2.h>
 
-#include "Lv2Effect.h"
 #include "Lv2FxControls.h"
 
 

plugins/Lv2Effect/Lv2FxControls.cpp

@@ -29,7 +29,6 @@
 #include "Engine.h"
 #include "Lv2Effect.h"
 #include "Lv2FxControlDialog.h"
-#include "Lv2Proc.h"
 
 
 

plugins/MidiExport/MidiExport.cpp

@@ -24,15 +24,9 @@
  */
 
 
-#include <QDomDocument>
-#include <QDir>
-#include <QApplication>
-#include <QMessageBox>
-#include <QProgressDialog>
 
 #include "MidiExport.h"
 
-#include "lmms_math.h"
 #include "TrackContainer.h"
 #include "DataFile.h"
 #include "InstrumentTrack.h"
@@ -271,7 +265,7 @@ bool MidiExport::tryExport(const TrackContainer::TrackList &tracks,
 
 
 
-void MidiExport::writeMidiClip(MidiNoteVector &midiClip, QDomNode n,
+void MidiExport::writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
 				int base_pitch, double base_volume, int base_time)
 {
 	// TODO interpret steps="12" muted="0" type="1" name="Piano1"  len="2592"

plugins/MidiExport/MidiExport.h

@@ -31,6 +31,8 @@
 #include "ExportFilter.h"
 #include "MidiFile.hpp"
 
+class QDomNode;
+
 
 const int BUFFER_SIZE = 50*1024;
 typedef MidiFile::MIDITrack<BUFFER_SIZE> MTrack;
@@ -70,7 +72,7 @@ public:
 				int tempo, int masterPitch, const QString &filename);
 	
 private:
-	void writeMidiClip(MidiNoteVector &midiClip, QDomNode n,
+	void writeMidiClip(MidiNoteVector &midiClip, const QDomNode& n,
 				int base_pitch, double base_volume, int base_time);
 	void writeMidiClipToTrack(MTrack &mtrack, MidiNoteVector &nv);
 	void writePatternClip(MidiNoteVector &src, MidiNoteVector &dst,

plugins/MidiImport/MidiImport.cpp

@@ -23,7 +23,6 @@
  */
 
 
-#include <QDomDocument>
 #include <QDir>
 #include <QApplication>
 #include <QFile>
@@ -47,7 +46,6 @@
 #include "debug.h"
 #include "Song.h"
 
-#include "embed.h"
 #include "plugin_export.h"
 
 #include "portsmf/allegro.h"

plugins/MultitapEcho/MultitapEcho.h

@@ -28,9 +28,7 @@
 
 #include "Effect.h"
 #include "MultitapEchoControls.h"
-#include "ValueBuffer.h"
 #include "RingBuffer.h"
-#include "lmms_math.h"
 #include "BasicFilters.h"
 
 class MultitapEchoEffect : public Effect

plugins/MultitapEcho/MultitapEchoControlDialog.cpp

@@ -23,13 +23,11 @@
  *
  */
 
-#include <QLayout>
 
 #include "MultitapEchoControlDialog.h"
 #include "MultitapEchoControls.h"
 #include "embed.h"
 #include "Graph.h"
-#include "PixmapButton.h"
 #include "ToolTip.h"
 #include "LedCheckbox.h"
 #include "Knob.h"

plugins/MultitapEcho/MultitapEchoControls.h

@@ -28,7 +28,6 @@
 
 #include "EffectControls.h"
 #include "MultitapEchoControlDialog.h"
-#include "Knob.h"
 #include "Graph.h"
 
 

plugins/OpulenZ/OpulenZ.cpp

@@ -40,12 +40,11 @@
 #include "InstrumentPlayHandle.h"
 #include "InstrumentTrack.h"
 
-#include <QDomDocument>
 #include <QFile>
 #include <QFileInfo>
 #include <QByteArray>
-#include <assert.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #include "opl.h"
 #include "temuopl.h"
@@ -55,7 +54,6 @@
 #include "debug.h"
 
 #include "Knob.h"
-#include "LcdSpinBox.h"
 #include "PixmapButton.h"
 #include "ToolTip.h"
 

plugins/OpulenZ/OpulenZ.h

@@ -25,13 +25,18 @@
 #ifndef OPULENZ_H
 #define OPULENZ_H
 
+#include <QMutex>
+
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "opl.h"
 
-#include "LcdSpinBox.h"
-#include "Knob.h"
-#include "PixmapButton.h"
+class automatableButtonGroup;
+class Copl;
+class Knob;
+class LcdSpinBox;
+class PixmapButton;
+
 
 // This one is a flag, MIDI notes take 7 low bits
 #define OPL2_VOICE_FREE 128

plugins/ReverbSC/ReverbSC.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include <math.h>
+#include <cmath>
 #include "ReverbSC.h"
 
 #include "embed.h"

plugins/ReverbSC/ReverbSC.h

@@ -28,7 +28,6 @@
 
 #include "Effect.h"
 #include "ReverbSCControls.h"
-#include "ValueBuffer.h"
 
 extern "C" {
     #include "base.h"

plugins/ReverbSC/ReverbSCControlDialog.cpp

@@ -22,11 +22,12 @@
  *
  */
 
-#include <QLayout>
 
 #include "ReverbSCControlDialog.h"
-#include "ReverbSCControls.h"
+
 #include "embed.h"
+#include "Knob.h"
+#include "ReverbSCControls.h"
 
 ReverbSCControlDialog::ReverbSCControlDialog( ReverbSCControls* controls ) :
 	EffectControlDialog( controls )

plugins/ReverbSC/ReverbSCControls.cpp

@@ -28,7 +28,6 @@
 #include "ReverbSCControls.h"
 #include "ReverbSC.h"
 #include "Engine.h"
-#include "Song.h"
 
 ReverbSCControls::ReverbSCControls( ReverbSCEffect* effect ) :
 	EffectControls( effect ),

plugins/ReverbSC/ReverbSCControls.h

@@ -27,7 +27,6 @@
 
 #include "EffectControls.h"
 #include "ReverbSCControlDialog.h"
-#include "Knob.h"
 
 
 class ReverbSCEffect;

plugins/Sid/SidInstrument.cpp

@@ -24,7 +24,6 @@
  */
 
 
-#include <QPainter>
 #include <QDomElement>
 
 #include <cmath>

plugins/Sid/SidInstrument.h

@@ -27,12 +27,12 @@
 #ifndef _SID_H
 #define _SID_H
 
-#include <QObject>
+#include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
 
 
+class Knob;
 class SidInstrumentView;
 class NotePlayHandle;
 class automatableButtonGroup;

plugins/SpectrumAnalyzer/Analyzer.h

@@ -27,7 +27,6 @@
 #ifndef ANALYZER_H
 #define ANALYZER_H
 
-#include <QWaitCondition>
 
 #include "DataprocLauncher.h"
 #include "Effect.h"

plugins/SpectrumAnalyzer/SaControls.cpp

@@ -24,7 +24,7 @@
 
 #include "SaControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "Analyzer.h"
 #include "SaControlsDialog.h"

plugins/SpectrumAnalyzer/SaControls.h

@@ -27,7 +27,6 @@
 
 #include "ComboBoxModel.h"
 #include "EffectControls.h"
-#include "lmms_constants.h"
 
 //#define SA_DEBUG 1	// define SA_DEBUG to enable performance measurements
 

plugins/SpectrumAnalyzer/SaControlsDialog.cpp

@@ -32,13 +32,13 @@
 
 #include "ComboBox.h"
 #include "ComboBoxModel.h"
-#include "embed.h"
-#include "Engine.h"
 #include "Knob.h"
 #include "LedCheckbox.h"
 #include "PixmapButton.h"
 #include "SaControls.h"
 #include "SaProcessor.h"
+#include "SaSpectrumView.h"
+#include "SaWaterfallView.h"
 
 
 // The entire GUI layout is built here.

plugins/SpectrumAnalyzer/SaControlsDialog.h

@@ -26,10 +26,12 @@
 #define SACONTROLSDIALOG_H
 
 #include "EffectControlDialog.h"
-#include "SaControls.h"
-#include "SaSpectrumView.h"
-#include "SaProcessor.h"
-#include "SaWaterfallView.h"
+#include "fft_helpers.h"
+
+class SaControls;
+class SaProcessor;
+class SaSpectrumView;
+class SaWaterfallView;
 
 
 //! Top-level widget holding the configuration GUI and spectrum displays

plugins/SpectrumAnalyzer/SaProcessor.cpp

@@ -36,8 +36,10 @@
 #endif
 #include <QMutexLocker>
 
-#include "lmms_math.h"
+#include "fft_helpers.h"
+#include "lmms_constants.h"
 #include "LocklessRingBuffer.h"
+#include "SaControls.h"
 
 
 SaProcessor::SaProcessor(const SaControls *controls) :

plugins/SpectrumAnalyzer/SaProcessor.h

@@ -28,16 +28,21 @@
 #define SAPROCESSOR_H
 
 #include <atomic>
-#include <QColor>
+#include <fftw3.h>
 #include <QMutex>
+#include <QRgb>
 #include <vector>
 
-#include "fft_helpers.h"
-#include "SaControls.h"
+#include "lmms_basics.h"
+
 
 template<class T>
 class LocklessRingBuffer;
 
+class SaControls;
+
+
+
 //! Receives audio data, runs FFT analysis and stores the result.
 class SaProcessor
 {

plugins/SpectrumAnalyzer/SaSpectrumView.cpp

@@ -33,8 +33,10 @@
 #include <QPainter>
 #include <QString>
 
+#include "fft_helpers.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "SaControls.h"
 #include "SaProcessor.h"
 
 #ifdef SA_DEBUG

plugins/SpectrumAnalyzer/SaSpectrumView.h

@@ -27,7 +27,6 @@
 #ifndef SASPECTRUMVIEW_H
 #define SASPECTRUMVIEW_H
 
-#include "SaControls.h"
 
 #include <string>
 #include <utility>
@@ -37,6 +36,7 @@
 
 class QMouseEvent;
 class QPainter;
+class SaControls;
 class SaProcessor;
 
 //! Widget that displays a spectrum curve and frequency / amplitude grid

plugins/SpectrumAnalyzer/SaWaterfallView.cpp

@@ -31,12 +31,12 @@
 #include <QMouseEvent>
 #include <QMutexLocker>
 #include <QPainter>
-#include <QSplitter>
 #include <QString>
 
 #include "EffectControlDialog.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "SaControls.h"
 #include "SaProcessor.h"
 
 

plugins/SpectrumAnalyzer/SaWaterfallView.h

@@ -26,13 +26,13 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <QPainter>
 #include <QWidget>
 
-#include "SaControls.h"
-#include "SaProcessor.h"
 
+class EffectControlDialog;
 class QMouseEvent;
+class SaControls;
+class SaProcessor;
 
 // Widget that displays a spectrum waterfall (spectrogram) and time labels.
 class SaWaterfallView : public QWidget

plugins/Vectorscope/VecControls.cpp

@@ -24,7 +24,7 @@
 
 #include "VecControls.h"
 
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 #include "VecControlsDialog.h"
 #include "Vectorscope.h"

plugins/Vectorscope/VecControlsDialog.cpp

@@ -24,13 +24,11 @@
 
 #include "VecControlsDialog.h"
 
-#include <QGridLayout>
-#include <QLabel>
-#include <QResizeEvent>
-#include <QSizePolicy>
-#include <QWidget>
 
-#include "embed.h"
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+#include "Knob.h"
 #include "LedCheckbox.h"
 #include "VecControls.h"
 #include "Vectorscope.h"

plugins/Vectorscope/VectorView.cpp

@@ -31,6 +31,7 @@
 #include "ColorChooser.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
+#include "VecControls.h"
 
 
 VectorView::VectorView(VecControls *controls, LocklessRingBuffer<sampleFrame> *inputBuffer, unsigned short displaySize, QWidget *parent) :

plugins/Vectorscope/VectorView.h

@@ -23,14 +23,11 @@
 #ifndef VECTORVIEW_H
 #define VECTORVIEW_H
 
-#include <QMouseEvent>
-#include <QWheelEvent>
 #include <QWidget>
 
-#include "Knob.h"
-#include "LedCheckbox.h"
 #include "LocklessRingBuffer.h"
-#include "VecControls.h"
+
+class VecControls;
 
 //#define VEC_DEBUG
 

plugins/VstEffect/VstEffect.cpp

@@ -22,13 +22,13 @@
  *
  */
 
-#include <QMessageBox>
 
 #include "VstEffect.h"
 
 #include "GuiApplication.h"
 #include "Song.h"
 #include "TextFloat.h"
+#include "VstPlugin.h"
 #include "VstSubPluginFeatures.h"
 
 #include "embed.h"

plugins/VstEffect/VstEffect.h

@@ -25,11 +25,10 @@
 #ifndef _VST_EFFECT_H
 #define _VST_EFFECT_H
 
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
+#include <QMutex>
+#include <QSharedPointer>
 
 #include "Effect.h"
-#include "VstEffectControlDialog.h"
 #include "VstEffectControls.h"
 
 class VstPlugin;
@@ -49,11 +48,6 @@ public:
 		return &m_vstControls;
 	}
 
-	virtual inline QString publicName() const
-	{
-		return m_plugin->name();
-	}
-
 
 private:
 	void openPlugin( const QString & _plugin );

plugins/VstEffect/VstEffectControlDialog.cpp

@@ -23,20 +23,17 @@
  */
 
 #include <QLayout>
-#include <QMdiArea>
 #include <QMenu>
 #include <QPushButton>
 
 #include "VstEffectControlDialog.h"
 #include "VstEffect.h"
+#include "VstPlugin.h"
 
-#include "ConfigManager.h"
 #include "PixmapButton.h"
 #include "embed.h"
 #include "ToolTip.h"
 
-#include <QObject>
-#include <QPainter>
 #include "gui_templates.h"
 #include <QToolBar>
 #include <QLabel>

plugins/VstEffect/VstEffectControlDialog.h

@@ -26,16 +26,14 @@
 #define _VST_EFFECT_CONTROL_DIALOG_H
 
 #include "EffectControlDialog.h"
-#include "VstPlugin.h"
 
-#include <QObject>
-#include <QPainter>
-#include <QLabel>
 #include <QSharedPointer>
 
 
 class VstEffectControls;
+class VstPlugin;
 class PixmapButton;
+class QLabel;
 class QPixmap;
 class QPushButton;
 class PixmapButton;

plugins/VstEffect/VstEffectControls.cpp

@@ -22,15 +22,24 @@
  *
  */
 
+#include <QAction>
 #include <QDomElement>
+#include <QGridLayout>
+#include <QMenu>
+#include <QPushButton>
+#include <QScrollArea>
 
+#include "embed.h"
+#include "CustomTextKnob.h"
 #include "VstEffectControls.h"
+#include "VstEffectControlDialog.h"
 #include "VstEffect.h"
+#include "VstPlugin.h"
 
 #include "LocaleHelper.h"
 #include "MainWindow.h"
 #include "GuiApplication.h"
-#include <QMdiArea>
+#include "SubWindow.h"
 #include <QApplication>
 
 

plugins/VstEffect/VstEffectControls.h

@@ -26,20 +26,17 @@
 #define _VST_EFFECT_CONTROLS_H
 
 #include "EffectControls.h"
-#include "VstEffectControlDialog.h"
 
-#include <QMenu>
-#include "embed.h"
-#include <QPushButton>
 
-#include <QMdiSubWindow>
-#include <QScrollArea>
-#include "CustomTextKnob.h"
-#include <QLayout>
-#include <QPainter>
 #include <QObject>
 
 
+class CustomTextKnob;
+class QGridLayout;
+class QPaintEvent;
+class QPushButton;
+class QMdiSubWindow;
+class QScrollArea;
 class VstEffect;
 
 

plugins/VstEffect/VstSubPluginFeatures.h

@@ -27,7 +27,9 @@
 #ifndef _VST_SUBPLUGIN_FEATURES_H
 #define _VST_SUBPLUGIN_FEATURES_H
 
+
 #include "Effect.h"
+#include "Plugin.h"
 
 
 class VstSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures

plugins/Xpressive/ExprSynth.cpp

@@ -27,11 +27,9 @@
 
 #include <string>
 #include <vector>
-#include <math.h>
-#include <cstdlib>
+#include <cmath>
 #include <random>
 
-#include "Xpressive.h"
 
 #include "interpolation.h"
 #include "lmms_math.h"

plugins/Xpressive/ExprSynth.h

@@ -30,11 +30,15 @@
 #include <limits>
 #include "AutomatableModel.h"
 #include "Graph.h"
-#include "Instrument.h"
 #include "MemoryManager.h"
 
-
+class automatableButtonGroup;
 class ExprFrontData;
+class Knob;
+class LedCheckBox;
+class NotePlayHandle;
+class PixmapButton;
+
 
 class ExprFront
 {

plugins/Xpressive/Xpressive.cpp

@@ -25,6 +25,7 @@
 #include "Xpressive.h"
 
 #include <QDomElement>
+#include <QPlainTextEdit>
 
 #include "AudioEngine.h"
 #include "Engine.h"
@@ -35,10 +36,8 @@
 #include "LedCheckbox.h"
 #include "MainWindow.h"
 #include "NotePlayHandle.h"
-#include "Oscillator.h"
 #include "PixmapButton.h"
 #include "Song.h"
-#include "SubWindow.h"
 #include "ToolTip.h"
 
 #include "base64.h"

plugins/Xpressive/Xpressive.h

@@ -26,14 +26,12 @@
 #ifndef XPRESSIVE_H
 #define XPRESSIVE_H
 
-#include <QPlainTextEdit>
+
+#include <QTextEdit>
 
 #include "Graph.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
-#include "Knob.h"
-#include "LedCheckbox.h"
-#include "PixmapButton.h"
 
 #include "ExprSynth.h"
 
@@ -50,6 +48,7 @@ const int	NUM_EXPRS = 5;
 
 class ExprFront;
 class SubWindow;
+class QPlainTextEdit;
 
 
 

plugins/audio_file_processor/audio_file_processor.cpp

@@ -25,22 +25,21 @@
 #include "audio_file_processor.h"
 
 #include <QPainter>
-#include <QBitmap>
-#include <QDomDocument>
 #include <QFileInfo>
 #include <QDropEvent>
 
 #include <samplerate.h>
 
 #include "AudioEngine.h"
+#include "ComboBox.h"
 #include "ConfigManager.h"
 #include "DataFile.h"
 #include "Engine.h"
 #include "gui_templates.h"
 #include "InstrumentTrack.h"
-#include "interpolation.h"
 #include "NotePlayHandle.h"
 #include "PathUtil.h"
+#include "PixmapButton.h"
 #include "Song.h"
 #include "StringPairDrag.h"
 #include "ToolTip.h"