diff --git a/src/drivers/fluid_adriver.c b/src/drivers/fluid_adriver.c
index a326bcac..efec3de6 100644
--- a/src/drivers/fluid_adriver.c
+++ b/src/drivers/fluid_adriver.c
@@ -36,89 +36,6 @@ typedef struct _fluid_audriver_definition_t
     void (*settings)(fluid_settings_t *settings);
 } fluid_audriver_definition_t;
 
-
-#if PULSE_SUPPORT
-fluid_audio_driver_t *new_fluid_pulse_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_pulse_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-void delete_fluid_pulse_audio_driver(fluid_audio_driver_t *p);
-void fluid_pulse_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if ALSA_SUPPORT
-fluid_audio_driver_t *new_fluid_alsa_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_alsa_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-void delete_fluid_alsa_audio_driver(fluid_audio_driver_t *p);
-void fluid_alsa_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if OSS_SUPPORT
-fluid_audio_driver_t *new_fluid_oss_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_oss_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-void delete_fluid_oss_audio_driver(fluid_audio_driver_t *p);
-void fluid_oss_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if COREAUDIO_SUPPORT
-fluid_audio_driver_t *new_fluid_core_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_core_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func,
-        void *data);
-void delete_fluid_core_audio_driver(fluid_audio_driver_t *p);
-void fluid_core_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if DSOUND_SUPPORT
-fluid_audio_driver_t *new_fluid_dsound_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *p);
-void fluid_dsound_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if PORTAUDIO_SUPPORT
-void fluid_portaudio_driver_settings(fluid_settings_t *settings);
-fluid_audio_driver_t *new_fluid_portaudio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-void delete_fluid_portaudio_driver(fluid_audio_driver_t *p);
-#endif
-
-#if JACK_SUPPORT
-fluid_audio_driver_t *new_fluid_jack_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_jack_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-void delete_fluid_jack_audio_driver(fluid_audio_driver_t *p);
-void fluid_jack_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if SNDMAN_SUPPORT
-fluid_audio_driver_t *new_fluid_sndmgr_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_sndmgr_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func,
-        void *data);
-void delete_fluid_sndmgr_audio_driver(fluid_audio_driver_t *p);
-#endif
-
-#if DART_SUPPORT
-fluid_audio_driver_t *new_fluid_dart_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-void delete_fluid_dart_audio_driver(fluid_audio_driver_t *p);
-void fluid_dart_audio_driver_settings(fluid_settings_t *settings);
-#endif
-
-#if AUFILE_SUPPORT
-fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-void delete_fluid_file_audio_driver(fluid_audio_driver_t *p);
-#endif
-
-
 /* Available audio drivers, listed in order of preference */
 static const fluid_audriver_definition_t fluid_audio_drivers[] =
 {
diff --git a/src/drivers/fluid_adriver.h b/src/drivers/fluid_adriver.h
index c9172c32..5ff0bb5e 100644
--- a/src/drivers/fluid_adriver.h
+++ b/src/drivers/fluid_adriver.h
@@ -23,9 +23,6 @@
 
 #include "fluid_sys.h"
 
-void fluid_audio_driver_settings(fluid_settings_t *settings);
-
-
 /*
  * fluid_audio_driver_t
  */
@@ -35,5 +32,89 @@ struct _fluid_audio_driver_t
     const char *name;
 };
 
