diff --git a/src/bindings/fluid_lash.c b/src/bindings/fluid_lash.c
index 34d68398..1178c271 100644
--- a/src/bindings/fluid_lash.c
+++ b/src/bindings/fluid_lash.c
@@ -18,14 +18,8 @@
  * 02110-1301, USA
  */
 #include "fluid_lash.h"
-#include "fluid_synth.h"
 
-#include <unistd.h>		/* for usleep() */
-#include <sys/types.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <pthread.h>
+#ifdef HAVE_LASH
 
 static void fluid_lash_save (fluid_synth_t * synth);
 static void fluid_lash_load (fluid_synth_t * synth, const char * filename);
@@ -35,15 +29,11 @@ static void *fluid_lash_run (void * data);
  * lash client - this symbol needs to be in the library else
  * all clients would need a fluid_lash_client symbol.
  */
-#ifdef HAVE_LASH
 lash_client_t * fluid_lash_client;
-#endif
 
 static pthread_t fluid_lash_thread;
 
 
-#ifdef HAVE_LASH
-
 fluid_lash_args_t *
 fluid_lash_extract_args (int * pargc, char *** pargv)
 {
diff --git a/src/drivers/fluid_dsound.c b/src/drivers/fluid_dsound.c
index 24635625..16363838 100644
--- a/src/drivers/fluid_dsound.c
+++ b/src/drivers/fluid_dsound.c
@@ -19,13 +19,14 @@
  */
 
 
-#define INITGUID
-
-#include "fluidsynth_priv.h"
 #include "fluid_synth.h"
-#include "fluid_sys.h"
 #include "fluid_adriver.h"
 #include "fluid_settings.h"
+
+#if DSOUND_SUPPORT
+
+#define INITGUID
+
 #include <mmsystem.h>
 #include <dsound.h>
 
@@ -368,3 +369,5 @@ char* fluid_win32_error(HRESULT hr) {
   }
   return s;
 }
+
+#endif /* DSOUND_SUPPORT */
diff --git a/src/utils/fluidsynth_priv.h b/src/utils/fluidsynth_priv.h
index 2bdda93b..f48bed7a 100644
--- a/src/utils/fluidsynth_priv.h
+++ b/src/utils/fluidsynth_priv.h
@@ -106,6 +106,10 @@
 #include <io.h>
 #endif
 
+#if HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
 /** Integer types  */
 #if HAVE_STDINT_H
 #include <stdint.h>