diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 8e32b7fb49..6d2e1f959f 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -44,9 +44,9 @@
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 
-#if HAVE_SYS_ASOUNDLIB_H
+#ifdef HAVE_SYS_ASOUNDLIB_H
 #include <sys/asoundlib.h>
-#elif HAVE_ALSA_ASOUNDLIB_H
+#elif defined(HAVE_ALSA_ASOUNDLIB_H)
 #include <alsa/asoundlib.h>
 #else
 #error "asoundlib.h is not in sys/ or alsa/ - please bugreport"
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index 56a73ff555..a5602ff894 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -54,7 +54,8 @@
 #include "help_mp.h"
 
 
-#undef	ESD_DEBUG
+#define ESD_RESAMPLES 0
+#define ESD_DEBUG 0
 
 #if	ESD_DEBUG
 #define	dprintf(...)	printf(__VA_ARGS__)