From c3fa7e13cffca154f059a45e53df1cf119483ba5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 25 Jan 2017 23:07:50 +0100 Subject: [PATCH] input/Plugin: include cleanup --- src/input/InputPlugin.hxx | 9 ++------- src/input/plugins/AlsaInputPlugin.cxx | 1 + src/input/plugins/CurlInputPlugin.cxx | 1 + src/input/plugins/NfsInputPlugin.cxx | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/input/InputPlugin.hxx b/src/input/InputPlugin.hxx index 75255b140..e62ed6331 100644 --- a/src/input/InputPlugin.hxx +++ b/src/input/InputPlugin.hxx @@ -20,12 +20,6 @@ #ifndef MPD_INPUT_PLUGIN_HXX #define MPD_INPUT_PLUGIN_HXX -#include "thread/Mutex.hxx" -#include "thread/Cond.hxx" - -#include -#include - #ifdef WIN32 #include /* damn you, windows.h! */ @@ -35,8 +29,9 @@ #endif struct ConfigBlock; +class Mutex; +class Cond; class InputStream; -struct Tag; struct InputPlugin { const char *name; diff --git a/src/input/plugins/AlsaInputPlugin.cxx b/src/input/plugins/AlsaInputPlugin.cxx index 4b3fd38de..7c37ecec5 100644 --- a/src/input/plugins/AlsaInputPlugin.cxx +++ b/src/input/plugins/AlsaInputPlugin.cxx @@ -29,6 +29,7 @@ #include "../InputPlugin.hxx" #include "../AsyncInputStream.hxx" #include "event/Call.hxx" +#include "thread/Cond.hxx" #include "util/Domain.hxx" #include "util/RuntimeError.hxx" #include "util/StringCompare.hxx" diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 4971ced46..9c03c8a3e 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -33,6 +33,7 @@ #include "event/Call.hxx" #include "event/Loop.hxx" #include "IOThread.hxx" +#include "thread/Cond.hxx" #include "util/ASCII.hxx" #include "util/StringUtil.hxx" #include "util/NumberParser.hxx" diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx index 3d7ea8e47..320035a33 100644 --- a/src/input/plugins/NfsInputPlugin.cxx +++ b/src/input/plugins/NfsInputPlugin.cxx @@ -23,6 +23,7 @@ #include "../InputPlugin.hxx" #include "lib/nfs/Glue.hxx" #include "lib/nfs/FileReader.hxx" +#include "thread/Cond.hxx" #include "util/StringCompare.hxx" #include "IOThread.hxx"