diff --git a/include/ao/ao.h b/include/ao/ao.h
index 87d71029c04e7baf17534a4f6ba318f4acfa7dc9..7457dca57eefed825ed445dc0abcca3218f18022 100644
--- a/include/ao/ao.h
+++ b/include/ao/ao.h
@@ -26,6 +26,8 @@
 
 #include <stdlib.h>
 
+#include "os_types.h"
+
 // Type sizes
 #include "config.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6bc64665817836482dd81c243f726b69633ae2c8..9a9034e2bb1e0bde3d4aeac0d2fb12e3386383f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,17 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libao.la
 
-libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+#libao_la_SOURCES = audio_out.c @LIBAO_FILES@
+libao_la_SOURCES = audio_out.c ao_oss.c ao_wav.c ao_null.c
 libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
 
+EXTRA_libao_la_SOURCES = ao_alsa.c ao_irix.c ao_oss.c ao_wav.c ao_esd.c ao_null.c ao_solaris.c audio_out.c
+
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
 
diff --git a/src/ao_alsa.c b/src/ao_alsa.c
index 20ef05a63bddfa4a50cc4e4f0f956ceedad2d071..4c595ca118a76c7cd9e875d3a3a7554c8261a237 100644
--- a/src/ao_alsa.c
+++ b/src/ao_alsa.c
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include <sys/asoundlib.h>
-#include "audio_out.h"
+#include <ao/ao.h>
 
 #define AO_ALSA_BUF_SIZE 32768
 
diff --git a/src/ao_oss.c b/src/ao_oss.c
index 395f5b38632b967923c9e90c5b217f8b3437b197..82f0a409a2dac2a3763feafe64e9d1b1fe8c27ad 100644
--- a/src/ao_oss.c
+++ b/src/ao_oss.c
@@ -39,7 +39,7 @@
 #endif
 #include <sys/ioctl.h>
 
-#include "audio_out.h"
+#include <ao/ao.h>
 
 static ao_info_t ao_oss_info =
 {
diff --git a/src/ao_wav.c b/src/ao_wav.c
index 0c542e2a496f93099beb14eddb950cbd007b94d4..0d2167b1a4caae3c5e608c828449b7ae3fd767a7 100644
--- a/src/ao_wav.c
+++ b/src/ao_wav.c
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#include "audio_out.h"
+#include <ao/ao.h>
 
 #define WAVE_FORMAT_PCM  0x0001
 #define FORMAT_MULAW     0x0101
diff --git a/src/audio_out.c b/src/audio_out.c
index 59fb7392fd20c8ff45750a077b2dc1dd48922896..4812cd8b7ef37440e6f86d9ffdd5c09abf0fcfb1 100644
--- a/src/audio_out.c
+++ b/src/audio_out.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "audio_out.h"
+#include <ao/ao.h>
 
 /* --- Function Tables --- */