[akhaldi] 61530: [SOL] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

Author: akhaldi
Date: Sat Jan  4 14:25:09 2014
New Revision: 61530

URL: http://svn.reactos.org/svn/reactos?rev=61530&view=rev
Log:
[SOL]
* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

Modified:
    trunk/reactos/base/applications/games/solitaire/solcreate.cpp
    trunk/reactos/base/applications/games/solitaire/solgame.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.cpp
    trunk/reactos/base/applications/games/solitaire/solitaire.h

Modified: trunk/reactos/base/applications/games/solitaire/solcreate.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol...
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solcreate.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solcreate.cpp	[iso-8859-1] Sat Jan  4 14:25:09 2014
@@ -1,4 +1,3 @@
-
 #include "solitaire.h"

CardRegion *pDeck;

Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol...
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp	[iso-8859-1] Sat Jan  4 14:25:09 2014
@@ -1,4 +1,3 @@
-
 #include "solitaire.h"

#if 1

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol...
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp	[iso-8859-1] Sat Jan  4 14:25:09 2014
@@ -1,5 +1,10 @@
-
 #include "solitaire.h"
+
+#include <winreg.h>
+#include <commctrl.h>
+#include <tchar.h>
+
+#include "resource.h"

TCHAR szHelpPath[MAX_PATH];

Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol...
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.h	[iso-8859-1] Sat Jan  4 14:25:09 2014
@@ -1,14 +1,4 @@
-#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[];
@@ -49,7 +39,6 @@
 extern CardRegion *pSuitStack[];
 extern CardRegion *pRowStack[];

-
 bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards);
 bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj,  CardStack &dragcards);