From f90ebc8dffe037823e029bd091900a829dae2b16 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 24 Feb 2015 12:47:54 +0100
Subject: [PATCH] Cleanup Windows includes

---
 code/nel/src/misc/common.cpp       | 1 +
 code/nel/src/misc/stdmisc.h        | 6 ++++--
 code/nel/src/misc/system_utils.cpp | 9 +++++----
 code/nel/src/misc/time_nl.cpp      | 4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index e8bec1e92..671879f2e 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -20,6 +20,7 @@
 #include "nel/misc/common.h"
 
 #ifdef NL_OS_WINDOWS
+#	include <ShellAPI.h>
 #	include <io.h>
 #	include <tchar.h>
 #elif defined NL_OS_UNIX
diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h
index de7df693c..b24a74616 100644
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@@ -42,7 +42,9 @@
 #include <utility>
 #include <vector>
 
-#ifdef _WIN32
+#include <nel/misc/types_nl.h>
+
+#ifdef NL_OS_WINDOWS
 #	define WIN32_LEAN_AND_MEAN
 #	define _WIN32_WINDOWS 0x0410
 #	ifndef _WIN32_WINNT
@@ -53,7 +55,7 @@
 #		define NOMINMAX
 #	endif
 #	include <WinSock2.h>
-#	include <windows.h>
+#	include <Windows.h>
 #endif
 
 #endif // NL_STDMISC_H
diff --git a/code/nel/src/misc/system_utils.cpp b/code/nel/src/misc/system_utils.cpp
index f53f6822e..e298f941c 100644
--- a/code/nel/src/misc/system_utils.cpp
+++ b/code/nel/src/misc/system_utils.cpp
@@ -18,11 +18,12 @@
 #include "nel/misc/system_utils.h"
 
 #ifdef NL_OS_WINDOWS
-	#ifdef _WIN32_WINNT_WIN7
+#	include <ObjBase.h>
+#	ifdef _WIN32_WINNT_WIN7
 		// only supported by Windows 7 Platform SDK
-		#include <ShObjIdl.h>
-		#define TASKBAR_PROGRESS 1
-	#endif
+#		include <ShObjIdl.h>
+#		define TASKBAR_PROGRESS 1
+#	endif
 #endif
 
 #ifdef DEBUG_NEW
diff --git a/code/nel/src/misc/time_nl.cpp b/code/nel/src/misc/time_nl.cpp
index 821e4b397..70b7b3807 100644
--- a/code/nel/src/misc/time_nl.cpp
+++ b/code/nel/src/misc/time_nl.cpp
@@ -20,7 +20,9 @@
 #include "nel/misc/sstring.h"
 #include "nel/misc/thread.h"
 
-#if defined (NL_OS_UNIX)
+#ifdef NL_OS_WINDOWS
+#	include <MMSystem.h>
+#elif defined (NL_OS_UNIX)
 #	include <sys/time.h>
 #	include <unistd.h>
 #endif