From 1e1ab00ded01af90a54aba8eeedaf274f21270b5 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 13:18:29 +0000
Subject: [PATCH] [ACCESS] * Remove one time inclusions from the main header
 and put them back where they belong. * Cleanup the main header. CORE-7716

svn path=/trunk/; revision=61618
---
 reactos/dll/cpl/access/access.c   | 2 ++
 reactos/dll/cpl/access/access.h   | 5 ++---
 reactos/dll/cpl/access/display.c  | 2 +-
 reactos/dll/cpl/access/general.c  | 1 -
 reactos/dll/cpl/access/keyboard.c | 1 -
 reactos/dll/cpl/access/mouse.c    | 1 -
 reactos/dll/cpl/access/sound.c    | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c
index 2d65fc32b90..403f79f7dc2 100644
--- a/reactos/dll/cpl/access/access.c
+++ b/reactos/dll/cpl/access/access.c
@@ -9,6 +9,8 @@
 
 #include "access.h"
 
+#include <cpl.h>
+
 #define NUM_APPLETS	(1)
 
 LONG CALLBACK SystemApplet(VOID);
diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h
index b642894df7d..2309d68dc55 100644
--- a/reactos/dll/cpl/access/access.h
+++ b/reactos/dll/cpl/access/access.h
@@ -1,12 +1,11 @@
-#define WIN32_NO_STATUS
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <wingdi.h>
 #include <winuser.h>
 #include <commctrl.h>
-#include <cpl.h>
 #include <tchar.h>
 
 #include "resource.h"
diff --git a/reactos/dll/cpl/access/display.c b/reactos/dll/cpl/access/display.c
index 9c4bb41535e..4f8bc16fa09 100644
--- a/reactos/dll/cpl/access/display.c
+++ b/reactos/dll/cpl/access/display.c
@@ -9,10 +9,10 @@
 
 #include "access.h"
 
+#include <wingdi.h>
 
 #define ID_BLINK_TIMER 346
 
-
 static VOID
 FillColorSchemeComboBox(HWND hwnd)
 {
diff --git a/reactos/dll/cpl/access/general.c b/reactos/dll/cpl/access/general.c
index e8421cb9039..8b1742a7305 100644
--- a/reactos/dll/cpl/access/general.c
+++ b/reactos/dll/cpl/access/general.c
@@ -9,7 +9,6 @@
 
 #include "access.h"
 
-
 #define BAUDTICKS 6
 static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200};
 
diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c
index 6d5c7be79d5..f5953c4ca98 100644
--- a/reactos/dll/cpl/access/keyboard.c
+++ b/reactos/dll/cpl/access/keyboard.c
@@ -9,7 +9,6 @@
 
 #include "access.h"
 
-
 #define BOUNCETICKS 5
 static UINT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000};
 
diff --git a/reactos/dll/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c
index 38a7b95a29f..6a4adb50040 100644
--- a/reactos/dll/cpl/access/mouse.c
+++ b/reactos/dll/cpl/access/mouse.c
@@ -9,7 +9,6 @@
 
 #include "access.h"
 
-
 #define SPEEDTICKS 9
 #define ACCELTICKS 9
 
diff --git a/reactos/dll/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c
index f0b3edead6f..0793c259ab6 100644
--- a/reactos/dll/cpl/access/sound.c
+++ b/reactos/dll/cpl/access/sound.c
@@ -9,7 +9,6 @@
 
 #include "access.h"
 
-
 static VOID
 OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData)
 {