diff --git a/Sources/Plasma/CoreLib/hsFastMath.cpp b/Sources/Plasma/CoreLib/hsFastMath.cpp
index fee12798..7d223886 100644
--- a/Sources/Plasma/CoreLib/hsFastMath.cpp
+++ b/Sources/Plasma/CoreLib/hsFastMath.cpp
@@ -604,7 +604,7 @@ float hsFastMath::IATan2OverTwoPi(float y, float x)
     if( (x == 0)&&(y == 0) )
         return 0;
 
-    bool xNeg, yNeg;
+    int xNeg, yNeg;
     if((yNeg = (y < 0)))y = -y;
     if((xNeg = (x < 0)))x = -x;
     bool yBigger = y >= x;
diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp b/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
index bbab96e9..ae72bcf0 100644
--- a/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
+++ b/Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCmd.cpp
@@ -565,7 +565,7 @@ uint8_t   pfConsoleCmd::GetSigEntry( uint8_t i )
 
 const char  *pfConsoleCmd::GetSignature( void )
 {
-    char string[256];
+    static char string[256];
     
     int     i;
     char    pStr[ 128 ];
diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
index 0232385a..2c3a599a 100644
--- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
@@ -85,6 +85,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyAgeInfoStruct.h"
 #include "pyAgeLinkStruct.h"
 #include "pyAlarm.h"
+#include "pyGeometry3.h"
 #include "pfMessage/pfKIMsg.h"
 #include "plNetMessage/plNetMessage.h"
 #include "pfCamera/plVirtualCamNeu.h"
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
index f3a3d587..e22e57e1 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
@@ -51,6 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIDialog.h"
 #include "pyColor.h"
+#include "pyGeometry3.h"
 
 #include "pyGUIControlCheckBox.h"
 
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
index 8e5705ea..bdf1f281 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
@@ -54,6 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 class pyGUIDialog;
 class pyColor;
+class pyPoint3;
 
 class pyGUIControl
 {
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp
index a65c96aa..71eeaf8d 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp
@@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIControlClickMap.h"
 #include "pyGUIDialog.h"
+#include "pyGeometry3.h"
 
 pyGUIControlClickMap::pyGUIControlClickMap(pyKey& gckey) : pyGUIControl(gckey)
 {
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp
index 8e7d4c1d..daba25fb 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp
@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGUIControlDraggable.h"
 #include "pyGUIDialog.h"
+#include "pyGeometry3.h"
 
 pyGUIControlDraggable::pyGUIControlDraggable(pyKey& gckey) : pyGUIControl(gckey)
 {
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp
index f760d640..9cb23024 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp
@@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma hdrstop
 
 #include "pyGUIControl.h"
+#include "pyGeometry3.h"
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptGUIControl, pyGUIControl);
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
index a5bdf538..a28e2516 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
@@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma hdrstop
 
 #include "pyImage.h"
+#include "pyGeometry3.h"
 #include "plJPEG/plJPEG.h"
 #include "plGImage/plPNG.h"
 #include "pnKeyedObject/plUoid.h"
diff --git a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
index 1bf58f29..b79ec0a5 100644
--- a/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
+++ b/Sources/Plasma/NucleusLib/pnMessage/plMessage.cpp
@@ -369,7 +369,7 @@ int plMsgCStringHelper::Poke(const char * str, hsStream* stream, const uint32_t
 {
     plMessage::plStrLen len = (str) ? strlen(str) : 0;
     stream->WriteLE(len);
-    if (strlen)
+    if (len)
         stream->Write(len,str);
     return stream->GetPosition();
 }
diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h
index 21cdc98f..a9ec4135 100644
--- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h
+++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h
@@ -85,8 +85,8 @@ protected:
     uint16_t      fNumIdx;
 
     double      fBirth;
-    float    fInitAtten;
-    bool        fFlags;
+    float       fInitAtten;
+    uint32_t    fFlags;
 
     plDecalVtxFormat*   fVtxBase; // Safe pointer, the buffer data will outlive this decal
     
diff --git a/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp b/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp
index 3376bae0..968a40c1 100644
--- a/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp
+++ b/Sources/Plasma/PubUtilLib/plGImage/plWinFontCache.cpp
@@ -155,7 +155,7 @@ HFONT   plWinFontCache::IMakeFont( const char *face, int height, int weight, boo
                 err = "Height of created font does not match";
             if( fontInfo.lfWeight != weight )
                 err = "Weight of created font does not match";
-            if( fontInfo.lfItalic != italic )
+            if( static_cast<bool>(fontInfo.lfItalic) != italic )
                 err = "Italic-ness of created font does not match";
             if( stricmp( fontInfo.lfFaceName, face ) != 0 )
                 err = "Face of created font does not match";
diff --git a/Sources/Tools/MaxComponent/plAudioComponents.cpp b/Sources/Tools/MaxComponent/plAudioComponents.cpp
index 77ddf5c7..1411869b 100644
--- a/Sources/Tools/MaxComponent/plAudioComponents.cpp
+++ b/Sources/Tools/MaxComponent/plAudioComponents.cpp
@@ -2813,7 +2813,6 @@ public:
 
     BOOL DlgProc( TimeValue t, IParamMap2 *map, HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
     {
-        int             i;
         IParamBlock2    *pb = map->GetParamBlock();
 
 
@@ -2827,7 +2826,7 @@ public:
                     ComboBox_ResetContent( comboBox );
 
 #ifdef EAX_SDK_AVAILABLE
-                    for( i = 0; i < /*sizeof( EAX30_ORIGINAL_PRESETS ) 
+                    for( int i = 0; i < /*sizeof( EAX30_ORIGINAL_PRESETS ) 
                         / sizeof( EAXLISTENERPROPERTIES )*/26 ; i++ )
                         ComboBox_AddString( comboBox, EAX30_ORIGINAL_PRESET_NAMES[ i ] );
 #endif
diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.cpp b/Sources/Tools/MaxMain/plMaxNodeBase.cpp
index e238f832..856903cb 100644
--- a/Sources/Tools/MaxMain/plMaxNodeBase.cpp
+++ b/Sources/Tools/MaxMain/plMaxNodeBase.cpp
@@ -1026,7 +1026,7 @@ Matrix3 plMaxNodeBase::GetWorldToParent(TimeValue t)
     GetTMController()->GetLocalTMComponents(t, cmpts, parentMatrix);
 
     Quat q;
-    if( cmpts.rotRep == TMComponentsArg::RotationRep::kQuat )
+    if( cmpts.rotRep == TMComponentsArg::kQuat )
         q = Quat(rot);
     else
         EulerToQuat(rot, q, cmpts.rotRep);
diff --git a/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp b/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp
index 0b73c90b..01b26bd4 100644
--- a/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp
+++ b/Sources/Tools/MaxPlasmaLights/plRTProjDirLight.cpp
@@ -463,7 +463,7 @@ void    plRTProjDirLight::SetFallsize( TimeValue time, float f )
 RefResult plRTProjDirLight::EvalLightState( TimeValue t, Interval& valid, LightState *ls )
 {
     ls->type = DIRECT_LGT;
-    if( fLightPB->GetInt( kLightOn, t ) == true )
+    if( fLightPB->GetInt( kLightOn, t ) )
         ls->color = GetRGBColor( t, valid );
     else
         ls->color = Color( 0, 0, 0 );
diff --git a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp
index 95fac93f..9c268a5c 100644
--- a/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp
+++ b/Sources/Tools/MaxPlasmaLights/plRealTimeLightBase.cpp
@@ -1430,7 +1430,7 @@ RefResult plRTLightBase::EvalLightState(TimeValue t, Interval& valid, LightState
 {
         //t uselight;
 //#if 0 //fLightPB->GetInt(kLightOn, t);
-    if(fLightPB->GetInt(kLightOn, t) == true)
+    if(fLightPB->GetInt(kLightOn, t) )
         ls->color = GetRGBColor(t,valid);
     else
         ls->color = Color(0,0,0);