From 9088ae994cbe9b3edeb5dbc9530b1cd713acf8df Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 29 Oct 2012 15:02:41 -0700
Subject: [PATCH] Remove windows.h from the precompiled header

It's only used by a few source files and it defines a ton of garbage.
---
 aegisub/libaegisub/include/libaegisub/util_win.h | 4 +++-
 aegisub/libaegisub/lagi_pre.h                    | 5 -----
 aegisub/libaegisub/windows/log_win.cpp           | 6 +++---
 aegisub/src/agi_pre.h                            | 1 -
 aegisub/src/audio_provider_pcm.h                 | 2 +-
 aegisub/src/auto4_base.cpp                       | 3 ++-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/aegisub/libaegisub/include/libaegisub/util_win.h b/aegisub/libaegisub/include/libaegisub/util_win.h
index 20683c823..130e99af1 100644
--- a/aegisub/libaegisub/include/libaegisub/util_win.h
+++ b/aegisub/libaegisub/include/libaegisub/util_win.h
@@ -18,9 +18,11 @@
 
 #ifndef LAGI_PRE
 #include <string>
-#include <windows.h>
 #endif
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
 namespace agi {
 	namespace util {
 
diff --git a/aegisub/libaegisub/lagi_pre.h b/aegisub/libaegisub/lagi_pre.h
index 53f38d7e1..bba770bac 100644
--- a/aegisub/libaegisub/lagi_pre.h
+++ b/aegisub/libaegisub/lagi_pre.h
@@ -20,11 +20,6 @@
 
 // Windows C
 #ifdef _WIN32
-// "Lean and mean" causes windows.h to include less stuff, mostly rarely-used things.
-// We can't build without being "lean and mean", some of the things included by it has
-// macros that clash with variable names around Aegisub causing strange build errors.
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <io.h>
 #endif
 
diff --git a/aegisub/libaegisub/windows/log_win.cpp b/aegisub/libaegisub/windows/log_win.cpp
index a98810660..8243ecbae 100644
--- a/aegisub/libaegisub/windows/log_win.cpp
+++ b/aegisub/libaegisub/windows/log_win.cpp
@@ -20,9 +20,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #endif
 
 #include "libaegisub/log.h"
@@ -30,6 +27,9 @@
 #include "libaegisub/charset_conv_win.h"
 #include "libaegisub/util.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
 namespace agi {
 	namespace log {
 
diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 3ef4330c5..821c83de1 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -68,7 +68,6 @@
 #include <wchar.h>
 
 #ifdef _WIN32
-#include <windows.h>
 #include <objbase.h>
 #include <mmsystem.h>
 #else
diff --git a/aegisub/src/audio_provider_pcm.h b/aegisub/src/audio_provider_pcm.h
index 0db367ea5..a4d2983b3 100644
--- a/aegisub/src/audio_provider_pcm.h
+++ b/aegisub/src/audio_provider_pcm.h
@@ -40,6 +40,7 @@
 #endif
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
@@ -47,7 +48,6 @@
 
 #include <libaegisub/scoped_ptr.h>
 
-
 /// DOCME
 /// @class PCMAudioProvider
 /// @brief DOCME
diff --git a/aegisub/src/auto4_base.cpp b/aegisub/src/auto4_base.cpp
index 97a041cfc..3ed097d17 100644
--- a/aegisub/src/auto4_base.cpp
+++ b/aegisub/src/auto4_base.cpp
@@ -39,7 +39,6 @@
 #ifndef AGI_PRE
 #ifdef __WINDOWS__
 #include <tchar.h>
-#include <windows.h>
 #endif
 
 #include <wx/button.h>
@@ -54,6 +53,8 @@
 #endif
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <tuple>
 #else
 #include <tr1/tuple>