diff --git a/public/mathlib.c b/public/mathlib.c
index 2e3a411e..35237b29 100644
--- a/public/mathlib.c
+++ b/public/mathlib.c
@@ -16,12 +16,11 @@ GNU General Public License for more details.
 #include "xash3d_types.h"
 #include "const.h"
 #include "com_model.h"
-#include <math.h>
+#include "mathlib.h"
+#include "eiface.h"
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>
 #endif
-#include "mathlib.h"
-#include "eiface.h"
 
 #define NUM_HULL_ROUNDS	ARRAYSIZE( hull_table )
 #define HULL_PRECISION	4
diff --git a/public/mathlib.h b/public/mathlib.h
index 2a5b8feb..0f80e358 100644
--- a/public/mathlib.h
+++ b/public/mathlib.h
@@ -17,6 +17,9 @@ GNU General Public License for more details.
 #define MATHLIB_H
 
 #include <math.h>
+#ifdef HAVE_TGMATH_H
+#include <tgmath.h>
+#endif
 
 #pragma warning(disable : 4201)	// nonstandard extension used