diff --git a/codemp/null/null_glimp.cpp b/codemp/null/null_glimp.cpp
index 64c1ee8..5162f90 100644
--- a/codemp/null/null_glimp.cpp
+++ b/codemp/null/null_glimp.cpp
@@ -1,6 +1,6 @@
 #include "../game/q_shared.h"
 #include "../renderer/tr_local.h"
-#ifdef __linux__
+#ifndef _WIN32
 typedef unsigned int GLenum;
 #endif
 
diff --git a/codemp/qcommon/qcommon.h b/codemp/qcommon/qcommon.h
index 8a83e82..8618f64 100644
--- a/codemp/qcommon/qcommon.h
+++ b/codemp/qcommon/qcommon.h
@@ -977,7 +977,7 @@ void	Sys_Log( const char *file, const void *buffer, int size, bool flush );
 // any game related timing information should come from event timestamps
 int		Sys_Milliseconds (bool baseTime = false);
 
-#if __linux__
+#ifndef _MSVC_VER
 extern "C" void	Sys_SnapVector( float *v );
 
 #else
diff --git a/codemp/renderer/tr_local.h b/codemp/renderer/tr_local.h
index dec3d75..9a26184 100644
--- a/codemp/renderer/tr_local.h
+++ b/codemp/renderer/tr_local.h
@@ -28,7 +28,7 @@ typedef unsigned int glIndex_t;
 #endif
 
 // fast float to int conversion
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+#if (defined(_MSVC_VER) && defined(id386))
 inline long myftol( float f );
 #else
 #define	myftol(x) ((int)(x))
diff --git a/codemp/renderer/tr_main.cpp b/codemp/renderer/tr_main.cpp
index c6a0cab..1a898c5 100644
--- a/codemp/renderer/tr_main.cpp
+++ b/codemp/renderer/tr_main.cpp
@@ -7,7 +7,7 @@
 // Yeah, this might be kind of bad, but no linux version is planned so far :-) - AReis
 // Gee- thanks guys - jdrews, the linux porter...
 #ifndef _XBOX
-#ifndef __linux__
+#ifdef _WIN32
 #include "../win32/glw_win.h"
 #endif 
 #endif
diff --git a/codemp/renderer/tr_shade_calc.cpp b/codemp/renderer/tr_shade_calc.cpp
index b2977eb..c2dced3 100644
--- a/codemp/renderer/tr_shade_calc.cpp
+++ b/codemp/renderer/tr_shade_calc.cpp
@@ -1206,7 +1206,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 
 
 
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+#if (defined(_MSVC_VER) && defined(id386))
 #pragma warning (disable: 4035)//no return value
 inline long myftol( float f ) {
 	static int tmp;