diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt
index 811008e1..f1408fe5 100644
--- a/Sources/Plasma/Apps/plClient/CMakeLists.txt
+++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt
@@ -169,10 +169,10 @@ if(USE_VLD)
 endif()
 
 if (WIN32)
-    target_link_libraries(plClient Rpcrt4)
-    target_link_libraries(plClient Version)
-    target_link_libraries(plClient Vfw32)
-    target_link_libraries(plClient Ws2_32)
+    target_link_libraries(plClient rpcrt4)
+    target_link_libraries(plClient version)
+    target_link_libraries(plClient vfw32)
+    target_link_libraries(plClient ws2_32)
     target_link_libraries(plClient winmm)
     target_link_libraries(plClient strmiids)
 endif(WIN32)
diff --git a/Sources/Plasma/CoreLib/hsWindows.h b/Sources/Plasma/CoreLib/hsWindows.h
index 2bafc8f1..5e8702f3 100644
--- a/Sources/Plasma/CoreLib/hsWindows.h
+++ b/Sources/Plasma/CoreLib/hsWindows.h
@@ -61,7 +61,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #       define _WIN32_IE    0x400
 #   endif
 
-#   define NOMINMAX
+#   ifndef NOMINMAX
+#       define NOMINMAX
+#   endif
+
 #   define WIN32_LEAN_AND_MEAN
 #   include <windows.h>
 #   include <ws2tcpip.h> // Pulls in WinSock 2 for us
diff --git a/Sources/Plasma/CoreLib/plString.cpp b/Sources/Plasma/CoreLib/plString.cpp
index 010be0f8..92b7b6b8 100644
--- a/Sources/Plasma/CoreLib/plString.cpp
+++ b/Sources/Plasma/CoreLib/plString.cpp
@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include <functional>
 #include <memory>
-#include <wchar.h>
+#include <cwchar>
 #pragma hdrstop
 
 #include "plString.h"
diff --git a/Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp b/Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp
index 7f1cd111..45ed9edb 100644
--- a/Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp
+++ b/Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp
@@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #ifdef HS_BUILD_FOR_WIN32
 
-#include <DbgHelp.h>
-#include <ShlObj.h>
+#include <dbghelp.h>
+#include <shlobj.h>
 
 plCrashSrv::plCrashSrv(const char* file)
     : fLink(nil), fLinkH(nil)
