diff --git a/desmume/src/frontend/windows/aviout.h b/desmume/src/frontend/windows/aviout.h
index d64c45e5e..57b5d4dbe 100644
--- a/desmume/src/frontend/windows/aviout.h
+++ b/desmume/src/frontend/windows/aviout.h
@@ -20,8 +20,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <Commdlg.h>
-#include <Shellapi.h>
+#include <commdlg.h>
+#include <shellapi.h>
 
 #include <vfw.h>
 
diff --git a/desmume/src/frontend/windows/display.cpp b/desmume/src/frontend/windows/display.cpp
index 4e4d8b329..c5ee7c139 100644
--- a/desmume/src/frontend/windows/display.cpp
+++ b/desmume/src/frontend/windows/display.cpp
@@ -17,8 +17,8 @@ along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "display.h"
 
-#include <MMSystem.h>
-#include <WindowsX.h>
+#include <mmsystem.h>
+#include <windowsx.h>
 
 #include "main.h"
 #include "windriver.h"
diff --git a/desmume/src/frontend/windows/hotkey.cpp b/desmume/src/frontend/windows/hotkey.cpp
index a8f3cf754..2043f1b29 100644
--- a/desmume/src/frontend/windows/hotkey.cpp
+++ b/desmume/src/frontend/windows/hotkey.cpp
@@ -21,8 +21,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <Commdlg.h>
-#include <Shellapi.h>
+#include <commdlg.h>
+#include <shellapi.h>
 
 #include "hotkey.h"
 
@@ -39,7 +39,7 @@
 #include "frontend/modules/ImageOut.h"
 
 #include "main.h"
-#include "CheatsWin.h"
+#include "cheatsWin.h"
 #include "inputdx.h"
 #include "throttle.h"
 #include "ramwatch.h"		//In order to call UpdateRamWatch (for loadstate functions)
diff --git a/desmume/src/frontend/windows/inputdx.h b/desmume/src/frontend/windows/inputdx.h
index 5b23b2c3f..d2a187ac5 100644
--- a/desmume/src/frontend/windows/inputdx.h
+++ b/desmume/src/frontend/windows/inputdx.h
@@ -24,10 +24,10 @@
 #define INPUTDX_INCLUDED
 
 #include <windows.h>
-#include <Mmsystem.h>
+#include <mmsystem.h>
 #define DIRECTINPUT_VERSION 0x0800
 #include "directx/dinput.h"
