From bca9468beaf6be1b9d216c8039f61ea620cc7ff1 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 21 Jan 2014 17:56:16 +0000
Subject: [PATCH] [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 | 5 ++---
 reactos/dll/win32/cabinet/fci.c     | 1 +
 reactos/dll/win32/cabinet/fdi.c     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/reactos/dll/win32/cabinet/cabinet.h b/reactos/dll/win32/cabinet/cabinet.h
index bcc484c323e..4bc4be73446 100644
--- a/reactos/dll/win32/cabinet/cabinet.h
+++ b/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);
diff --git a/reactos/dll/win32/cabinet/fci.c b/reactos/dll/win32/cabinet/fci.c
index 92ed8a6ead4..8139dcd807d 100644
--- a/reactos/dll/win32/cabinet/fci.c
+++ b/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>
diff --git a/reactos/dll/win32/cabinet/fdi.c b/reactos/dll/win32/cabinet/fdi.c
index 36b1b46184c..78e7cae5495 100644
--- a/reactos/dll/win32/cabinet/fdi.c
+++ b/reactos/dll/win32/cabinet/fdi.c
@@ -59,6 +59,7 @@
  */
 
 #include "cabinet.h"
+
 #include <stdio.h>
 
 THOSE_ZIP_CONSTS;