diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog
index 2aa1e225..3da278bc 100644
--- a/fluidsynth/ChangeLog
+++ b/fluidsynth/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-15  Josh Green  <jgreen@users.sourceforge.net>
+	* configure.ac: Fixed detection of CoreAudio by looking for
+	CoreAudio/AudioHardware.h.
+	* src/Makefile.am: Added COREAUDIO_CFLAGS and COREAUDIO_LIBS.
+	* src/fluid_coreaudio.c: Added CoreAudio prefix to #include headers
+	(fluid_core_audio_callback): Fixed declarition to match that of the
+	typedef in CoreAudio header to stop warnings.
+	* fluidsynth.c: Now including fluidsynth_priv.h to include the arch
+	specific definitions in there (perhaps should be done in configure
+	script though).
+	* fluidsynth_priv.h: Added "#define WITHOUT_SERVER 1" to Darwin build.
+
 2003-06-12  Josh Green  <jgreen@users.sourceforge.net>
 	* Makefile.am: Added autogen.sh to EXTRA_DIST
 	* acinclude.m4: Added AM_PATH_READLINE macro for readline detection
diff --git a/fluidsynth/acinclude.m4 b/fluidsynth/acinclude.m4
index c1f810f9..5e86cb51 100644
--- a/fluidsynth/acinclude.m4
+++ b/fluidsynth/acinclude.m4
@@ -202,7 +202,7 @@ AC_LANG_C
 AC_TRY_COMPILE([
 #include <alsa/asoundlib.h>
 ], [
-void main(void)
+int main(void)
 {
 /* ensure backward compatibility */
 #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
@@ -302,9 +302,10 @@ LIBS="$READLINE_LIBS $LIBS"
 CFLAGS="$READLINE_CFLAGS $CFLAGS"
 
 AC_TRY_COMPILE([
+#include <stdio.h>
 #include <readline/readline.h>
 ], [
-void main(void)
+int main(void)
 {
 #ifndef readline
    return (1);
diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac
index 84ca4b17..91ec1cba 100644
--- a/fluidsynth/configure.ac
+++ b/fluidsynth/configure.ac
@@ -26,6 +26,8 @@ AC_SUBST(LIBFLUIDSYNTH_MIN)
 
 AM_CONFIG_HEADER(src/config.h)
 
+CFLAGS="$CFLAGS -Wall"
+
 dnl Check for programs
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -169,8 +171,6 @@ yes)
 esac
 
 
-
-
 dnl 
 dnl Check support for all the drivers
 dnl
@@ -209,7 +209,6 @@ dnl - Check support for JACK
 AC_JACK
 
 
-
 dnl
 dnl - Check support for CoreAudio
 dnl
@@ -231,17 +230,18 @@ AC_ARG_ENABLE(coreaudio,
 
 COREAUDIO_SUPPORT=0
 if test "$fluid_enable_coreaudio" = "yes"; then
-  AC_CHECK_HEADER(AudioHardware.h, COREAUDIO_FOUND="yes", COREAUDIO_FOUND="no")
+  AC_CHECK_HEADER(CoreAudio/AudioHardware.h, COREAUDIO_FOUND="yes",
+                  COREAUDIO_FOUND="no")
   if test "$COREAUDIO_FOUND" = "yes"; then
      AC_DEFINE(COREAUDIO_SUPPORT, 1, [whether or not we are supporting CoreAudio])
      COREAUDIO_SUPPORT=1 
+     COREAUDIO_LIBS=-Wl,-framework,CoreAudio
   fi
-else
-  COREAUDIO_FOUND="no"
 fi
 
 AM_CONDITIONAL(COREAUDIO_SUPPORT, test "$COREAUDIO_SUPPORT" = "1")
-
+AC_SUBST(COREAUDIO_LIBS)
+AC_SUBST(COREAUDIO_CFLAGS)
 
 dnl Check for readline support (Josh Green 2003-06-10)
 
diff --git a/fluidsynth/src/Makefile.am b/fluidsynth/src/Makefile.am
index 0af3ca25..f9f345c1 100644
--- a/fluidsynth/src/Makefile.am
+++ b/fluidsynth/src/Makefile.am
@@ -78,9 +78,11 @@ libfluidsynth_la_SOURCES = \
 	fluid_voice.c \
 	fluid_voice.h
 
-INCLUDES = -I$(srcdir)/../include $(LADCCA_CFLAGS) $(READLINE_CFLAGS)
+INCLUDES = -I$(srcdir)/../include $(LADCCA_CFLAGS) $(READLINE_CFLAGS) \
+  $(COREAUDIO_CFLAGS)
 
-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LADCCA_LIBS) $(READLINE_LIBS)
+libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LADCCA_LIBS) $(READLINE_LIBS) \
+  $(COREAUDIO_LIBS)
 libfluidsynth_la_LDFLAGS = \
 	-version-info @LIBFLUIDSYNTH_MAJ@:@LIBFLUIDSYNTH_MIN@:0 \
 	-export-dynamic @FCLDFLAGS@ $(LIBFLUID_LDFLAGS)
diff --git a/fluidsynth/src/fluid_coreaudio.c b/fluidsynth/src/fluid_coreaudio.c
index 35b520a8..e1c5e19d 100644
--- a/fluidsynth/src/fluid_coreaudio.c
+++ b/fluidsynth/src/fluid_coreaudio.c
@@ -33,8 +33,8 @@
 #include "config.h"
 
 #if COREAUDIO_SUPPORT
-#include <AudioHardware.h>
-#include <CoreAudioTypes.h>
+#include <CoreAudio/AudioHardware.h>
+#include <CoreAudio/CoreAudioTypes.h>
 
 /*
  * fluid_core_audio_driver_t
@@ -58,12 +58,12 @@ fluid_audio_driver_t* new_fluid_core_audio_driver2(fluid_settings_t* settings,
 						      void* data);
 
 OSStatus fluid_core_audio_callback(AudioDeviceID dev, 
-				       const AudioTimeStamp* now,
-				       const AudioBufferList* in, 
-				       const AudioTimeStamp* intime,
-				       const AudioBufferList* out, 
-				       const AudioTimeStamp* outtime,
-				       void* data);
+				   const AudioTimeStamp* now,
+				   const AudioBufferList* in, 
+				   const AudioTimeStamp* intime,
+				   AudioBufferList* out, 
+				   const AudioTimeStamp* outtime,
+				   void* data);
 
 int delete_fluid_core_audio_driver(fluid_audio_driver_t* p);
 
@@ -206,12 +206,12 @@ delete_fluid_core_audio_driver(fluid_audio_driver_t* p)
 
 OSStatus 
 fluid_core_audio_callback(AudioDeviceID id, 
-			      const AudioTimeStamp* now,
-			      const AudioBufferList* in, 
-			      const AudioTimeStamp* intime,
-			      const AudioBufferList* out, 
-			      const AudioTimeStamp* outtime,
-			      void* data)
+			  const AudioTimeStamp* now,
+			  const AudioBufferList* in, 
+			  const AudioTimeStamp* intime,
+			  AudioBufferList* out, 
+			  const AudioTimeStamp* outtime,
+			  void* data)
 {
   int i, k;
   fluid_core_audio_driver_t* dev = (fluid_core_audio_driver_t*) data;
diff --git a/fluidsynth/src/fluidsynth.c b/fluidsynth/src/fluidsynth.c
index f72c8eea..ee048e2f 100644
--- a/fluidsynth/src/fluidsynth.c
+++ b/fluidsynth/src/fluidsynth.c
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "fluidsynth_priv.h"
+
 #if !defined(WIN32) && !defined(MACINTOSH)
 #define _GNU_SOURCE
 #include <getopt.h>
diff --git a/fluidsynth/src/fluidsynth_priv.h b/fluidsynth/src/fluidsynth_priv.h
index ff86425d..52e10f4d 100644
--- a/fluidsynth/src/fluidsynth_priv.h
+++ b/fluidsynth/src/fluidsynth_priv.h
@@ -130,6 +130,7 @@
 #ifdef DARWIN
 #define MACINTOSH
 #define __Types__
+#define WITHOUT_SERVER 1
 #endif