From 5bd968466e6494f1a944b66e7a1d0b9c02655431 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 4 Jan 2014 14:13:48 +0000
Subject: [PATCH] [DXDIAG] * 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=61529
---
 reactos/base/applications/dxdiag/d3dtest.c | 2 ++
 reactos/base/applications/dxdiag/display.c | 1 +
 reactos/base/applications/dxdiag/input.c   | 1 +
 reactos/base/applications/dxdiag/network.c | 2 ++
 reactos/base/applications/dxdiag/precomp.h | 9 +++------
 reactos/base/applications/dxdiag/sound.c   | 3 +++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/reactos/base/applications/dxdiag/d3dtest.c b/reactos/base/applications/dxdiag/d3dtest.c
index 846f6e47b4e..2246480767d 100644
--- a/reactos/base/applications/dxdiag/d3dtest.c
+++ b/reactos/base/applications/dxdiag/d3dtest.c
@@ -8,6 +8,8 @@
 
 #include "precomp.h"
 
+#include <stdio.h>
+
 #define WIDTH   800
 #define HEIGHT  600
 
diff --git a/reactos/base/applications/dxdiag/display.c b/reactos/base/applications/dxdiag/display.c
index 8c1bcecc85e..66b00a5f785 100644
--- a/reactos/base/applications/dxdiag/display.c
+++ b/reactos/base/applications/dxdiag/display.c
@@ -8,6 +8,7 @@
  */
 
 #include "precomp.h"
+
 #include <d3d9.h>
 
 BOOL
diff --git a/reactos/base/applications/dxdiag/input.c b/reactos/base/applications/dxdiag/input.c
index 03d238a57ce..ecb5259b44e 100644
--- a/reactos/base/applications/dxdiag/input.c
+++ b/reactos/base/applications/dxdiag/input.c
@@ -8,6 +8,7 @@
  */
 
 #include "precomp.h"
+
 #include <dinput.h>
 
 typedef struct
diff --git a/reactos/base/applications/dxdiag/network.c b/reactos/base/applications/dxdiag/network.c
index 3a4b7c666f2..63a937681f5 100644
--- a/reactos/base/applications/dxdiag/network.c
+++ b/reactos/base/applications/dxdiag/network.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <winver.h>
+
 typedef struct
 {
     WCHAR Guid[40];
diff --git a/reactos/base/applications/dxdiag/precomp.h b/reactos/base/applications/dxdiag/precomp.h
index 21dfb3cf554..7c63f424218 100644
--- a/reactos/base/applications/dxdiag/precomp.h
+++ b/reactos/base/applications/dxdiag/precomp.h
@@ -5,7 +5,7 @@
 #define DIRECTSOUND_VERSION 0x0800
 #define D3D_OVERLOADS
 
-#include <stdio.h>
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
@@ -14,17 +14,13 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <winsvc.h>
 #include <wingdi.h>
 #include <winnls.h>
-#include <winver.h>
 #include <winuser.h>
-#include <mmsystem.h>
 #include <setupapi.h>
 #include <ddraw.h>
 #include <initguid.h>
 #include <devguid.h>
-#include <mmreg.h>
 
 #include "resource.h"
 
@@ -73,4 +69,5 @@ BOOL GetCatFileFromDriverPath(LPWSTR szFileName, LPWSTR szCatFileName);
 BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size);
 VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId);
 VOID EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData);
-#endif
+
+#endif /* PRECOMP_H__ */
diff --git a/reactos/base/applications/dxdiag/sound.c b/reactos/base/applications/dxdiag/sound.c
index b7ffeb63fe6..827bd6022b7 100644
--- a/reactos/base/applications/dxdiag/sound.c
+++ b/reactos/base/applications/dxdiag/sound.c
@@ -8,6 +8,9 @@
  */
 
 #include "precomp.h"
+
+#include <mmsystem.h>
+#include <mmreg.h>
 #include <dsound.h>
 
 #if 0