From 31cf856db33f8f612687d64d783bcdcc4d039357 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Jan 2014 10:40:50 +0000
Subject: [PATCH] [TIMEDATE] * Remove one time inclusions from the main header
 and put them back where they belong. CORE-7716

svn path=/trunk/; revision=61700
---
 reactos/dll/cpl/timedate/clock.c     |  2 ++
 reactos/dll/cpl/timedate/monthcal.c  |  2 ++
 reactos/dll/cpl/timedate/ntpclient.c |  2 ++
 reactos/dll/cpl/timedate/timedate.h  | 10 +++++-----
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/cpl/timedate/clock.c b/reactos/dll/cpl/timedate/clock.c
index eafe1bf2e8f..d4359505012 100644
--- a/reactos/dll/cpl/timedate/clock.c
+++ b/reactos/dll/cpl/timedate/clock.c
@@ -11,6 +11,8 @@
 
 #include "timedate.h"
 
+#include <math.h>
+
 typedef struct _CLOCKDATA
 {
     HBRUSH hGreyBrush;
diff --git a/reactos/dll/cpl/timedate/monthcal.c b/reactos/dll/cpl/timedate/monthcal.c
index c66014e5629..3caf00fc96f 100644
--- a/reactos/dll/cpl/timedate/monthcal.c
+++ b/reactos/dll/cpl/timedate/monthcal.c
@@ -9,6 +9,8 @@
 
 #include "timedate.h"
 
+#include <windowsx.h>
+
 static const WCHAR szMonthCalWndClass[] = L"MonthCalWnd";
 
 #define MONTHCAL_HEADERBG   COLOR_INACTIVECAPTION
diff --git a/reactos/dll/cpl/timedate/ntpclient.c b/reactos/dll/cpl/timedate/ntpclient.c
index 6df57cf9122..7f2b524da4f 100644
--- a/reactos/dll/cpl/timedate/ntpclient.c
+++ b/reactos/dll/cpl/timedate/ntpclient.c
@@ -9,6 +9,8 @@
 
 #include "timedate.h"
 
+#include <winsock2.h>
+
 #define TIMEOUT 4000 /* 4 second timeout */
 
 typedef struct _INFO
diff --git a/reactos/dll/cpl/timedate/timedate.h b/reactos/dll/cpl/timedate/timedate.h
index d1e8c5d24cc..ecdb2a5f1ad 100644
--- a/reactos/dll/cpl/timedate/timedate.h
+++ b/reactos/dll/cpl/timedate/timedate.h
@@ -1,16 +1,16 @@
-#define WIN32_NO_STATUS
 #include <stdarg.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define WIN32_NO_STATUS
+
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>
-#include <windowsx.h>
-#define _INC_WINDOWS
-#include <winsock2.h>
 #include <wchar.h>
-#include <math.h>
 #include <commctrl.h>
 #include <cpl.h>