From 0d688600303180bc06368de5ce0b1bd63c4603b5 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Thu, 25 Dec 2014 15:53:17 -0500
Subject: ich9deblob: clean up includes in the .c files

---
(limited to 'resources')

diff --git a/resources/utilities/ich9deblob/common/descriptor_gbe.c b/resources/utilities/ich9deblob/common/descriptor_gbe.c
index 8aba9db..fcb80d0 100644
--- a/resources/utilities/ich9deblob/common/descriptor_gbe.c
+++ b/resources/utilities/ich9deblob/common/descriptor_gbe.c
@@ -21,8 +21,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-#include <stdio.h>
-#include <string.h>
 #include "descriptor_gbe.h"
 
 /* 
diff --git a/resources/utilities/ich9deblob/common/x86compatibility.c b/resources/utilities/ich9deblob/common/x86compatibility.c
index 46c60a7..505a37d 100644
--- a/resources/utilities/ich9deblob/common/x86compatibility.c
+++ b/resources/utilities/ich9deblob/common/x86compatibility.c
@@ -20,9 +20,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include <stdio.h>
-#include <string.h>
+
 #include "x86compatibility.h"
 
 /*
diff --git a/resources/utilities/ich9deblob/common/x86compatibility.h b/resources/utilities/ich9deblob/common/x86compatibility.h
index 05f77f8..d9d5bdb 100644
--- a/resources/utilities/ich9deblob/common/x86compatibility.h
+++ b/resources/utilities/ich9deblob/common/x86compatibility.h
@@ -24,6 +24,9 @@
 #ifndef X86COMPATIBILITY_H
 #define X86COMPATIBILITY_H
 
+#include <stdio.h>
+#include <string.h>
+
 #include "../descriptor/descriptor.h" /* structs describing what's in the descriptor region */
 #include "../gbe/gbe.h"               /* structs describing what's in the gbe region */
 
diff --git a/resources/utilities/ich9deblob/descriptor/descriptor.c b/resources/utilities/ich9deblob/descriptor/descriptor.c
index 256c60a..aa3d84e 100644
--- a/resources/utilities/ich9deblob/descriptor/descriptor.c
+++ b/resources/utilities/ich9deblob/descriptor/descriptor.c
@@ -23,9 +23,6 @@
  * Provide descriptor related functions.
  */
 
-#include <stdio.h>
-#include <string.h>
-
 /* structs describing the data in descriptor region */
 #include "descriptor.h"
 
diff --git a/resources/utilities/ich9deblob/descriptor/descriptor.h b/resources/utilities/ich9deblob/descriptor/descriptor.h
index 3841fdc..863b894 100644
--- a/resources/utilities/ich9deblob/descriptor/descriptor.h
+++ b/resources/utilities/ich9deblob/descriptor/descriptor.h
@@ -31,6 +31,9 @@
 #ifndef DESCRIPTORSTRUCT_H
 #define DESCRIPTORSTRUCT_H
 
+#include <stdio.h>
+#include <string.h>
+
 /* size of the descriptor in bytes */
 #define DESCRIPTORREGIONSIZE 0x1000
 
diff --git a/resources/utilities/ich9deblob/gbe/gbe.c b/resources/utilities/ich9deblob/gbe/gbe.c
index 7611c8d..9eee828 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.c
+++ b/resources/utilities/ich9deblob/gbe/gbe.c
@@ -23,9 +23,6 @@
  * Provide gbe related functions.
  */
 
-#include <stdio.h>
-#include <string.h>
-
 /* structs describing the data from gbe region */
 #include "gbe.h"
 
diff --git a/resources/utilities/ich9deblob/gbe/gbe.h b/resources/utilities/ich9deblob/gbe/gbe.h
index 27ad4d7..bfcc002 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.h
+++ b/resources/utilities/ich9deblob/gbe/gbe.h
@@ -33,6 +33,9 @@
 #ifndef GBESTRUCT_H
 #define GBESTRUCT_H
 
+#include <stdio.h>
+#include <string.h>
+
 /* Size of the full gbe region in bytes */
 #define GBEREGIONSIZE_8K 0x2000
 /*
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index 5c607d8..c8b74c4 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -46,10 +46,11 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "common/descriptor_gbe.h"   /* common descriptor/gbe functions used by ich9deblob */
+#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
 #include "descriptor/descriptor.h"   /* structs describing what's in the descriptor region */
 #include "gbe/gbe.h"                 /* structs describing what's in the gbe region */
-#include "common/x86compatibility.h" /* system/compiler compatibility checks. This code is not portable. */
 
 int main(int argc, char *argv[])
 {
--
cgit v0.9.1