--- a/src/main.c	Mon Aug 05 20:53:49 2013 +0300
+++ b/src/main.c	Mon Aug 05 21:53:33 2013 +0300
@@ -9,26 +9,30 @@
 #include <wchar.h>
 #include <time.h>
 
+#include "bass.h"
+#include "mplatform.h"
+
 #include "freetype-gl.h"
 #include "vertex-buffer.h"
 #include "markup.h"
 #include "shader.h"
 #include "mat4.h"
 
-#if defined(_WIN32) || defined(_WIN64)
-#  define wcpncpy wcsncpy
-#  define wcpcpy  wcscpy
-#endif
-
-#ifndef  __APPLE__
-#include <malloc.h>
-#endif
-
-#define XXX 1
-#include "bass.h"
 #include "midifile.h"
 #include "midiutil.h"
 
+#ifdef __APPLE__
+    #include "glew.h"
+    #include <OpenGL/OpenGL.h>
+    #include <OpenGL/glu.h>
+    #include "freeglut.h"
+#else
+    #include <GL/glew.h>
+    #include <GL/glu.h>
+    #include <GL/freeglut.h>
+#endif
+
+
 int quitflag = 0;
 
 // GLUT window handle (1 for windowed display, 0 for fullscreen gamemode)
@@ -73,24 +77,13 @@
 float vhsbeat = 0.0;
 float vhsbeat_start = 0;
 
-#ifdef __APPLE__
-    #include "glew.h"
-    #include <OpenGL/OpenGL.h>
-    #include <OpenGL/glu.h>
-    #include "freeglut.h"
-#else
-    #include <GL/glew.h>
-    #include <GL/glu.h>
-    #include <GL/freeglut.h>
-#endif
-
 #include <assimp/Importer.hpp>
-//#include <assimp/PostProcess.h>
 #include <assimp/postprocess.h>
 #include <assimp/scene.h>
 #include <assimp/DefaultLogger.hpp>
 #include <assimp/LogStream.hpp>
 
+
 #include "stb_image.c"