From 628a3a83755fc9bd58d907e4e46323a0928fdb42 Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Wed, 7 Jun 2023 13:30:25 +0200
Subject: [PATCH] Include fixes

---
 include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp | 2 +-
 src/Nazara/Core/Error.cpp                                   | 2 +-
 src/Nazara/Core/StringExt.cpp                               | 2 --
 src/Nazara/Core/Win32/DynLibImpl.hpp                        | 2 +-
 src/Nazara/Core/Win32/FileImpl.hpp                          | 2 +-
 src/Nazara/Core/Win32/HardwareInfoImpl.cpp                  | 2 +-
 src/Nazara/Core/Win32/TaskSchedulerImpl.hpp                 | 2 +-
 src/Nazara/Core/Win32/TimeImpl.cpp                          | 2 +-
 src/Nazara/Core/Win32/Utils.hpp                             | 2 +-
 src/Nazara/Utility/PixelFormat.cpp                          | 1 +
 xmake/actions/checkfiles.lua                                | 2 +-
 11 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp
index 95f07bde3..7e05abde1 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp
@@ -10,7 +10,7 @@
 #include <NazaraUtils/Prerequisites.hpp>
 #include <memory>
 #include <type_traits>
-#include <windows.h>
+#include <Windows.h>
 
 namespace Nz::GL
 {
diff --git a/src/Nazara/Core/Error.cpp b/src/Nazara/Core/Error.cpp
index aaef3cf98..c22e867c5 100644
--- a/src/Nazara/Core/Error.cpp
+++ b/src/Nazara/Core/Error.cpp
@@ -10,7 +10,7 @@
 #include <stdexcept>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
-	#include <windows.h>
+	#include <Windows.h>
 #elif defined(NAZARA_PLATFORM_POSIX)
 	#include <cstring>
 	#include <errno.h>
diff --git a/src/Nazara/Core/StringExt.cpp b/src/Nazara/Core/StringExt.cpp
index 97d96cee4..6f4b6bbe5 100644
--- a/src/Nazara/Core/StringExt.cpp
+++ b/src/Nazara/Core/StringExt.cpp
@@ -646,5 +646,3 @@ namespace Nz
 		return std::string_view(start.base(), it.base() - start.base());
 	}
 }
-
-#include <Nazara/Core/DebugOff.hpp>
diff --git a/src/Nazara/Core/Win32/DynLibImpl.hpp b/src/Nazara/Core/Win32/DynLibImpl.hpp
index bfd00be85..d4ac15327 100644
--- a/src/Nazara/Core/Win32/DynLibImpl.hpp
+++ b/src/Nazara/Core/Win32/DynLibImpl.hpp
@@ -10,8 +10,8 @@
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <NazaraUtils/MovablePtr.hpp>
-#include <Windows.h>
 #include <filesystem>
+#include <Windows.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Core/Win32/FileImpl.hpp b/src/Nazara/Core/Win32/FileImpl.hpp
index d6f97033e..509746ffc 100644
--- a/src/Nazara/Core/Win32/FileImpl.hpp
+++ b/src/Nazara/Core/Win32/FileImpl.hpp
@@ -10,7 +10,7 @@
 #include <NazaraUtils/Prerequisites.hpp>
 #include <Nazara/Core/File.hpp>
 #include <ctime>
-#include <windows.h>
+#include <Windows.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
index b334f4b6d..fd97e35e7 100644
--- a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
@@ -4,7 +4,7 @@
 
 #include <Nazara/Core/Win32/HardwareInfoImpl.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <windows.h>
+#include <Windows.h>
 
 #ifdef NAZARA_COMPILER_MSVC
 	#include <intrin.h>
diff --git a/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp b/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
index 146173d9a..f935d87df 100644
--- a/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
+++ b/src/Nazara/Core/Win32/TaskSchedulerImpl.hpp
@@ -12,7 +12,7 @@
 #include <atomic>
 #include <memory>
 #include <queue>
-#include <windows.h>
+#include <Windows.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Core/Win32/TimeImpl.cpp b/src/Nazara/Core/Win32/TimeImpl.cpp
index 63bd146d4..fa6ea6469 100644
--- a/src/Nazara/Core/Win32/TimeImpl.cpp
+++ b/src/Nazara/Core/Win32/TimeImpl.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Core/Win32/TimeImpl.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <ctime>
-#include <windows.h>
+#include <Windows.h>
 #include <Nazara/Core/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Core/Win32/Utils.hpp b/src/Nazara/Core/Win32/Utils.hpp
index 1c4b47cfa..8c03faada 100644
--- a/src/Nazara/Core/Win32/Utils.hpp
+++ b/src/Nazara/Core/Win32/Utils.hpp
@@ -9,7 +9,7 @@
 
 #include <NazaraUtils/Prerequisites.hpp>
 #include <ctime>
-#include <windows.h>
+#include <Windows.h>
 
 namespace Nz
 {
diff --git a/src/Nazara/Utility/PixelFormat.cpp b/src/Nazara/Utility/PixelFormat.cpp
index b529bbaeb..0fb47097f 100644
--- a/src/Nazara/Utility/PixelFormat.cpp
+++ b/src/Nazara/Utility/PixelFormat.cpp
@@ -4,6 +4,7 @@
 
 #include <Nazara/Utility/PixelFormat.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <Nazara/Core/StringExt.hpp>
 #include <NazaraUtils/Endianness.hpp>
 #include <Nazara/Utility/Debug.hpp>
 
diff --git a/xmake/actions/checkfiles.lua b/xmake/actions/checkfiles.lua
index 8538a4482..833b6ce10 100644
--- a/xmake/actions/checkfiles.lua
+++ b/xmake/actions/checkfiles.lua
@@ -49,7 +49,7 @@ local systemHeaders = {
 }
 
 local function IsSystemHeader(header)
-	if systemHeaders[header] then
+	if systemHeaders[header:lower()] then
 		return true
 	end