diff --git a/source/win/fileio.c b/source/win/fileio.c
index e530b68..5482032 100644
--- a/source/win/fileio.c
+++ b/source/win/fileio.c
@@ -41,7 +41,6 @@
  ****************************************************************************************/
 
 #include "shared.h"
-#include <windows.h>
 #include <zlib.h>
 
 static int check_zip(char *filename);
diff --git a/source/win/main.c b/source/win/main.c
index 34acdaa..f873aae 100644
--- a/source/win/main.c
+++ b/source/win/main.c
@@ -1,4 +1,8 @@
+#ifdef __WIN32__
 #include <windows.h>
+#else
+#define MessageBox(owner, text, caption, type) printf("%s: %s\n", caption, text)
+#endif
 
 #include "SDL.h"
 #include "SDL_thread.h"
@@ -197,7 +201,8 @@ static void sdl_video_update()
     /* clear destination surface */
     SDL_FillRect(sdl_video.surf_screen, 0, 0);
 
-    /*if (config.render && (interlaced || config.ntsc))  rect.h *= 2;
+#if 0
+    if (config.render && (interlaced || config.ntsc))  rect.h *= 2;
     if (config.ntsc) rect.w = (reg[12]&1) ? MD_NTSC_OUT_WIDTH(rect.w) : SMS_NTSC_OUT_WIDTH(rect.w);
     if (config.ntsc)
     {
@@ -233,7 +238,8 @@ static void sdl_video_update()
         free(md_ntsc);
         md_ntsc = NULL;
       }
-    } */
+    }
+#endif
   }
 
   SDL_BlitSurface(sdl_video.surf_bitmap, &sdl_video.srect, sdl_video.surf_screen, &sdl_video.drect);
@@ -658,8 +664,6 @@ int sdl_input_update(void)
       break;
     }
   }
-
-  free (keystate);
   return 1;
 }
 
diff --git a/source/win/osd.h b/source/win/osd.h
index 88ecf1b..ad95a52 100644
--- a/source/win/osd.h
+++ b/source/win/osd.h
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
-#include <conio.h>
 
 #include <SDL.h>
 #include <stdlib.h>