diff --git a/Engine/source/gfx/gl/tGL/tWGL.h b/Engine/source/gfx/gl/tGL/tWGL.h
index d6575ae2d..af905dca0 100644
--- a/Engine/source/gfx/gl/tGL/tWGL.h
+++ b/Engine/source/gfx/gl/tGL/tWGL.h
@@ -25,14 +25,14 @@
 
 #include "platform/platform.h"
 
-#ifdef TORQUE_OS_WIN32
+#ifdef TORQUE_OPENGL
 
 #include "tGL.h"
 #include "GL/wglew.h"
 
 #define gglHasWExtension(EXTENSION) WGLEW_##EXTENSION
 
-#endif //TORQUE_OS_WIN32
+#endif //TORQUE_OPENGL
 
 #endif
 
diff --git a/Engine/source/lighting/advanced/advancedLightingFeatures.cpp b/Engine/source/lighting/advanced/advancedLightingFeatures.cpp
index 98536ac37..bac201b2d 100644
--- a/Engine/source/lighting/advanced/advancedLightingFeatures.cpp
+++ b/Engine/source/lighting/advanced/advancedLightingFeatures.cpp
@@ -31,7 +31,7 @@
 #include "gfx/gfxDevice.h"
 #include "core/util/safeDelete.h"
 
-#if defined( TORQUE_OS_WIN32 ) || defined( TORQUE_OS_XBOX )
+#if defined( TORQUE_OS_WIN ) || defined( TORQUE_OS_XBOX )
 #  include "lighting/advanced/hlsl/gBufferConditionerHLSL.h"
 #  include "lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h"
 #endif
@@ -67,7 +67,7 @@ void AdvancedLightingFeatures::registerFeatures( const GFXFormat &prepassTargetF
    }
    else
    {
-#if defined( TORQUE_OS_WIN32 )
+#if defined( TORQUE_OS_WIN )
       cond = new GBufferConditionerHLSL( prepassTargetFormat, GBufferConditionerHLSL::ViewSpace );
       FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond);
       FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatHLSL());
diff --git a/Engine/source/lighting/basic/basicLightManager.cpp b/Engine/source/lighting/basic/basicLightManager.cpp
index 01e1def78..952814053 100644
--- a/Engine/source/lighting/basic/basicLightManager.cpp
+++ b/Engine/source/lighting/basic/basicLightManager.cpp
@@ -172,7 +172,7 @@ void BasicLightManager::activate( SceneManager *sceneManager )
    }
    else
    {
-      #if defined( TORQUE_OS_WIN32 )
+      #if defined( TORQUE_OS_WIN )
          FEATUREMGR->registerFeature( MFT_LightMap, new LightmapFeatHLSL );
          FEATUREMGR->registerFeature( MFT_ToneMap, new TonemapFeatHLSL );
          FEATUREMGR->registerFeature( MFT_NormalMap, new BumpFeatHLSL );