+void fluid_audio_driver_settings(fluid_settings_t *settings);
+
+#if PULSE_SUPPORT
+fluid_audio_driver_t *new_fluid_pulse_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_pulse_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func, void *data);
+void delete_fluid_pulse_audio_driver(fluid_audio_driver_t *p);
+void fluid_pulse_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if ALSA_SUPPORT
+fluid_audio_driver_t *new_fluid_alsa_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_alsa_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func, void *data);
+void delete_fluid_alsa_audio_driver(fluid_audio_driver_t *p);
+void fluid_alsa_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if OSS_SUPPORT
+fluid_audio_driver_t *new_fluid_oss_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_oss_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func, void *data);
+void delete_fluid_oss_audio_driver(fluid_audio_driver_t *p);
+void fluid_oss_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if COREAUDIO_SUPPORT
+fluid_audio_driver_t *new_fluid_core_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_core_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func,
+        void *data);
+void delete_fluid_core_audio_driver(fluid_audio_driver_t *p);
+void fluid_core_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if DSOUND_SUPPORT
+fluid_audio_driver_t *new_fluid_dsound_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *p);
+void fluid_dsound_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if PORTAUDIO_SUPPORT
+void fluid_portaudio_driver_settings(fluid_settings_t *settings);
+fluid_audio_driver_t *new_fluid_portaudio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_portaudio_driver(fluid_audio_driver_t *p);
+#endif
+
+#if JACK_SUPPORT
+fluid_audio_driver_t *new_fluid_jack_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_jack_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func, void *data);
+void delete_fluid_jack_audio_driver(fluid_audio_driver_t *p);
+void fluid_jack_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if SNDMAN_SUPPORT
+fluid_audio_driver_t *new_fluid_sndmgr_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+fluid_audio_driver_t *new_fluid_sndmgr_audio_driver2(fluid_settings_t *settings,
+        fluid_audio_func_t func,
+        void *data);
+void delete_fluid_sndmgr_audio_driver(fluid_audio_driver_t *p);
+#endif
+
+#if DART_SUPPORT
+fluid_audio_driver_t *new_fluid_dart_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_dart_audio_driver(fluid_audio_driver_t *p);
+void fluid_dart_audio_driver_settings(fluid_settings_t *settings);
+#endif
+
+#if AUFILE_SUPPORT
+fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
+        fluid_synth_t *synth);
+void delete_fluid_file_audio_driver(fluid_audio_driver_t *p);
+#endif
+
+
 
 #endif  /* _FLUID_AUDRIVER_H */
diff --git a/src/drivers/fluid_alsa.c b/src/drivers/fluid_alsa.c
index 71bb258f..b90172b8 100644
--- a/src/drivers/fluid_alsa.c
+++ b/src/drivers/fluid_alsa.c
@@ -60,26 +60,19 @@ typedef struct
 } fluid_alsa_audio_driver_t;
 
 
-fluid_audio_driver_t *new_fluid_alsa_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_alsa_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-
-void delete_fluid_alsa_audio_driver(fluid_audio_driver_t *p);
-void fluid_alsa_audio_driver_settings(fluid_settings_t *settings);
 static fluid_thread_return_t fluid_alsa_audio_run_float(void *d);
 static fluid_thread_return_t fluid_alsa_audio_run_s16(void *d);
 
 
-struct fluid_alsa_formats_t
+typedef struct
 {
     char *name;
     snd_pcm_format_t format;
     snd_pcm_access_t access;
     fluid_thread_func_t run;
-};
+} fluid_alsa_formats_t;
 
-struct fluid_alsa_formats_t fluid_alsa_formats[] =
+static const fluid_alsa_formats_t fluid_alsa_formats[] =
 {
     {
         "s16, rw, interleaved",
@@ -115,11 +108,6 @@ typedef struct
 } fluid_alsa_rawmidi_driver_t;
 
 
-fluid_midi_driver_t *new_fluid_alsa_rawmidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-
-void delete_fluid_alsa_rawmidi_driver(fluid_midi_driver_t *p);
 static fluid_thread_return_t fluid_alsa_midi_run(void *d);
 
 
@@ -140,10 +128,6 @@ typedef struct
     snd_seq_addr_t autoconn_dest;
 } fluid_alsa_seq_driver_t;
 
