From cdfe8d3d7db04fc02167bae0b935ff4d18bab317 Mon Sep 17 00:00:00 2001
From: carlo-bramini <30959007+carlo-bramini@users.noreply.github.com>
Date: Sun, 3 Dec 2017 13:12:27 +0100
Subject: [PATCH] Include fixes 2 (#296)

Remove redundant includes
---
 src/bindings/fluid_filerenderer.c | 4 +---
 src/drivers/fluid_alsa.c          | 6 ------
 src/drivers/fluid_aufile.c        | 4 +---
 src/drivers/fluid_coreaudio.c     | 2 --
 src/drivers/fluid_jack.c          | 2 --
 src/drivers/fluid_pulse.c         | 2 --
 src/midi/fluid_seq.c              | 1 -
 src/synth/fluid_synth.c           | 2 --
 src/synth/fluid_synth.h           | 6 +-----
 src/utils/fluid_settings.c        | 1 -
 src/utils/fluidsynth_priv.h       | 1 -
 11 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/bindings/fluid_filerenderer.c b/src/bindings/fluid_filerenderer.c
index 8ef4a051..b132bfa9 100644
--- a/src/bindings/fluid_filerenderer.c
+++ b/src/bindings/fluid_filerenderer.c
@@ -22,10 +22,8 @@
   * Low-level routines for file output.
   */
 
-#include <stdio.h>
-#include "fluidsynth_priv.h"
-#include "fluid_synth.h"
 #include "fluid_sys.h"
+#include "fluid_synth.h"
 #include "fluid_settings.h"
 
 #if LIBSNDFILE_SUPPORT
diff --git a/src/drivers/fluid_alsa.c b/src/drivers/fluid_alsa.c
index afb593fb..4d4d3004 100644
--- a/src/drivers/fluid_alsa.c
+++ b/src/drivers/fluid_alsa.c
@@ -34,13 +34,7 @@
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #include <alsa/asoundlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/poll.h>
-#include <glib.h>
-
-#include "config.h"
 
 #include "fluid_lash.h"
 
diff --git a/src/drivers/fluid_aufile.c b/src/drivers/fluid_aufile.c
index 7d5865dd..84cd03ed 100644
--- a/src/drivers/fluid_aufile.c
+++ b/src/drivers/fluid_aufile.c
@@ -24,11 +24,9 @@
  *
  */
 
+#include "fluid_sys.h"
 #include "fluid_adriver.h"
 #include "fluid_settings.h"
-#include "fluid_sys.h"
-#include "config.h"
-#include <stdio.h>
 
 
 /** fluid_file_audio_driver_t
diff --git a/src/drivers/fluid_coreaudio.c b/src/drivers/fluid_coreaudio.c
index a3a146c3..18257b91 100644
--- a/src/drivers/fluid_coreaudio.c
+++ b/src/drivers/fluid_coreaudio.c
@@ -30,8 +30,6 @@
 #include "fluid_mdriver.h"
 #include "fluid_settings.h"
 
-#include "config.h"
-
 #if COREAUDIO_SUPPORT
 #include <CoreServices/CoreServices.h>
 #include <CoreAudio/CoreAudioTypes.h>
diff --git a/src/drivers/fluid_jack.c b/src/drivers/fluid_jack.c
index 75fd1d37..296306e7 100644
--- a/src/drivers/fluid_jack.c
+++ b/src/drivers/fluid_jack.c
@@ -28,7 +28,6 @@
  *
  */
 
-#include "fluidsynth_priv.h"
 #include "fluid_sys.h"
 #include "fluid_synth.h"
 #include "fluid_adriver.h"
@@ -38,7 +37,6 @@
 #include <jack/jack.h>
 #include <jack/midiport.h>
 
-#include "config.h"
 #include "fluid_lash.h"
 
 
diff --git a/src/drivers/fluid_pulse.c b/src/drivers/fluid_pulse.c
index 2cdd0219..b86b15f4 100644
--- a/src/drivers/fluid_pulse.c
+++ b/src/drivers/fluid_pulse.c
@@ -28,8 +28,6 @@
 #include "fluid_adriver.h"
 #include "fluid_settings.h"
 
-#include "config.h"
-
 #if PULSE_SUPPORT
 
 #include <pulse/simple.h>
diff --git a/src/midi/fluid_seq.c b/src/midi/fluid_seq.c
index e2c6d99c..b4ba1b75 100644
--- a/src/midi/fluid_seq.c
+++ b/src/midi/fluid_seq.c
@@ -28,7 +28,6 @@
 */
 
 #include "fluid_event_priv.h"
-#include "fluidsynth_priv.h"	// FLUID_NEW, etc
 #include "fluid_sys.h"	// timer, threads, etc...
 #include "fluid_list.h"
 
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index e0c16e29..8660fdac 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -18,8 +18,6 @@
  * 02110-1301, USA
  */
 
-#include <math.h>
-
 #include "fluid_synth.h"
 #include "fluid_sys.h"
 #include "fluid_chan.h"
diff --git a/src/synth/fluid_synth.h b/src/synth/fluid_synth.h
index a21902b0..3400fe8a 100644
--- a/src/synth/fluid_synth.h
+++ b/src/synth/fluid_synth.h
@@ -28,17 +28,13 @@
  *                         INCLUDES
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "fluidsynth_priv.h"
+#include "fluid_sys.h"
 #include "fluid_list.h"
 #include "fluid_rev.h"
 #include "fluid_voice.h"
 #include "fluid_chorus.h"
 #include "fluid_ladspa.h"
 #include "fluid_midi_router.h"
-#include "fluid_sys.h"
 #include "fluid_rvoice_event.h"
 
 /***************************************************************
diff --git a/src/utils/fluid_settings.c b/src/utils/fluid_settings.c
index 72a096c1..c91bfe8a 100644
--- a/src/utils/fluid_settings.c
+++ b/src/utils/fluid_settings.c
@@ -18,7 +18,6 @@
  * 02110-1301, USA
  */
 
-#include "fluidsynth_priv.h"
 #include "fluid_sys.h"
 #include "fluid_hash.h"
 #include "fluid_synth.h"
diff --git a/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h
index 130f1dd7..e79e0efa 100644
--- a/src/utils/fluidsynth_priv.h
+++ b/src/utils/fluidsynth_priv.h
@@ -129,7 +129,6 @@ typedef guint64  uint64_t;
 #if defined(WIN32) &&  HAVE_WINDOWS_H
 #include <winsock2.h>
 #include <ws2tcpip.h>	/* Provides also socklen_t */
-#include <windows.h>
 
 /* WIN32 special defines */
 #define DSOUND_SUPPORT 1