From 95d44c2c2d044c55e56b55b83872a9bf2ca605e0 Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Sat, 11 Feb 2023 16:29:24 -0400
Subject: [PATCH] very minor compile speed improvements

---
 src/common/StringMap.h                       | 2 --
 src/common/types.h                           | 1 -
 src/common/utf8.h                            | 2 ++
 src/love.cpp                                 | 1 +
 src/modules/data/CompressedData.cpp          | 1 +
 src/modules/data/Compressor.cpp              | 1 +
 src/modules/data/HashFunction.cpp            | 1 +
 src/modules/filesystem/Filesystem.cpp        | 1 +
 src/modules/filesystem/physfs/Filesystem.cpp | 1 +
 src/modules/image/CompressedImageData.cpp    | 1 +
 src/modules/image/FormatHandler.h            | 2 ++
 src/modules/love/love.cpp                    | 1 +
 src/modules/physics/box2d/GearJoint.cpp      | 1 +
 src/modules/timer/Timer.cpp                  | 1 +
 src/modules/window/sdl/Window.cpp            | 1 +
 15 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/common/StringMap.h b/src/common/StringMap.h
index a3645716b..49c1a06ac 100644
--- a/src/common/StringMap.h
+++ b/src/common/StringMap.h
@@ -21,8 +21,6 @@
 #ifndef LOVE_STRING_MAP_H
 #define LOVE_STRING_MAP_H
 
-#include "Exception.h"
-
 #include <string>
 #include <vector>
 
diff --git a/src/common/types.h b/src/common/types.h
index 33bbf21b3..d9948b984 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -25,7 +25,6 @@
 
 // STD
 #include <bitset>
-#include <vector>
 
 namespace love
 {
diff --git a/src/common/utf8.h b/src/common/utf8.h
index ba74e705d..ff17ac1c2 100644
--- a/src/common/utf8.h
+++ b/src/common/utf8.h
@@ -23,6 +23,8 @@
 #ifdef LOVE_WINDOWS
 
 #include <string>
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 namespace love
diff --git a/src/love.cpp b/src/love.cpp
index 7df837a97..10e0b5c3f 100644
--- a/src/love.cpp
+++ b/src/love.cpp
@@ -34,6 +34,7 @@ extern "C" {
 }
 
 #ifdef LOVE_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif // LOVE_WINDOWS
 
diff --git a/src/modules/data/CompressedData.cpp b/src/modules/data/CompressedData.cpp
index 22faca30e..f94c67758 100644
--- a/src/modules/data/CompressedData.cpp
+++ b/src/modules/data/CompressedData.cpp
@@ -20,6 +20,7 @@
 
 // LOVE
 #include "CompressedData.h"
+#include "common/Exception.h"
 
 namespace love
 {
diff --git a/src/modules/data/Compressor.cpp b/src/modules/data/Compressor.cpp
index 4712a314d..2df1a1154 100644
--- a/src/modules/data/Compressor.cpp
+++ b/src/modules/data/Compressor.cpp
@@ -22,6 +22,7 @@
 #include "Compressor.h"
 #include "common/config.h"
 #include "common/int.h"
+#include "common/Exception.h"
 
 #include "libraries/lz4/lz4.h"
 #include "libraries/lz4/lz4hc.h"
diff --git a/src/modules/data/HashFunction.cpp b/src/modules/data/HashFunction.cpp
index 34d9e008d..fae685ec2 100644
--- a/src/modules/data/HashFunction.cpp
+++ b/src/modules/data/HashFunction.cpp
@@ -19,6 +19,7 @@
  **/
 
 #include "HashFunction.h"
+#include "common/Exception.h"
 
 // FIXME: Probably trivial by having tole and tobe functions, which can be ifdeffed to being identity functions
 #ifdef LOVE_BIG_ENDIAN
diff --git a/src/modules/filesystem/Filesystem.cpp b/src/modules/filesystem/Filesystem.cpp
index 1e3432cb4..542514dea 100644
--- a/src/modules/filesystem/Filesystem.cpp
+++ b/src/modules/filesystem/Filesystem.cpp
@@ -30,6 +30,7 @@
 #include "common/apple.h"
 #include <unistd.h>
 #elif defined(LOVE_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <fileapi.h>
 #include "common/utf8.h"
diff --git a/src/modules/filesystem/physfs/Filesystem.cpp b/src/modules/filesystem/physfs/Filesystem.cpp
index 00c8630ca..7e2adceee 100644
--- a/src/modules/filesystem/physfs/Filesystem.cpp
+++ b/src/modules/filesystem/physfs/Filesystem.cpp
@@ -35,6 +35,7 @@
 // Using this instead of boost::filesystem which totally
 // cramped our style.
 #ifdef LOVE_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
 #	include <windows.h>
 #	include <direct.h>
 #	include <initguid.h>
diff --git a/src/modules/image/CompressedImageData.cpp b/src/modules/image/CompressedImageData.cpp
index 029b33a1f..0ff04cb5d 100644
--- a/src/modules/image/CompressedImageData.cpp
+++ b/src/modules/image/CompressedImageData.cpp
@@ -19,6 +19,7 @@
  **/
 
 #include "CompressedImageData.h"
+#include "common/Exception.h"
 
 namespace love
 {
diff --git a/src/modules/image/FormatHandler.h b/src/modules/image/FormatHandler.h
index 1900222b3..9fc6cab16 100644
--- a/src/modules/image/FormatHandler.h
+++ b/src/modules/image/FormatHandler.h
@@ -26,6 +26,8 @@
 #include "common/pixelformat.h"
 #include "CompressedSlice.h"
 
+#include <vector>
+
 namespace love
 {
 namespace image
diff --git a/src/modules/love/love.cpp b/src/modules/love/love.cpp
index c6d590eff..7c14d3ea8 100644
--- a/src/modules/love/love.cpp
+++ b/src/modules/love/love.cpp
@@ -32,6 +32,7 @@
 #include <sstream>
 
 #ifdef LOVE_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif // LOVE_WINDOWS
 
diff --git a/src/modules/physics/box2d/GearJoint.cpp b/src/modules/physics/box2d/GearJoint.cpp
index af7ddcdb0..8f0968285 100644
--- a/src/modules/physics/box2d/GearJoint.cpp
+++ b/src/modules/physics/box2d/GearJoint.cpp
@@ -23,6 +23,7 @@
 // Module
 #include "Body.h"
 #include "World.h"
+#include "common/Exception.h"
 
 namespace love
 {
diff --git a/src/modules/timer/Timer.cpp b/src/modules/timer/Timer.cpp
index be73f4598..c1cf900da 100644
--- a/src/modules/timer/Timer.cpp
+++ b/src/modules/timer/Timer.cpp
@@ -26,6 +26,7 @@
 
 #include <iostream>
 #if defined(LOVE_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(LOVE_MACOS) || defined(LOVE_IOS)
 #include <mach/mach_time.h>
diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp
index c65addd3c..c37537413 100644
--- a/src/modules/window/sdl/Window.cpp
+++ b/src/modules/window/sdl/Window.cpp
@@ -51,6 +51,7 @@
 #endif
 
 #if defined(LOVE_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <dwmapi.h>
 #include <VersionHelpers.h>