-fluid_midi_driver_t *new_fluid_alsa_seq_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *data);
-void delete_fluid_alsa_seq_driver(fluid_midi_driver_t *p);
 static fluid_thread_return_t fluid_alsa_seq_run(void *d);
 
 /**************************************************************
diff --git a/src/drivers/fluid_aufile.c b/src/drivers/fluid_aufile.c
index 3751de4b..04973e0e 100644
--- a/src/drivers/fluid_aufile.c
+++ b/src/drivers/fluid_aufile.c
@@ -47,10 +47,6 @@ typedef struct
 } fluid_file_audio_driver_t;
 
 
-fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-
-void delete_fluid_file_audio_driver(fluid_audio_driver_t *p);
 static int fluid_file_audio_run_s16(void *d, unsigned int msec);
 
 /**************************************************************
diff --git a/src/drivers/fluid_coreaudio.c b/src/drivers/fluid_coreaudio.c
index b4952fe4..4acb0ebf 100644
--- a/src/drivers/fluid_coreaudio.c
+++ b/src/drivers/fluid_coreaudio.c
@@ -52,11 +52,6 @@ typedef struct
     double phase;
 } fluid_core_audio_driver_t;
 
-fluid_audio_driver_t *new_fluid_core_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth);
-
-fluid_audio_driver_t *new_fluid_core_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func,
-        void *data);
 
 OSStatus fluid_core_audio_callback(void *data,
                                    AudioUnitRenderActionFlags *ioActionFlags,
@@ -65,8 +60,6 @@ OSStatus fluid_core_audio_callback(void *data,
                                    UInt32 inNumberFrames,
                                    AudioBufferList *ioData);
 
-void delete_fluid_core_audio_driver(fluid_audio_driver_t *p);
-
 
 /**************************************************************
  *
diff --git a/src/drivers/fluid_coremidi.c b/src/drivers/fluid_coremidi.c
index b4ff9b36..0fe472c0 100644
--- a/src/drivers/fluid_coremidi.c
+++ b/src/drivers/fluid_coremidi.c
@@ -60,9 +60,6 @@ typedef struct
     fluid_midi_parser_t *parser;
 } fluid_coremidi_driver_t;
 
-fluid_midi_driver_t *new_fluid_coremidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler, void *data);
-void delete_fluid_coremidi_driver(fluid_midi_driver_t *p);
 void fluid_coremidi_callback(const MIDIPacketList *list, void *p, void *src);
 
 void fluid_coremidi_driver_settings(fluid_settings_t *settings)
diff --git a/src/drivers/fluid_dart.c b/src/drivers/fluid_dart.c
index 0bf8b742..935acbcb 100644
--- a/src/drivers/fluid_dart.c
+++ b/src/drivers/fluid_dart.c
@@ -56,13 +56,6 @@ typedef struct
 
 static HMODULE m_hmodMDM = NULLHANDLE;
 static ULONG(APIENTRY *m_pfnmciSendCommand)(USHORT, USHORT, ULONG, PVOID, USHORT) = NULL;
-
-fluid_audio_driver_t *new_fluid_dart_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-
-void delete_fluid_dart_audio_driver(fluid_audio_driver_t *p);
-void fluid_dart_audio_driver_settings(fluid_settings_t *settings);
-
 static LONG APIENTRY fluid_dart_audio_run(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags);
 
 /**************************************************************
diff --git a/src/drivers/fluid_dsound.c b/src/drivers/fluid_dsound.c
index 05f33c93..57df7665 100644
--- a/src/drivers/fluid_dsound.c
+++ b/src/drivers/fluid_dsound.c
@@ -30,10 +30,6 @@
 #include <mmsystem.h>
 #include <dsound.h>
 
-fluid_audio_driver_t *
-new_fluid_dsound_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth);
-
-void delete_fluid_dsound_audio_driver(fluid_audio_driver_t *data);
 DWORD WINAPI fluid_dsound_audio_run(LPVOID lpParameter);
 
 char *fluid_win32_error(HRESULT hr);
diff --git a/src/drivers/fluid_jack.c b/src/drivers/fluid_jack.c
index 51380345..dd40092d 100644
--- a/src/drivers/fluid_jack.c
+++ b/src/drivers/fluid_jack.c
@@ -89,14 +89,11 @@ static fluid_jack_client_t *new_fluid_jack_client(fluid_settings_t *settings,
 static int fluid_jack_client_register_ports(void *driver, int isaudio,
         jack_client_t *client,
         fluid_settings_t *settings);
-fluid_audio_driver_t *
-new_fluid_jack_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func, void *data);
-void delete_fluid_jack_audio_driver(fluid_audio_driver_t *p);
+
 void fluid_jack_driver_shutdown(void *arg);
 int fluid_jack_driver_srate(jack_nframes_t nframes, void *arg);
 int fluid_jack_driver_bufsize(jack_nframes_t nframes, void *arg);
 int fluid_jack_driver_process(jack_nframes_t nframes, void *arg);
-void delete_fluid_jack_midi_driver(fluid_midi_driver_t *p);
 
 
 static fluid_mutex_t last_client_mutex = FLUID_MUTEX_INIT;     /* Probably not necessary, but just in case drivers are created by multiple threads */
