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

Author: akhaldi
Date: Tue Jan 21 17:56:16 2014
New Revision: 61744

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

Modified:
    trunk/reactos/dll/win32/cabinet/cabinet.h
    trunk/reactos/dll/win32/cabinet/fci.c
    trunk/reactos/dll/win32/cabinet/fdi.c

Modified: trunk/reactos/dll/win32/cabinet/cabinet.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.h...
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.h	[iso-8859-1] Tue Jan 21 17:56:16 2014
@@ -18,10 +18,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 #ifndef __WINE_CABINET_H
 #define __WINE_CABINET_H

-#include <config.h>
+#include <wine/config.h>

#include <stdarg.h>

@@ -31,9 +32,7 @@

#include <windef.h>
 #include <winbase.h>
-#include <winnt.h>
 #include <fdi.h>
-#include <fci.h>

#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(cabinet);

Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c	[iso-8859-1] Tue Jan 21 17:56:16 2014
@@ -33,6 +33,7 @@
 #include "cabinet.h"

#include <assert.h>
+#include <fci.h>

#ifdef HAVE_ZLIB
 # include <zlib.h>

Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c	[iso-8859-1] Tue Jan 21 17:56:16 2014
@@ -59,6 +59,7 @@
  */

#include "cabinet.h"
+
 #include <stdio.h>

THOSE_ZIP_CONSTS;