Reduce includes

ext/gstmoodbar/gstfastspectrum.cpp

@@ -19,14 +19,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QtGlobal>
+
 #include <cstring>
-#include <cmath>
+
+#include <glib.h>
 
 #include <gst/gst.h>
 #include <gst/audio/gstaudiofilter.h>
 
 #include <QMutex>
-#include <QMutexLocker>
 
 #include "gstfastspectrum.h"
 

ext/gstmoodbar/gstmoodbarplugin.cpp

@@ -15,6 +15,7 @@
    along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <glib.h>
 #include <gst/gst.h>
 
 #include "gstfastspectrum.h"

ext/libstrawberry-common/core/closure.cpp

@@ -22,7 +22,6 @@
 
 #include "closure.h"
 
-#include "core/logging.h"
 #include "core/timeconstants.h"
 
 namespace _detail {

ext/libstrawberry-common/core/messagehandler.h

@@ -23,7 +23,6 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QThread>
-#include <QIODevice>
 #include <QBuffer>
 #include <QByteArray>
 #include <QMap>
@@ -33,6 +32,8 @@
 
 #include "core/messagereply.h"
 
+class QIODevice;
+
 #define QStringFromStdString(x) QString::fromUtf8(x.data(), x.size())
 #define DataCommaSizeFromQString(x) x.toUtf8().constData(), x.toUtf8().length()
 

ext/libstrawberry-common/core/workerpool.h

@@ -25,12 +25,11 @@
 #include <QCoreApplication>
 #include <QThread>
 #include <QMutex>
+#include <QLocalServer>
 #include <QProcess>
-#include <QQueue>
 #include <QFile>
 #include <QList>
-#include <QLocalServer>
-#include <QLocalSocket>
+#include <QQueue>
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
@@ -39,7 +38,6 @@
 
 class QLocalSocket;
 
-
 // Base class containing signals and slots - required because moc doesn't do templated objects.
 class _WorkerPoolBase : public QObject {
   Q_OBJECT

ext/libstrawberry-tagreader/fmpsparser.cpp

@@ -22,6 +22,7 @@
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QChar>
 
 #include "fmpsparser.h"
 

ext/libstrawberry-tagreader/fmpsparser.h

@@ -22,10 +22,11 @@
 
 #include <QList>
 #include <QMetaType>
-#include <QVariant>
 #include <QString>
 #include <QRegExp>
 
+class QVariant;
+
 class FMPSParser {
 public:
   FMPSParser();

ext/libstrawberry-tagreader/tagreader.cpp

@@ -23,7 +23,6 @@
 #include <memory>
 #include <list>
 #include <map>
-#include <utility>
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
@@ -42,6 +41,8 @@
 #include <taglib/commentsframe.h>
 #include <taglib/tag.h>
 #include <taglib/apetag.h>
+#include <taglib/apeitem.h>
+#include <taglib/apeproperties.h>
 #include <taglib/id3v2tag.h>
 #include <taglib/id3v2frame.h>
 #include <taglib/flacfile.h>
@@ -52,6 +53,7 @@
 #include <taglib/speexfile.h>
 #include <taglib/wavfile.h>
 #include <taglib/wavpackfile.h>
+#include <taglib/wavpackproperties.h>
 #include <taglib/aifffile.h>
 #include <taglib/asffile.h>
 #include <taglib/asftag.h>

ext/libstrawberry-tagreader/tagreader.h

@@ -25,7 +25,6 @@
 
 #include <QByteArray>
 #include <QString>
-#include <QTextCodec>
 
 #include <taglib/xiphcomment.h>
 #include <taglib/apetag.h>
@@ -33,6 +32,8 @@
 
 #include "tagreadermessages.pb.h"
 
+class QTextCodec;
+
 #ifndef USE_SYSTEM_TAGLIB
 namespace Strawberry_TagLib {
 #endif

ext/strawberry-tagreader/tagreaderworker.h

@@ -20,15 +20,14 @@
 
 #include "config.h"
 
-#include <stddef.h>
-
 #include <QObject>
-#include <QIODevice>
 
 #include "core/messagehandler.h"
 #include "tagreader.h"
 #include "tagreadermessages.pb.h"
 
+class QIODevice;
+
 class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
 public:
   TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);