From 4f4873398207e654cd3926ff2cbaefd5421dc3a3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 4 Jan 2014 10:21:16 +0000
Subject: [PATCH] [EXT2LIB] * 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=61515
---
 reactos/lib/fslib/ext2lib/Disk.c   | 7 +++----
 reactos/lib/fslib/ext2lib/Mke2fs.c | 2 ++
 reactos/lib/fslib/ext2lib/Mke2fs.h | 9 ---------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/reactos/lib/fslib/ext2lib/Disk.c b/reactos/lib/fslib/ext2lib/Disk.c
index ea8e6f1c544..e6854f1745c 100644
--- a/reactos/lib/fslib/ext2lib/Disk.c
+++ b/reactos/lib/fslib/ext2lib/Disk.c
@@ -8,11 +8,10 @@
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"
-#include <debug.h>
-
-/* DEFINITIONS ***********************************************************/
-
 
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <debug.h>
 
 /* FUNCTIONS *************************************************************/
 
diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.c b/reactos/lib/fslib/ext2lib/Mke2fs.c
index ed761552632..647740889be 100644
--- a/reactos/lib/fslib/ext2lib/Mke2fs.c
+++ b/reactos/lib/fslib/ext2lib/Mke2fs.c
@@ -8,6 +8,8 @@
 /* INCLUDES **************************************************************/
 
 #include "Mke2fs.h"
+
+#include <fmifs/fmifs.h>
 #include <debug.h>
 
 /* GLOBALS ***************************************************************/
diff --git a/reactos/lib/fslib/ext2lib/Mke2fs.h b/reactos/lib/fslib/ext2lib/Mke2fs.h
index 71dccefdaec..be1946869c2 100644
--- a/reactos/lib/fslib/ext2lib/Mke2fs.h
+++ b/reactos/lib/fslib/ext2lib/Mke2fs.h
@@ -8,20 +8,11 @@
 /* INCLUDES **************************************************************/
 
 #define NTOS_MODE_USER
-#include <ndk/iofuncs.h>
 #include <ndk/kefuncs.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <fmifs/fmifs.h>
 
-#include "string.h"
-#include "ctype.h"
-
-#include "types.h"
 #include "ext2_fs.h"
 
-#include "getopt.h"
-
 /* DEFINITIONS ***********************************************************/
 
 #define SECTOR_SIZE (Ext2Sys->DiskGeometry.BytesPerSector)
-- 
2.17.1