diff --git a/proto.h b/proto.h
index 6520141..43016c3 100644
--- a/proto.h
+++ b/proto.h
@@ -167,6 +167,12 @@ void rdpsnd_send_completion(uint16 tick, uint8 packet_index);
 BOOL rdpsnd_init(char *optarg);
 void rdpsnd_show_help(void);
 void rdpsnd_play(void);
+void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index);
+struct audio_packet *rdpsnd_queue_current_packet(void);
+BOOL rdpsnd_queue_empty(void);
+void rdpsnd_queue_init(void);
+void rdpsnd_queue_next(void);
+int rdpsnd_queue_next_tick(void);
 /* secure.c */
 void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
 void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2);
diff --git a/rdpsnd.h b/rdpsnd.h
index e51bd92..4248245 100644
--- a/rdpsnd.h
+++ b/rdpsnd.h
@@ -28,10 +28,10 @@ struct audio_packet
 struct audio_driver
 {
 	void (*wave_out_write) (STREAM s, uint16 tick, uint8 index);
-	BOOL(*wave_out_open) (void);
+	  BOOL(*wave_out_open) (void);
 	void (*wave_out_close) (void);
-	BOOL(*wave_out_format_supported) (WAVEFORMATEX * pwfx);
-	BOOL(*wave_out_set_format) (WAVEFORMATEX * pwfx);
+	  BOOL(*wave_out_format_supported) (WAVEFORMATEX * pwfx);
+	  BOOL(*wave_out_set_format) (WAVEFORMATEX * pwfx);
 	void (*wave_out_volume) (uint16 left, uint16 right);
 	void (*wave_out_play) (void);
 	char *name;
@@ -44,13 +44,6 @@ struct audio_driver
 extern BOOL g_dsp_busy;
 extern int g_dsp_fd;
 
-void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index);
-struct audio_packet *rdpsnd_queue_current_packet(void);
-BOOL rdpsnd_queue_empty(void);
-void rdpsnd_queue_init(void);
-void rdpsnd_queue_next(void);
-int rdpsnd_queue_next_tick(void);
-
 /* Driver register functions */
 struct audio_driver *alsa_register(char *options);
 struct audio_driver *libao_register(char *options);