diff --git a/src/drivers/fluid_mdriver.c b/src/drivers/fluid_mdriver.c
index ed3a8410..d82c72aa 100644
--- a/src/drivers/fluid_mdriver.c
+++ b/src/drivers/fluid_mdriver.c
@@ -29,65 +29,6 @@
 #define FLUID_MIDI_SUPPORT  1
 #endif
 
-/* ALSA */
-#if ALSA_SUPPORT
-fluid_midi_driver_t *new_fluid_alsa_rawmidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_alsa_rawmidi_driver(fluid_midi_driver_t *p);
-void fluid_alsa_rawmidi_driver_settings(fluid_settings_t *settings);
-
-fluid_midi_driver_t *new_fluid_alsa_seq_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_alsa_seq_driver(fluid_midi_driver_t *p);
-void fluid_alsa_seq_driver_settings(fluid_settings_t *settings);
-#endif
-
-/* JACK */
-#if JACK_SUPPORT
-void fluid_jack_midi_driver_settings(fluid_settings_t *settings);
-fluid_midi_driver_t *new_fluid_jack_midi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *data);
-void delete_fluid_jack_midi_driver(fluid_midi_driver_t *p);
-#endif
-
-/* OSS */
-#if OSS_SUPPORT
-fluid_midi_driver_t *new_fluid_oss_midi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_oss_midi_driver(fluid_midi_driver_t *p);
-void fluid_oss_midi_driver_settings(fluid_settings_t *settings);
-#endif
-
-/* Windows MIDI service */
-#if WINMIDI_SUPPORT
-fluid_midi_driver_t *new_fluid_winmidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_winmidi_driver(fluid_midi_driver_t *p);
-void fluid_winmidi_midi_driver_settings(fluid_settings_t *settings);
-#endif
-
-/* definitions for the MidiShare driver */
-#if MIDISHARE_SUPPORT
-fluid_midi_driver_t *new_fluid_midishare_midi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_midishare_midi_driver(fluid_midi_driver_t *p);
-#endif
-
-/* definitions for the CoreMidi driver */
-#if COREMIDI_SUPPORT
-fluid_midi_driver_t *new_fluid_coremidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *event_handler_data);
-void delete_fluid_coremidi_driver(fluid_midi_driver_t *p);
-void fluid_coremidi_driver_settings(fluid_settings_t *settings);
-#endif
-
 
 #ifdef FLUID_MIDI_SUPPORT
 
diff --git a/src/drivers/fluid_mdriver.h b/src/drivers/fluid_mdriver.h
index 1a88c37b..eb212ccb 100644
--- a/src/drivers/fluid_mdriver.h
+++ b/src/drivers/fluid_mdriver.h
@@ -23,9 +23,6 @@
 
 #include "fluid_sys.h"
 
-void fluid_midi_driver_settings(fluid_settings_t *settings);
-
-
 /*
  * fluid_midi_driver_t
  */
