diff --git a/Sources/Plasma/CoreLibExe/CMakeLists.txt b/Sources/Plasma/CoreLibExe/CMakeLists.txt
index 6d8abf9b..9141605f 100644
--- a/Sources/Plasma/CoreLibExe/CMakeLists.txt
+++ b/Sources/Plasma/CoreLibExe/CMakeLists.txt
@@ -1,3 +1,4 @@
+include_directories("../../Plasma/CoreLib")
 add_definitions(-D_LIB)
 
 set(CoreLibExe_SOURCES
diff --git a/Sources/Plasma/CoreLibExe/Pch.h b/Sources/Plasma/CoreLibExe/Pch.h
index 98bfe82d..ed60a32d 100644
--- a/Sources/Plasma/CoreLibExe/Pch.h
+++ b/Sources/Plasma/CoreLibExe/Pch.h
@@ -36,14 +36,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #pragma warning(push, 3)
 
-#include "../CoreLib/HeadSpin.h"
-#include "../CoreLib/hsConfig.h"
-#include "../CoreLib/hsTypes.h"
-#include "../CoreLib/hsWindows.h"
-#include "../CoreLib/hsMalloc.h"
-#include "../CoreLib/hsCritSect.h"
-#include "../CoreLib/hsUtils.h"
-#include "../CoreLib/hsWindows.h"
+#include "HeadSpin.h"
+#include "hsConfig.h"
+#include "hsTypes.h"
+#include "hsWindows.h"
+#include "hsMalloc.h"
+#include "hsCritSect.h"
+#include "hsUtils.h"
+#include "hsWindows.h"
 
 #pragma warning(pop)
 
diff --git a/Sources/Tools/MaxComponent/plAnimCompProc.cpp b/Sources/Tools/MaxComponent/plAnimCompProc.cpp
index ff0b9e30..62f3ab67 100644
--- a/Sources/Tools/MaxComponent/plAnimCompProc.cpp
+++ b/Sources/Tools/MaxComponent/plAnimCompProc.cpp
@@ -315,7 +315,7 @@ void plMtlAnimProc::ILoadAnimCombo(HWND hWnd, IParamBlock2* pb)
 }
 
 #include "plPickMaterialMap.h"
