diff --git a/engine/wscript b/engine/wscript
index ef76b772..f691dd64 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -89,7 +89,8 @@ def build(bld):
 		if bld.env.DEST_OS == 'linux':
 			libs.append('RT')
 
-	includes = ['common', 'server', 'client', 'client/vgui', '.', '../common', '../public', '../pm_shared' ]
+	# HACK: public headers must be put before common, so we don't get wrong mathlib included
+	includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ]
 
 	if bld.env.SINGLE_BINARY:
 		bld(
diff --git a/public/wscript b/public/wscript
index d66e943a..1906df6f 100644
--- a/public/wscript
+++ b/public/wscript
@@ -21,10 +21,8 @@ def build(bld):
 	name = get_subproject_name(bld)
 	bld.env = bld.all_envs[name]
 
-	libs = [ 'M' ]
-
 	source = bld.path.ant_glob(['*.c'])
-
+	libs = []
 	includes = [ '.', '../common', '../engine' ]
 
 	bld.stlib(
diff --git a/ref_gl/wscript b/ref_gl/wscript
index 1843250f..4896945d 100644
--- a/ref_gl/wscript
+++ b/ref_gl/wscript
@@ -30,7 +30,7 @@ def build(bld):
 	name = get_subproject_name(bld)
 	bld.env = bld.all_envs[name]
 
-	libs = [ 'M', 'public' ]
+	libs = [ 'public', 'm' ]
 
 	source = bld.path.ant_glob(['*.c'])
 
@@ -39,8 +39,8 @@ def build(bld):
 		'../engine/common',
 		'../engine/server',
 		'../engine/client',
-		'../common',
 		'../public',
+		'../common',
 		'../pm_shared' ]
 
 	bld.shlib(