@@ -37,6 +34,65 @@ struct _fluid_midi_driver_t
     void *data;
 };
 
+void fluid_midi_driver_settings(fluid_settings_t *settings);
 
+/* ALSA */
+#if ALSA_SUPPORT
+fluid_midi_driver_t *new_fluid_alsa_rawmidi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_alsa_rawmidi_driver(fluid_midi_driver_t *p);
+void fluid_alsa_rawmidi_driver_settings(fluid_settings_t *settings);
+
+fluid_midi_driver_t *new_fluid_alsa_seq_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_alsa_seq_driver(fluid_midi_driver_t *p);
+void fluid_alsa_seq_driver_settings(fluid_settings_t *settings);
+#endif
+
+/* JACK */
+#if JACK_SUPPORT
+void fluid_jack_midi_driver_settings(fluid_settings_t *settings);
+fluid_midi_driver_t *new_fluid_jack_midi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *data);
+void delete_fluid_jack_midi_driver(fluid_midi_driver_t *p);
+#endif
+
+/* OSS */
+#if OSS_SUPPORT
+fluid_midi_driver_t *new_fluid_oss_midi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_oss_midi_driver(fluid_midi_driver_t *p);
+void fluid_oss_midi_driver_settings(fluid_settings_t *settings);
+#endif
+
+/* Windows MIDI service */
+#if WINMIDI_SUPPORT
+fluid_midi_driver_t *new_fluid_winmidi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_winmidi_driver(fluid_midi_driver_t *p);
+void fluid_winmidi_midi_driver_settings(fluid_settings_t *settings);
+#endif
+
+/* definitions for the MidiShare driver */
+#if MIDISHARE_SUPPORT
+fluid_midi_driver_t *new_fluid_midishare_midi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_midishare_midi_driver(fluid_midi_driver_t *p);
+#endif
+
+/* definitions for the CoreMidi driver */
+#if COREMIDI_SUPPORT
+fluid_midi_driver_t *new_fluid_coremidi_driver(fluid_settings_t *settings,
+        handle_midi_event_func_t handler,
+        void *event_handler_data);
+void delete_fluid_coremidi_driver(fluid_midi_driver_t *p);
+void fluid_coremidi_driver_settings(fluid_settings_t *settings);
+#endif
 
 #endif  /* _FLUID_AUDRIVER_H */
diff --git a/src/drivers/fluid_midishare.c b/src/drivers/fluid_midishare.c
index a65f47b0..1a4d6fda 100644
--- a/src/drivers/fluid_midishare.c
+++ b/src/drivers/fluid_midishare.c
@@ -66,12 +66,7 @@ typedef struct
 } fluid_midishare_midi_driver_t;
 
 
-fluid_midi_driver_t *new_fluid_midishare_midi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler,
-        void *data);
-
-void delete_fluid_midishare_midi_driver(fluid_midi_driver_t *p);
-int fluid_midishare_midi_driver_status(fluid_midi_driver_t *p);
+static int fluid_midishare_midi_driver_status(fluid_midi_driver_t *p);
 
 static void fluid_midishare_midi_driver_receive(short ref);
 
diff --git a/src/drivers/fluid_oss.c b/src/drivers/fluid_oss.c
index 7d19d389..ca67a57f 100644
--- a/src/drivers/fluid_oss.c
+++ b/src/drivers/fluid_oss.c
@@ -74,7 +74,6 @@ typedef struct
     float *buffers[2];
 } fluid_oss_audio_driver_t;
 
-void delete_fluid_oss_audio_driver(fluid_audio_driver_t *p);
 
 /* local utilities */
 static int fluid_oss_set_queue_size(fluid_oss_audio_driver_t *dev, int ss, int ch, int qs, int bs);
@@ -92,11 +91,7 @@ typedef struct
     fluid_midi_parser_t *parser;
 } fluid_oss_midi_driver_t;
 
