--- a/pwplib/snd-w32.c	Wed May 26 00:42:25 2010 +0300
+++ b/pwplib/snd-w32.c	Wed May 26 01:22:51 2010 +0300
@@ -5,20 +5,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <windows.h>
 
-#define TIMERHZ 72
-
-#include "pwplib.h"
-#include "gb.h"
+#include "sound.h"
 
 #define NUMBUFS 2
-
 #define HARDBUFSIZE 65536
 
-struct
-{
+struct {
   int      buffersize;
   HWAVEOUT outHandle;
   WAVEHDR  waveHdr[NUMBUFS];
@@ -26,12 +20,12 @@
   int      currbuf;
   int      bufferptr;
   int      letsgo;
-}
-pwp_w32snd;
+} pwp_w32snd;
+
 
-void win32snd_fill()
+static void win32snd_fill(void)
 {
-   while(pwp_w32snd.bufferptr<(HARDBUFSIZE-pwp_w32snd.buffersize))
+   while (pwp_w32snd.bufferptr < (HARDBUFSIZE - pwp_w32snd.buffersize))
    {
       pwplib.player();
 
@@ -76,11 +70,11 @@
    win32snd_fill();
 }
 
-void win32snd_restore()
+static void win32snd_restore()
 {
 }
 
-void win32snd_start()
+static void win32snd_start()
 {
    if(pwp_w32snd.letsgo==0)
    {
@@ -92,7 +86,7 @@
    }
 }
 
-int win32snd_init()
+int win32snd_init(void)
 {
    HANDLE bufHandle,waveHdrHandle;
    WAVEFORMATEX waveFormat;