diff --git a/src/engine/octa.hh b/src/engine/octa.hh
index 007e4b8..bcaf53b 100644
--- a/src/engine/octa.hh
+++ b/src/engine/octa.hh
@@ -1,6 +1,7 @@
 #ifndef ENGINE_OCTA_HH
 #define ENGINE_OCTA_HH
 
+#include <shared/gl.hh>
 #include <shared/geom.hh>
 #include <shared/ents.hh>
 
diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc
index 9b9af93..47eb10e 100644
--- a/src/engine/rendergl.cc
+++ b/src/engine/rendergl.cc
@@ -1,5 +1,7 @@
 // rendergl.cpp: core opengl rendering stuff
 
+#include <shared/gl.hh>
+
 #include "aa.hh"
 #include "blend.hh"
 #include "console.hh"
diff --git a/src/engine/rendergl.hh b/src/engine/rendergl.hh
index ec97677..66829a8 100644
--- a/src/engine/rendergl.hh
+++ b/src/engine/rendergl.hh
@@ -1,6 +1,7 @@
 #ifndef ENGINE_RENDERGL_HH
 #define ENGINE_RENDERGL_HH
 
+#include <shared/gl.hh>
 #include <shared/geom.hh>
 
 extern bool hasVAO, hasTR, hasTSW, hasPBO, hasFBO, hasAFBO, hasDS, hasTF, hasCBF, hasS3TC, hasFXT1, hasLATC, hasRGTC, hasAF, hasFBB, hasFBMS, hasTMS, hasMSS, hasFBMSBS, hasUBO, hasMBR, hasDB2, hasDBB, hasTG, hasTQ, hasPF, hasTRG, hasTI, hasHFV, hasHFP, hasDBT, hasDC, hasDBGO, hasEGPU4, hasGPU4, hasGPU5, hasBFE, hasEAL, hasCR, hasOQ2, hasES3, hasCB, hasCI;
diff --git a/src/meson.build b/src/meson.build
index 2c30261..75f31d0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,5 @@
+add_global_arguments('-D_FILE_OFFSET_BITS=64', language: 'cpp')
+
 octacore_includes = [
     include_directories('.', 'shared', 'engine', 'game')
 ]
diff --git a/src/shared/cube.hh b/src/shared/cube.hh
index 299b2eb..5c3e0b2 100644
--- a/src/shared/cube.hh
+++ b/src/shared/cube.hh
@@ -1,11 +1,6 @@
 #ifndef __CUBE_H__
 #define __CUBE_H__
 
-#define _FILE_OFFSET_BITS 64
-
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif
 #include <math.h>
 
 #include <string.h>
@@ -18,32 +13,9 @@
 #include <assert.h>
 #include <time.h>
 
-#ifdef WIN32
-  #define WIN32_LEAN_AND_MEAN
-  #ifdef _WIN32_WINNT
-  #undef _WIN32_WINNT
-  #endif
-  #define _WIN32_WINNT 0x0500
-  #include "windows.h"
-  #ifndef _WINDOWS
-    #define _WINDOWS
-  #endif
-  #ifndef __GNUC__
-    #include <eh.h>
-    #include <dbghelp.h>
-    #include <intrin.h>
-  #endif
-  #define ZLIB_DLL
-#endif
-
-#include "gl.hh"
-
-#include <zlib.h>
-
 #include "tools.hh"
 #include "geom.hh"
 #include "ents.hh"
 #include "command.hh"
 
 #endif
-
diff --git a/src/shared/tools.hh b/src/shared/tools.hh
index f92b4d7..5b62c83 100644
--- a/src/shared/tools.hh
+++ b/src/shared/tools.hh
@@ -7,12 +7,9 @@
 #include <cstring>
 #include <cmath>
 
+#include <SDL.h>
 #include <zlib.h>
 
-#ifndef STANDALONE
-#include "gl.hh"
-#endif
-
 #ifdef NULL
 #undef NULL
 #endif
@@ -542,7 +539,7 @@ static inline bool htcmp(int x, int y)
     return x==y;
 }
 
-#ifndef STANDALONE
+#ifdef GL_HH
 static inline uint hthash(GLuint key)
 {
     return key;