-fluid_midi_driver_t *
-new_fluid_oss_midi_driver(fluid_settings_t *settings,
-                          handle_midi_event_func_t handler, void *data);
-void delete_fluid_oss_midi_driver(fluid_midi_driver_t *p);
-int fluid_oss_midi_driver_status(fluid_midi_driver_t *p);
+static int fluid_oss_midi_driver_status(fluid_midi_driver_t *p);
 static fluid_thread_return_t fluid_oss_midi_run(void *d);
 
 
diff --git a/src/drivers/fluid_portaudio.c b/src/drivers/fluid_portaudio.c
index 93532f69..342c0f69 100644
--- a/src/drivers/fluid_portaudio.c
+++ b/src/drivers/fluid_portaudio.c
@@ -56,7 +56,6 @@ static int
 fluid_portaudio_run(const void *input, void *output, unsigned long frameCount,
                     const PaStreamCallbackTimeInfo *timeInfo,
                     PaStreamCallbackFlags statusFlags, void *userData);
-void delete_fluid_portaudio_driver(fluid_audio_driver_t *p);
 
 #define PORTAUDIO_DEFAULT_DEVICE "PortAudio Default"
 
diff --git a/src/drivers/fluid_pulse.c b/src/drivers/fluid_pulse.c
index b3ddc020..26317a03 100644
--- a/src/drivers/fluid_pulse.c
+++ b/src/drivers/fluid_pulse.c
@@ -54,12 +54,6 @@ typedef struct
 } fluid_pulse_audio_driver_t;
 
 
-fluid_audio_driver_t *new_fluid_pulse_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-fluid_audio_driver_t *new_fluid_pulse_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func, void *data);
-void delete_fluid_pulse_audio_driver(fluid_audio_driver_t *p);
-void fluid_pulse_audio_driver_settings(fluid_settings_t *settings);
 static fluid_thread_return_t fluid_pulse_audio_run(void *d);
 static fluid_thread_return_t fluid_pulse_audio_run2(void *d);
 
diff --git a/src/drivers/fluid_sndmgr.c b/src/drivers/fluid_sndmgr.c
index 8fa6d066..ccbb4c60 100644
--- a/src/drivers/fluid_sndmgr.c
+++ b/src/drivers/fluid_sndmgr.c
@@ -46,14 +46,6 @@ typedef struct
     int bufferFrameSize;
 } fluid_sndmgr_audio_driver_t;
 
-fluid_audio_driver_t *new_fluid_sndmgr_audio_driver(fluid_settings_t *settings,
-        fluid_synth_t *synth);
-
-fluid_audio_driver_t *new_fluid_sndmgr_audio_driver2(fluid_settings_t *settings,
-        fluid_audio_func_t func,
-        void *data);
-
-void delete_fluid_sndmgr_audio_driver(fluid_audio_driver_t *p);
 void  pascal fluid_sndmgr_callback(SndChannelPtr chan, SndDoubleBufferPtr doubleBuffer);
 Fixed fluid_sndmgr_double_to_fix(long double theLD);
 
diff --git a/src/drivers/fluid_winmidi.c b/src/drivers/fluid_winmidi.c
index 6c08be3b..7fb1bed3 100644
--- a/src/drivers/fluid_winmidi.c
+++ b/src/drivers/fluid_winmidi.c
@@ -64,11 +64,6 @@ static char fluid_winmidi_error_buffer[256];
 #define msg_p1(_m)    ((_m >> 8) & 0x7f)
 #define msg_p2(_m)    ((_m >> 16) & 0x7f)
 
-fluid_midi_driver_t *new_fluid_winmidi_driver(fluid_settings_t *settings,
-        handle_midi_event_func_t handler, void *data);
-
-void delete_fluid_winmidi_driver(fluid_midi_driver_t *p);
-
 void CALLBACK fluid_winmidi_callback(HMIDIIN hmi, UINT wMsg, DWORD_PTR dwInstance,
                                      DWORD_PTR msg, DWORD_PTR extra);
 static char *fluid_winmidi_input_error(MMRESULT no);