[SOL]

* 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=61530

diff --git a/reactos/base/applications/games/solitaire/solcreate.cpp b/reactos/base/applications/games/solitaire/solcreate.cpp
index 7166ef7..6f0f351 100644 (file)
--- a/reactos/base/applications/games/solitaire/solcreate.cpp
+++ b/reactos/base/applications/games/solitaire/solcreate.cpp
@@ -1,4 +1,3 @@
-
 #include "solitaire.h"
 
 CardRegion *pDeck;

diff --git a/reactos/base/applications/games/solitaire/solgame.cpp b/reactos/base/applications/games/solitaire/solgame.cpp
index f809071..b34dcc8 100644 (file)
--- a/reactos/base/applications/games/solitaire/solgame.cpp
+++ b/reactos/base/applications/games/solitaire/solgame.cpp
@@ -1,4 +1,3 @@
-
 #include "solitaire.h"
 
 #if 1

diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp
index 619db40..38087d9 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.cpp
+++ b/reactos/base/applications/games/solitaire/solitaire.cpp
@@ -1,6 +1,11 @@
-
 #include "solitaire.h"
 
+#include <winreg.h>
+#include <commctrl.h>
+#include <tchar.h>
+
+#include "resource.h"
+
 TCHAR szHelpPath[MAX_PATH];
 
 DWORD        dwAppStartTime;

diff --git a/reactos/base/applications/games/solitaire/solitaire.h b/reactos/base/applications/games/solitaire/solitaire.h
index afb4481..f2b6073 100644 (file)
--- a/reactos/base/applications/games/solitaire/solitaire.h
+++ b/reactos/base/applications/games/solitaire/solitaire.h
@@ -1,15 +1,5 @@
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <tchar.h>
 #include <cardlib.h>
 
-#include "resource.h"
-
 extern CardWindow SolWnd;
 extern TCHAR szAppName[];
 extern bool fGameStarted;
@@ -49,7 +39,6 @@ extern CardRegion *pPile;
 extern CardRegion *pSuitStack[];
 extern CardRegion *pRowStack[];
 
-
 bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards);
 bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj,  CardStack &dragcards);