[CABINET]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61744

reactos/dll/win32/cabinet/cabinet.h

@@ -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);

reactos/dll/win32/cabinet/fci.c

@@ -33,6 +33,7 @@ There is still some work to be done:
 #include "cabinet.h"
 
 #include <assert.h>
+#include <fci.h>
 
 #ifdef HAVE_ZLIB
 # include <zlib.h>

reactos/dll/win32/cabinet/fdi.c

@@ -59,6 +59,7 @@
  */
 
 #include "cabinet.h"
+
 #include <stdio.h>
 
 THOSE_ZIP_CONSTS;