-#include "directx/xinput.h"
+#include "directx/XInput.h"
 
 typedef struct
 {
diff --git a/desmume/src/frontend/windows/luaconsole.cpp b/desmume/src/frontend/windows/luaconsole.cpp
index f7244312c..ffa871059 100644
--- a/desmume/src/frontend/windows/luaconsole.cpp
+++ b/desmume/src/frontend/windows/luaconsole.cpp
@@ -23,8 +23,8 @@
 #include <algorithm>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <Commdlg.h>
-#include <Shellapi.h>
+#include <commdlg.h>
+#include <shellapi.h>
 #include "driver.h"
 #include "lua-engine.h"
 
diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp
index 659c30ddc..ec07f6ad1 100644
--- a/desmume/src/frontend/windows/main.cpp
+++ b/desmume/src/frontend/windows/main.cpp
@@ -26,8 +26,8 @@
 #include <string>
 #include <vector>
 
-#include <Winuser.h>
-#include <Winnls.h>
+#include <winuser.h>
+#include <winnls.h>
 #include <windowsx.h>
 #include <mmsystem.h>
 #include <shellapi.h>
@@ -100,9 +100,9 @@
 #include "palView.h"
 #include "tileView.h"
 #include "oamView.h"
-#include "mapview.h"
-#include "matrixview.h"
-#include "lightview.h"
+#include "mapView.h"
+#include "matrixView.h"
+#include "lightView.h"
 #include "slot1_config.h"
 #include "gbaslot_config.h"
 #include "cheatsWin.h"
diff --git a/desmume/src/frontend/windows/main.h b/desmume/src/frontend/windows/main.h
index d05d4c837..45bacf802 100644
--- a/desmume/src/frontend/windows/main.h
+++ b/desmume/src/frontend/windows/main.h
@@ -20,7 +20,7 @@
 #define _MAIN_H_
 
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 #include "types.h"
 #include "CWindow.h"
 
diff --git a/desmume/src/frontend/windows/ogl.cpp b/desmume/src/frontend/windows/ogl.cpp
index ddac52958..fff95e8b3 100644
--- a/desmume/src/frontend/windows/ogl.cpp
+++ b/desmume/src/frontend/windows/ogl.cpp
@@ -26,8 +26,8 @@
 
 #include "OGLRender.h"
 
-#include <gl/gl.h>
-#include <gl/glext.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
 #include <GL/wglext.h>
 #include "console.h"
 #include "CWindow.h"
diff --git a/desmume/src/frontend/windows/ram_search.cpp b/desmume/src/frontend/windows/ram_search.cpp
index f6248256d..1bf39098c 100644
--- a/desmume/src/frontend/windows/ram_search.cpp
+++ b/desmume/src/frontend/windows/ram_search.cpp
@@ -63,7 +63,7 @@
 #include "cheatsWin.h"
 
 #ifdef _WIN32
-   #include "BaseTsd.h"
+   #include "basetsd.h"
    typedef INT_PTR intptr_t;
 #else
    #include "stdint.h"
diff --git a/desmume/src/frontend/windows/snddx.cpp b/desmume/src/frontend/windows/snddx.cpp
index 65b9da6ec..7a5a14d1e 100644
--- a/desmume/src/frontend/windows/snddx.cpp
+++ b/desmume/src/frontend/windows/snddx.cpp
@@ -19,7 +19,7 @@
 #include "snddx.h"
 
 #include <stdio.h>
-#include <Windows.h>
+#include <windows.h>
 #include <mmsystem.h>
 #include "directx/dsound.h"
 
diff --git a/desmume/src/frontend/windows/throttle.cpp b/desmume/src/frontend/windows/throttle.cpp
index ff7bf569e..7cad18361 100644
--- a/desmume/src/frontend/windows/throttle.cpp
+++ b/desmume/src/frontend/windows/throttle.cpp
@@ -23,8 +23,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <Commdlg.h>
-#include <Shellapi.h>
+#include <commdlg.h>
+#include <shellapi.h>
 
 #include "types.h"
 #include "debug.h"
diff --git a/desmume/src/frontend/windows/winutil.cpp b/desmume/src/frontend/windows/winutil.cpp
index 07e8b4bad..652830360 100644
--- a/desmume/src/frontend/windows/winutil.cpp
+++ b/desmume/src/frontend/windows/winutil.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <windows.h>
 #include <windef.h>
-#include <ShlObj.h>
+#include <shlobj.h>
 
 
 char IniName[MAX_PATH];
@@ -200,4 +200,4 @@ int GetSubMenuIndexByHMENU(HMENU menu, HMENU sub)
 		if(sub == trial) return i;
 	}
 	return -1;
-}
\ No newline at end of file
+}
diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp
index a2e273565..7e8e64fbd 100644
--- a/desmume/src/lua-engine.cpp
+++ b/desmume/src/lua-engine.cpp
@@ -21,7 +21,7 @@
 	#include <windows.h>
     #if defined(WIN32_FRONTEND)
         #include <direct.h>
-        #include <MMSystem.h>
+        #include <mmsystem.h>
 
         typedef HMENU PlatformMenu;    // hMenu
         #define MAX_MENU_COUNT (IDC_LUAMENU_RESERVE_END - IDC_LUAMENU_RESERVE_START + 1)
diff --git a/desmume/src/utils/AsmJit/core/build.h b/desmume/src/utils/AsmJit/core/build.h
index 2ff1943dc..c36f53f30 100644
--- a/desmume/src/utils/AsmJit/core/build.h
+++ b/desmume/src/utils/AsmJit/core/build.h
@@ -282,7 +282,7 @@ static inline T asmjit_cast(Z* p) { return (T)p; }
 // ============================================================================
 
 #if defined(ASMJIT_WINDOWS)
-#include <Windows.h>
+#include <windows.h>
 #endif // ASMJIT_WINDOWS
 
 #if defined(__APPLE__)