-#include "../MaxMain/plMtlCollector.h"
+#include "MaxMain/plMtlCollector.h"
 
 void plMtlAnimProc::IMtlButtonPress(HWND hWnd, IParamBlock2* pb)
 {
diff --git a/Sources/Tools/MaxComponent/plAnimComponent.cpp b/Sources/Tools/MaxComponent/plAnimComponent.cpp
index b664f2d3..3a596b4f 100644
--- a/Sources/Tools/MaxComponent/plAnimComponent.cpp
+++ b/Sources/Tools/MaxComponent/plAnimComponent.cpp
@@ -557,7 +557,7 @@ hsBool  plAnimGroupedComponent::GetKeyList( INode *restrictedNode, hsTArray<plKe
 }
 
 
-#include "../pnMessage/plNodeRefMsg.h"
+#include "pnMessage/plNodeRefMsg.h"
 
 hsBool plAnimGroupedComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg)
 {
diff --git a/Sources/Tools/MaxComponent/plAudioComponents.cpp b/Sources/Tools/MaxComponent/plAudioComponents.cpp
index 0c6d1287..a420ba7a 100644
--- a/Sources/Tools/MaxComponent/plAudioComponents.cpp
+++ b/Sources/Tools/MaxComponent/plAudioComponents.cpp
@@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnKeyedObject/plKey.h"
 
 //Physics Related
-//#include "../plHavok1/plHKPhysical.h"         //Physics Comp
+//#include "plHavok1/plHKPhysical.h"         //Physics Comp
 #include "pnSceneObject/plSimulationInterface.h"
 #include "MaxMain/plPhysicalProps.h"
 #include "plPhysX/plPXPhysical.h"
@@ -87,7 +87,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 // Fun soft volume stuff
 #include "plSoftVolumeComponent.h"
-#include "../plIntersect/plSoftVolume.h"
+#include "plIntersect/plSoftVolume.h"
 
 // Misc
 #include "MaxMain/plMaxCFGFile.h"
diff --git a/Sources/Tools/MaxComponent/plAutoUIParams.cpp b/Sources/Tools/MaxComponent/plAutoUIParams.cpp
index 6d24235a..8382fd8d 100644
--- a/Sources/Tools/MaxComponent/plAutoUIParams.cpp
+++ b/Sources/Tools/MaxComponent/plAutoUIParams.cpp
@@ -865,9 +865,9 @@ plComponentBase *plPickActivatorListParam::GetComponent(IParamBlock2 *pb, int id
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #include "plPickMaterialMap.h"
-#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
-#include "../plSurface/plLayerInterface.h"
-#include "../plGImage/plDynamicTextMap.h"
+#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
+#include "plSurface/plLayerInterface.h"
+#include "plGImage/plDynamicTextMap.h"
 
 plPickDynamicTextButtonParam::plPickDynamicTextButtonParam(ParamID id, const char *name) :
     plPickButtonParam(id, name, nil, false)
diff --git a/Sources/Tools/MaxComponent/plComponent.h b/Sources/Tools/MaxComponent/plComponent.h
index b6e8ad58..017edf10 100644
--- a/Sources/Tools/MaxComponent/plComponent.h
+++ b/Sources/Tools/MaxComponent/plComponent.h
@@ -222,7 +222,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *************************************************************************************************/
 
 #include "plComponentBase.h"
-#include "../MaxExport/plErrorMsg.h"
+#include "MaxExport/plErrorMsg.h"
 
 
 class plMaxNode;
diff --git a/Sources/Tools/MaxComponent/plComponent.rc b/Sources/Tools/MaxComponent/plComponent.rc
index 6c8baf69..9dfb6a56 100644
--- a/Sources/Tools/MaxComponent/plComponent.rc
+++ b/Sources/Tools/MaxComponent/plComponent.rc
@@ -6938,8 +6938,8 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ZOOMIN              ICON                    "../MaxComponent/icon1.ico"
-IDI_ZOOMOUT             ICON                    "../MaxComponent/zoomin1.ico"
+IDI_ZOOMIN              ICON                    "MaxComponent/icon1.ico"
+IDI_ZOOMOUT             ICON                    "MaxComponent/zoomin1.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Sources/Tools/MaxComponent/plGUIComponents.cpp b/Sources/Tools/MaxComponent/plGUIComponents.cpp
index e2df524b..cfc7ef81 100644
--- a/Sources/Tools/MaxComponent/plGUIComponents.cpp
+++ b/Sources/Tools/MaxComponent/plGUIComponents.cpp
@@ -2676,7 +2676,7 @@ hsBool plGUIKnobCtrlComponent::PreConvert(plMaxNode *node,  plErrorMsg *pErrMsg)
 }
 
 // For hackery below (see warning below)
-#include "../plAvatar/plAGMasterMod.h"
+#include "plAvatar/plAGMasterMod.h"
 
 hsBool plGUIKnobCtrlComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
 {
@@ -4398,7 +4398,7 @@ hsBool plGUIProgressCtrlComponent::PreConvert(plMaxNode *node,  plErrorMsg *pErr
 }
 
 // For hackery below (see warning below)
-#include "../plAvatar/plAGMasterMod.h"
+#include "plAvatar/plAGMasterMod.h"
 
 hsBool plGUIProgressCtrlComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
 {
diff --git a/Sources/Tools/MaxComponent/plMiscComponents.cpp b/Sources/Tools/MaxComponent/plMiscComponents.cpp
index a9289fd6..7ccf120a 100644
--- a/Sources/Tools/MaxComponent/plMiscComponents.cpp
+++ b/Sources/Tools/MaxComponent/plMiscComponents.cpp
@@ -2013,10 +2013,10 @@ hsBool plReferencePointComponent::SetupProperties(plMaxNode *pNode, plErrorMsg *
 //
 //
 
-#include "../pnNetCommon/plSDLTypes.h"
-#include "../MaxConvert/hsMaterialConverter.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../plSurface/plLayerInterface.h"
+#include "pnNetCommon/plSDLTypes.h"
+#include "MaxConvert/hsMaterialConverter.h"
+#include "plSurface/hsGMaterial.h"
+#include "plSurface/plLayerInterface.h"
 #include "plCreatableIndex.h"
 
 class plNetSyncComponent : public plComponent
diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.h b/Sources/Tools/MaxComponent/plPhysicalComponents.h
index b714c95d..6bddcb90 100644
--- a/Sources/Tools/MaxComponent/plPhysicalComponents.h
+++ b/Sources/Tools/MaxComponent/plPhysicalComponents.h
@@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include <map>
 #include "plPhysical.h"
-#include "../plAvatar/plSwimRegion.h"
+#include "plAvatar/plSwimRegion.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp
index 70b1a7d1..a12f2d55 100644
--- a/Sources/Tools/MaxComponent/plPickMaterialMap.cpp
+++ b/Sources/Tools/MaxComponent/plPickMaterialMap.cpp
@@ -93,7 +93,7 @@ bool plPickMaterialMap::PickTexmap(IParamBlock2 *pb, int id)
     return IPickMaterial(pb, id, BROWSE_MAPSONLY);
 }
 
-#include "../MaxMain/plMtlCollector.h"
+#include "MaxMain/plMtlCollector.h"
 #include "resource.h"
 
 static bool GetPickedMtl(HWND hDlg, Mtl** mtl)
diff --git a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
index a80920df..0f20cb15 100644
--- a/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
+++ b/Sources/Tools/MaxComponent/plPythonFileComponent.cpp
@@ -388,7 +388,7 @@ hsBool plPythonFileComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg)
 }
 
 #include "plActivatorBaseComponent.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include "plResponderComponent.h"
 
 hsBool plPythonFileComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
diff --git a/Sources/Tools/MaxComponent/plResponderLink.cpp b/Sources/Tools/MaxComponent/plResponderLink.cpp
index 5099cd56..46247685 100644
--- a/Sources/Tools/MaxComponent/plResponderLink.cpp
+++ b/Sources/Tools/MaxComponent/plResponderLink.cpp
@@ -368,7 +368,7 @@ void plResponderLinkProc::ILoadParentAgeFilenamesCombo(HWND hWnd, IParamBlock2 *
 #include "plComponentBase.h"
 
 // Needed for message creation
-#include "../plModifier/plResponderModifier.h"
+#include "plModifier/plResponderModifier.h"
 
 enum
 {
@@ -495,7 +495,7 @@ static plResponderEnableProc gResponderEnableProc;
 ///////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "../pnMessage/plEnableMsg.h"
+#include "pnMessage/plEnableMsg.h"
 
 enum
 {
@@ -542,7 +542,7 @@ const char *plResponderCmdPhysEnable::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../plMessage/plSimStateMsg.h"
+#include "plMessage/plSimStateMsg.h"
 plMessage *plResponderCmdPhysEnable::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
 {
     plMaxNode* physNode = (plMaxNode*)pb->GetINode(kEnablePhysNode);
@@ -607,7 +607,7 @@ const char *plResponderCmdOneShot::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../plMessage/plOneShotMsg.h"
+#include "plMessage/plOneShotMsg.h"
 #include "plOneShotComponent.h"
 
 plMessage *plResponderCmdOneShot::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@@ -633,7 +633,7 @@ plMessage *plResponderCmdOneShot::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg
         throw "No one-shot component specified";
 }
 
-#include "../plMessage/plOneShotCallbacks.h"
+#include "plMessage/plOneShotCallbacks.h"
 
 void plResponderCmdOneShot::CreateWait(plMaxNode* node, plErrorMsg* pErrMsg, IParamBlock2 *pb, ResponderWaitInfo& waitInfo)
 {
@@ -706,7 +706,7 @@ ParamBlockDesc2 *plResponderCmdNotify::GetDesc()
     return &gResponderNotifyBlock;
 }
 
-#include "../pnMessage/plNotifyMsg.h"
+#include "pnMessage/plNotifyMsg.h"
 
 plMessage *plResponderCmdNotify::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
 {
@@ -765,7 +765,7 @@ const char *plResponderCmdDetectorEnable::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../pnMessage/plEnableMsg.h"
+#include "pnMessage/plEnableMsg.h"
 #include "plActivatorBaseComponent.h"
 #include "plVolumeGadgetComponent.h"
 #include "plNavigableComponents.h"
@@ -963,7 +963,7 @@ const char *plResponderCmdXRegion::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../plMessage/plExcludeRegionMsg.h"
+#include "plMessage/plExcludeRegionMsg.h"
 #include "plExcludeRegionComponent.h"
 
 plMessage *plResponderCmdXRegion::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@@ -1093,7 +1093,7 @@ const char *plResponderCmdCamTransition::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../pnMessage/plCameraMsg.h"
+#include "pnMessage/plCameraMsg.h"
 #include "plCameraComponents.h"
 
 plMessage *plResponderCmdCamTransition::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@@ -1243,7 +1243,7 @@ const char *plResponderCmdDelay::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../plMessage/plTimerCallbackMsg.h"
+#include "plMessage/plTimerCallbackMsg.h"
 
 plMessage *plResponderCmdDelay::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
 {
@@ -1368,7 +1368,7 @@ const char *plResponderCmdVisibility::GetInstanceName(IParamBlock2 *pb)
     return name;
 }
 
-#include "../pnMessage/plEnableMsg.h"
+#include "pnMessage/plEnableMsg.h"
 
 static void AddChildKeysRecur(plMaxNode* node, plMessage* msg)
 {
@@ -1570,8 +1570,8 @@ static plResponderSubWorldProc gResponderSubWorldProc;
 ///////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "../pfMessage/plArmatureEffectMsg.h"
-#include "../plAvatar/plArmatureEffects.h"
+#include "pfMessage/plArmatureEffectMsg.h"
+#include "plAvatar/plArmatureEffects.h"
 
 class plResponderFootSurfaceProc;
 extern plResponderFootSurfaceProc gResponderFootSurfaceProc;
diff --git a/Sources/Tools/MaxComponent/plSmoothComponent.cpp b/Sources/Tools/MaxComponent/plSmoothComponent.cpp
index c99d0c00..3e53a4da 100644
--- a/Sources/Tools/MaxComponent/plSmoothComponent.cpp
+++ b/Sources/Tools/MaxComponent/plSmoothComponent.cpp
@@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 // The AccMeshSmooth now does everything the InterMeshSmooth and AvMeshSmooth
 // components did, only better and with fewer bugs.
-//#include "../plDrawable/plInterMeshSmooth.h"
+//#include "plDrawable/plInterMeshSmooth.h"
 #include "plDrawable/plAvMeshSmooth.h"
 
 #include "plDrawable/plAccMeshSmooth.h"
diff --git a/Sources/Tools/MaxComponent/plTemplateComponent.cpp b/Sources/Tools/MaxComponent/plTemplateComponent.cpp
index 4bd341d0..ae073c29 100644
--- a/Sources/Tools/MaxComponent/plTemplateComponent.cpp
+++ b/Sources/Tools/MaxComponent/plTemplateComponent.cpp
@@ -100,7 +100,7 @@ const char* plTemplateComponent::IGetAgeName(plMaxNode *node)
     return nil;
 }
 
-#include "../MaxMain/plMaxNodeData.h"
+#include "MaxMain/plMaxNodeData.h"
 
 // SetupProperties - Internal setup and write-only set properties on the MaxNode. No reading
 // of properties on the MaxNode, as it's still indeterminant.
@@ -150,7 +150,7 @@ hsBool plTemplateComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "../plModifier/plCloneSpawnModifier.h"
+#include "plModifier/plCloneSpawnModifier.h"
 
 class plSpawnComponent : public plComponent
 {
diff --git a/Sources/Tools/MaxComponent/plTypesComponents.cpp b/Sources/Tools/MaxComponent/plTypesComponents.cpp
index 65a5b405..34cb4f4f 100644
--- a/Sources/Tools/MaxComponent/plTypesComponents.cpp
+++ b/Sources/Tools/MaxComponent/plTypesComponents.cpp
@@ -230,10 +230,10 @@ plVehicleComponent::plVehicleComponent() : fMod(nil)
     fClassDesc->MakeAutoParamBlocks(this);
 }
 
-#include "../MaxMain/plPhysicalProps.h"
-#include "../pnSceneObject/plSimulationInterface.h"
-//#include "../plHavok1/plVehicleModifier.h"
-//#include "../plHavok1/plPhysicsGroups.h"
+#include "MaxMain/plPhysicalProps.h"
+#include "pnSceneObject/plSimulationInterface.h"
+//#include "plHavok1/plVehicleModifier.h"
+//#include "plHavok1/plPhysicsGroups.h"
 /*
 void SetupVehiclePhys(plMaxNode* physNode, plMaxNode* node, plErrorMsg* pErrMsg, bool chassis=false)
 {
@@ -396,7 +396,7 @@ hsBool plVehicleComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
 //
 //
 
-#include "../plModifier/plMaintainersMarkerModifier.h"
+#include "plModifier/plMaintainersMarkerModifier.h"
 
 enum
 {
@@ -459,10 +459,10 @@ hsBool plMaintainersMarkerComponent::PreConvert(plMaxNode *pNode, plErrorMsg *pE
 //   Game Marker Component
 //
 
-#include "../plModifier/plGameMarkerModifier.h"
+#include "plModifier/plGameMarkerModifier.h"
 #include "plNotetrackAnim.h"
 #include "plPickMaterialMap.h"
-#include "../MaxMain/plMtlCollector.h"
+#include "MaxMain/plMtlCollector.h"
 #include "plResponderMtl.h"
 #include "plResponderGetComp.h"
 #include "plAnimComponent.h"
diff --git a/Sources/Tools/MaxConvert/hsControlConverter.cpp b/Sources/Tools/MaxConvert/hsControlConverter.cpp
index 5f45688b..c57a3755 100644
--- a/Sources/Tools/MaxConvert/hsControlConverter.cpp
+++ b/Sources/Tools/MaxConvert/hsControlConverter.cpp
@@ -2027,12 +2027,12 @@ hsBool  hsControlConverter::IGetSubAnimByName( Animatable *anim, TSTR &name, Ani
 // bad craziness, isolated here.
 #include "plConvert.h"
 #include "plgDispatch.h"
-#include "../MaxComponent/plAnimComponent.h"
-#include "../MaxComponent/plCameraComponents.h"
-#include "../../../Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h"
-#include "../../../Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h"
-#include "../../../Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h"
-#include "../../../Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h"
+#include "MaxComponent/plAnimComponent.h"
+#include "MaxComponent/plCameraComponents.h"
+#include "pnMessage/plCameraMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pfCamera/plCameraModifier.h"
+#include "pnSceneObject/plSceneObject.h"
 
 void hsControlConverter::IExportAnimatedCameraFOV(plMaxNode* node, hsTArray <hsG3DSMaxKeyFrame>* kfArray)
 {
diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
index 1c3c94e8..7b8c625b 100644
--- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
+++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp
@@ -1112,7 +1112,7 @@ hsGMaterial *hsMaterialConverter::ICreateMaterial(Mtl *mtl, plMaxNode *node, con
     hsGuardEnd; 
 }
 
-#include "../MaxPlasmaMtls/Materials/plMultipassMtl.h"
+#include "MaxPlasmaMtls/Materials/plMultipassMtl.h"
 
 //
 // Handle materials for normal non-light, non-particle nodes.
@@ -2618,7 +2618,7 @@ void hsMaterialConverter::IAddLayerToMaterial(hsGMaterial *mat, plLayerInterface
 //
 // Functions called by the converters up above...
 //
-#include "../MaxPlasmaMtls/Layers/plLayerTex.h"
+#include "MaxPlasmaMtls/Layers/plLayerTex.h"
 
 //// IMustBeUniqueMaterial ////////////////////////////////////////////////////
 //  Fun stuff here. If one of the layers of the material is a dynamic EnvMap,
diff --git a/Sources/Tools/MaxConvert/plConvert.cpp b/Sources/Tools/MaxConvert/plConvert.cpp
index c39d7daa..95a964d0 100644
--- a/Sources/Tools/MaxConvert/plConvert.cpp
+++ b/Sources/Tools/MaxConvert/plConvert.cpp
@@ -248,7 +248,7 @@ hsBool plConvert::Convert()
 #endif
 }
 
-//#include "../MaxMain/plMaxNodeData.h"
+//#include "MaxMain/plMaxNodeData.h"
 //#include <set>
 
 hsBool ConvertList(hsTArray<plMaxNode*>& nodes, PMaxNodeFunc p, plErrorMsg *errMsg, plConvertSettings *settings)
diff --git a/Sources/Tools/MaxMain/GlobalUtility.cpp b/Sources/Tools/MaxMain/GlobalUtility.cpp
index 6449f3ac..e3f77d9d 100644
--- a/Sources/Tools/MaxMain/GlobalUtility.cpp
+++ b/Sources/Tools/MaxMain/GlobalUtility.cpp
@@ -96,7 +96,7 @@ void DoAllRecur(PMaxNodeFunc p, plMaxNode *node)
     }
 }
 
-//#include "../MaxComponent/plComponentBase.h"
+//#include "MaxComponent/plComponentBase.h"
 
 
 #include "MaxExport/plExportErrorMsg.h"
diff --git a/Sources/Tools/MaxMain/plComponentPanel.cpp b/Sources/Tools/MaxMain/plComponentPanel.cpp
index ba17b881..67225dd6 100644
--- a/Sources/Tools/MaxMain/plComponentPanel.cpp
+++ b/Sources/Tools/MaxMain/plComponentPanel.cpp
@@ -305,7 +305,7 @@ int plComponentUtil::IFindListItem(plComponentBase* comp)
     return ListView_FindItem(GetDlgItem(fhPanel, IDC_COMPLIST), -1, &fi);
 }
 
-#include "../MaxComponent/plAutoUIComp.h"
+#include "MaxComponent/plAutoUIComp.h"
 
 void plComponentUtil::IAddRollups(plComponentBase* comp)
 {
diff --git a/Sources/Tools/MaxMain/plMaxNode.h b/Sources/Tools/MaxMain/plMaxNode.h
index 51d1691e..094368b1 100644
--- a/Sources/Tools/MaxMain/plMaxNode.h
+++ b/Sources/Tools/MaxMain/plMaxNode.h
@@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "hsMatrix44.h"
 #include "iparamb2.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include <map>
 
 class plMaxNode;
diff --git a/Sources/Tools/MaxMain/plMaxNodeBase.h b/Sources/Tools/MaxMain/plMaxNodeBase.h
index 0f80dd61..d25046c2 100644
--- a/Sources/Tools/MaxMain/plMaxNodeBase.h
+++ b/Sources/Tools/MaxMain/plMaxNodeBase.h
@@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "max.h"
 #include "hsMatrix44.h"
 #include "hsColorRGBA.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include "plLoadMask.h"
 
 class plLocation;
diff --git a/Sources/Tools/MaxMain/plMaxNodeData.h b/Sources/Tools/MaxMain/plMaxNodeData.h
index 7087fb2b..0e926080 100644
--- a/Sources/Tools/MaxMain/plMaxNodeData.h
+++ b/Sources/Tools/MaxMain/plMaxNodeData.h
@@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plRenderLevel.h"
 #include "plPhysicalProps.h"
 #include "hsBitVector.h"
-#include "../pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKey.h"
 #include "plLoadMask.h"
 
 class plMaxNodeBase;
diff --git a/Sources/Tools/MaxMain/plPythonMgr.cpp b/Sources/Tools/MaxMain/plPythonMgr.cpp
index a1b4998e..40afa96c 100644
--- a/Sources/Tools/MaxMain/plPythonMgr.cpp
+++ b/Sources/Tools/MaxMain/plPythonMgr.cpp
@@ -112,7 +112,7 @@ bool ICallStrFunc(PyObject *dict, char *funcName, char*& val)
 }
 
 
-#include "../MaxComponent/plPythonFileComponent.h"
+#include "MaxComponent/plPythonFileComponent.h"
 #include "hsUtils.h"
 
 enum ParamTypes
@@ -549,7 +549,7 @@ void plPythonMgr::IAddGUISkin(plAutoUIBlock *autoUI, PyObject *tuple, char *para
     autoUI->AddPickGUISkinButton(id, nil, paramName, vid, vstates);
 }
 
-#include "../MaxComponent/plResponderComponent.h"
+#include "MaxComponent/plResponderComponent.h"
 
 void plPythonMgr::IAddResponder(plAutoUIBlock *autoUI, PyObject *tuple, char *paramName, int id, int vid, std::vector<std::string>* vstates)
 {