diff --git a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
index f12bda90..0437681f 100644
--- a/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
+++ b/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
@@ -803,7 +803,7 @@ static void StartListenThread () {
 
 //===========================================================================
 #ifdef HS_DEBUGGING
-#include <StdIo.h>
+#include <cstdio>
 static void __cdecl DumpInvalidData (
     const plFileName & filename,
     unsigned    bytes,
diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt
index a82d6f42..da5f1101 100644
--- a/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(pnNetCommon pnKeyedObject)
 target_link_libraries(pnNetCommon pnUUID)
 target_link_libraries(pnNetCommon plStatusLog)
 if(WIN32)
-    target_link_libraries(pnNetCommon Ws2_32)
+    target_link_libraries(pnNetCommon ws2_32)
 endif(WIN32)
 
 source_group("Header Files" FILES ${pnNetCommon_HEADERS})
diff --git a/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
index 9fad6e39..ea70c49b 100644
--- a/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
+++ b/Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
@@ -21,7 +21,7 @@ add_library(pnUUID STATIC ${pnUUID_SOURCES} ${pnUUID_HEADERS})
 target_link_libraries(pnUUID CoreLib)
 if(WIN32)
     target_link_libraries(pnUUID pnUtils)
-    target_link_libraries(pnUUID Rpcrt4)
+    target_link_libraries(pnUUID rpcrt4)
 else(WIN32)
     target_link_libraries(pnUUID uuid)
 endif(WIN32)
diff --git a/Sources/Plasma/NucleusLib/pnUtils/Pch.h b/Sources/Plasma/NucleusLib/pnUtils/Pch.h
index b62001ac..9923b637 100644
--- a/Sources/Plasma/NucleusLib/pnUtils/Pch.h
+++ b/Sources/Plasma/NucleusLib/pnUtils/Pch.h
@@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #pragma warning(push, 3)
 #include <ws2tcpip.h>
 #define NTDDI_XP NTDDI_WINXP //Because Microsoft sucks.
-#include <Iphlpapi.h>
+#include <iphlpapi.h>
 #include <shlobj.h> // for SHGetSpecialFolderPath
 #pragma warning(pop)
 #endif
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp
index 417e2ada..f1906443 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp
@@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "hsWindows.h"
 
-#include <D3d9.h>
-#include <D3dx9core.h>
+#include <d3d9.h>
+#include <d3dx9core.h>
 
 #include "plDXPixelShader.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp
index 6f99b4d3..ef5f9b1b 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp
@@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "HeadSpin.h"
 
-#include <D3d9.h>
-#include <D3dx9core.h>
+#include <d3d9.h>
+#include <d3dx9core.h>
 
 #include "HeadSpin.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp
index ec0de0e8..a6f8df2e 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp
@@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "hsWindows.h"
 
-#include <D3d9.h>
-#include <D3dx9core.h>
+#include <d3d9.h>
+#include <d3dx9core.h>
 
 #include "plDXVertexShader.h"
 
diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
index 4cade27e..39a91819 100644
--- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
+++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
@@ -67,7 +67,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plEncryptLogLine.h"
 
 #if HS_BUILD_FOR_WIN32
-    #include <Shlobj.h>
+    #include <shlobj.h>
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt
index 32432225..afe93984 100644
--- a/Sources/Tools/MaxMain/CMakeLists.txt
+++ b/Sources/Tools/MaxMain/CMakeLists.txt
@@ -191,12 +191,12 @@ target_link_libraries(MaxMain pnUtils)
 target_link_libraries(MaxMain pnUUID)
 
 if (WIN32)
-    target_link_libraries(MaxMain Comctl32)
-    target_link_libraries(MaxMain Rpcrt4)
-    target_link_libraries(MaxMain Shlwapi)
-    target_link_libraries(MaxMain Strmiids)
-    target_link_libraries(MaxMain Vfw32)
-    target_link_libraries(MaxMain Ws2_32)
+    target_link_libraries(MaxMain comctl32)
+    target_link_libraries(MaxMain rpcrt4)
+    target_link_libraries(MaxMain shlwapi)
+    target_link_libraries(MaxMain strmiids)
+    target_link_libraries(MaxMain vfw32)
+    target_link_libraries(MaxMain ws2_32)
     target_link_libraries(MaxMain winmm)
 endif(WIN32)
 
diff --git a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt
index 1a890d1b..9ef8f2e8 100644
--- a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt
+++ b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt
@@ -119,9 +119,9 @@ target_link_libraries(MaxPlasmaLights pnUtils)
 target_link_libraries(MaxPlasmaLights pnUUID)
 
 if (WIN32)
-    target_link_libraries(MaxPlasmaLights Comctl32)
-    target_link_libraries(MaxPlasmaLights Rpcrt4)
-    target_link_libraries(MaxPlasmaLights Ws2_32)
+    target_link_libraries(MaxPlasmaLights comctl32)
+    target_link_libraries(MaxPlasmaLights rpcrt4)
+    target_link_libraries(MaxPlasmaLights ws2_32)
 endif(WIN32)
 
 if(USE_VLD)
diff --git a/Sources/Tools/plFontConverter/CMakeLists.txt b/Sources/Tools/plFontConverter/CMakeLists.txt
index d4d06fc5..e102ea6d 100644
--- a/Sources/Tools/plFontConverter/CMakeLists.txt
+++ b/Sources/Tools/plFontConverter/CMakeLists.txt
@@ -35,9 +35,9 @@ target_link_libraries(plFontConverter ${DirectX_LIBRARIES})
 target_link_libraries(plFontConverter ${FREETYPE_LIBRARIES})
 
 if (WIN32)
-    target_link_libraries(plFontConverter Rpcrt4)
-    target_link_libraries(plFontConverter Vfw32)
-    target_link_libraries(plFontConverter Ws2_32)
+    target_link_libraries(plFontConverter rpcrt4)
+    target_link_libraries(plFontConverter vfw32)
+    target_link_libraries(plFontConverter ws2_32)
     target_link_libraries(plFontConverter winmm)
     target_link_libraries(plFontConverter strmiids)
     target_link_libraries(plFontConverter comctl32)
diff --git a/Sources/Tools/plLocalizationEditor/plAddDlgs.cpp b/Sources/Tools/plLocalizationEditor/plAddDlgs.cpp
index eef4eebe..b3cdd506 100644
--- a/Sources/Tools/plLocalizationEditor/plAddDlgs.cpp
+++ b/Sources/Tools/plLocalizationEditor/plAddDlgs.cpp
@@ -121,7 +121,7 @@ LRESULT CALLBACK AlphaNumericEditCtrl::WndProc(HWND hWnd, UINT message, WPARAM w
 }
 
 // plAddElementDlg - dialog for adding a single element
-BOOL CALLBACK plAddElementDlg::IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK plAddElementDlg::IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     static plAddElementDlg* pthis = NULL;
 
@@ -279,7 +279,7 @@ bool plAddElementDlg::DoPick(HWND parent)
 }
 
 // plAddLocalizationDlg - dialog for adding a single localization
-BOOL CALLBACK plAddLocalizationDlg::IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK plAddLocalizationDlg::IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     static plAddLocalizationDlg* pthis = NULL;
 
diff --git a/Sources/Tools/plLocalizationEditor/plAddDlgs.h b/Sources/Tools/plLocalizationEditor/plAddDlgs.h
index 78a1481f..0cd3d6e8 100644
--- a/Sources/Tools/plLocalizationEditor/plAddDlgs.h
+++ b/Sources/Tools/plLocalizationEditor/plAddDlgs.h
@@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 class plAddElementDlg
 {
 protected:
-    static BOOL CALLBACK IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+    static INT_PTR CALLBACK IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
     bool IInitDlg(HWND hDlg);
     void IUpdateDlg(HWND hDlg, bool setFocus = true);
@@ -67,7 +67,7 @@ public:
 class plAddLocalizationDlg
 {
 protected:
-    static BOOL CALLBACK IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+    static INT_PTR CALLBACK IDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
     bool IInitDlg(HWND hDlg);
     void IUpdateDlg(HWND hDlg);
diff --git a/Sources/Tools/plLocalizationEditor/plEditDlg.cpp b/Sources/Tools/plLocalizationEditor/plEditDlg.cpp
index 15661dc2..89b9453e 100644
--- a/Sources/Tools/plLocalizationEditor/plEditDlg.cpp
+++ b/Sources/Tools/plLocalizationEditor/plEditDlg.cpp
@@ -271,7 +271,7 @@ BOOL HandleCommandMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 }
 
 // our dialog's window procedure
-BOOL CALLBACK EditDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK EditDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch(msg)
     {
diff --git a/Sources/Tools/plLocalizationEditor/plEditDlg.h b/Sources/Tools/plLocalizationEditor/plEditDlg.h
index b521c44d..0a793f2e 100644
--- a/Sources/Tools/plLocalizationEditor/plEditDlg.h
+++ b/Sources/Tools/plLocalizationEditor/plEditDlg.h
@@ -67,6 +67,6 @@ public:
 void SplitLocalizationPath(plString path, plString &ageName, plString &setName, plString &locName, plString &locLanguage);
 void SaveLocalizationText();
 void UpdateEditDlg(plString subtitlePath);
-BOOL CALLBACK EditDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK EditDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 #endif
diff --git a/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp b/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
index 75373fd0..c614ca18 100644
--- a/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
+++ b/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include <commctrl.h>
 #include <shlwapi.h>
-#include "res\resource.h"
+#include "res/resource.h"
 
 #include <vector>
 #include <list>
diff --git a/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp b/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
index d1177912..d888ef66 100644
--- a/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
+++ b/Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp
@@ -65,7 +65,7 @@ REGISTER_CREATABLE(plInitialAgeStateLoadedMsg);
 #include "plEditDlg.h"
 
 #include "HeadSpin.h"
-#include <Commdlg.h>
+#include <commdlg.h>
 #include <commctrl.h>
 #include <shlwapi.h>
 #include <shlobj.h>
@@ -149,7 +149,7 @@ void SetWindowTitle(HWND hWnd, std::wstring path)
     SetWindowText(hWnd, title.c_str());
 }
 
-BOOL CALLBACK AboutDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK AboutDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     if(msg == WM_COMMAND)
         EndDialog(hWnd, 0);
diff --git a/Sources/Tools/plResBrowser/CMakeLists.txt b/Sources/Tools/plResBrowser/CMakeLists.txt
index 59d0affb..c08bed60 100644
--- a/Sources/Tools/plResBrowser/CMakeLists.txt
+++ b/Sources/Tools/plResBrowser/CMakeLists.txt
@@ -52,10 +52,10 @@ target_link_libraries(plResBrowser pnUtils)
 target_link_libraries(plResBrowser pnUUID)
 
 if (WIN32)
-    target_link_libraries(plResBrowser Rpcrt4)
-    target_link_libraries(plResBrowser Version)
-    target_link_libraries(plResBrowser Vfw32)
-    target_link_libraries(plResBrowser Ws2_32)
+    target_link_libraries(plResBrowser rpcrt4)
+    target_link_libraries(plResBrowser version)
+    target_link_libraries(plResBrowser vfw32)
+    target_link_libraries(plResBrowser ws2_32)
     target_link_libraries(plResBrowser winmm)
     target_link_libraries(plResBrowser strmiids)
     target_link_libraries(plResBrowser comctl32)
diff --git a/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp b/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp
index 2e44a90c..a4966f67 100644
--- a/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp
+++ b/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp
@@ -86,7 +86,7 @@ void    SetWindowTitle( HWND hWnd, char *path )
     SetWindowText( hWnd, fun );
 }
 
-BOOL CALLBACK AboutDialogProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK AboutDialogProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     if( msg == WM_COMMAND )
         EndDialog( hWnd, 0 );
diff --git a/Sources/Tools/plResBrowser/plResTreeView.cpp b/Sources/Tools/plResBrowser/plResTreeView.cpp
index dc2bd1dd..fdca3da2 100644
--- a/Sources/Tools/plResBrowser/plResTreeView.cpp
+++ b/Sources/Tools/plResBrowser/plResTreeView.cpp
@@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include <commctrl.h>
 #include <shlwapi.h>
-#include "res\resource.h"
+#include "res/resource.h"
 
 
 extern HINSTANCE        gInstance;
@@ -68,7 +68,7 @@ static HTREEITEM    fFoundItem = nil;
 extern void ViewPatchDetails( plKey &patchKey );
 
 
-BOOL CALLBACK   FindDialogProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK   FindDialogProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     switch( msg )
     {
@@ -305,7 +305,7 @@ void    plResTreeView::FilterLoadables( bool filter, HWND treeCtrl )
     FillTreeViewFromRegistry( treeCtrl );
 }
 
-BOOL CALLBACK   plResTreeView::InfoDlgProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK   plResTreeView::InfoDlgProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     switch( msg )
     {
diff --git a/Sources/Tools/plResBrowser/plResTreeView.h b/Sources/Tools/plResBrowser/plResTreeView.h
index 88fca301..9281e714 100644
--- a/Sources/Tools/plResBrowser/plResTreeView.h
+++ b/Sources/Tools/plResBrowser/plResTreeView.h
@@ -59,7 +59,7 @@ class plResTreeView
         static void FillTreeViewFromRegistry( HWND hWnd );
         static void ClearTreeView( HWND hWnd );
 
-        static BOOL CALLBACK    InfoDlgProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam );
+        static INT_PTR CALLBACK    InfoDlgProc( HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam );
 
         static void UpdateInfoDlg( HWND treeCtrl );
 
@@ -72,4 +72,4 @@ class plResTreeView
         static void SaveSelectedObject(HWND treeCtrl);
 };
 
-#endif //_plResTreeView_h
\ No newline at end of file
+#endif //_plResTreeView_h
diff --git a/Sources/Tools/plShaderAssembler/main.cpp b/Sources/Tools/plShaderAssembler/main.cpp
index ad170efb..ff4a73d3 100644
--- a/Sources/Tools/plShaderAssembler/main.cpp
+++ b/Sources/Tools/plShaderAssembler/main.cpp
@@ -1,8 +1,8 @@
 // AssShader.cpp : Defines the entry point for the console application.
 //
 
-#include <D3d9.h>
-#include <D3dx9core.h>
+#include <d3d9.h>
+#include <d3dx9core.h>
 
 #include "plFileSystem.h"