3 files changed, 7 insertions, 9 deletions
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 2fe0f01daf..b746c863d1 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libgen.h>
-#include "elf.h"
 #include "common.h"
 #include "cbfs.h"
 
@@ -137,12 +136,6 @@ uint32_t string_to_arch(const char *arch_string)
 	return ret;
 }
 
-int iself(unsigned char *input)
-{
-	Elf32_Ehdr *ehdr = (Elf32_Ehdr *) input;
-	return !memcmp(ehdr->e_ident, ELFMAG, 4);
-}
-
 static struct filetypes_t {
 	uint32_t type;
 	const char *name;
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 60ffb51816..3cb94b6f9c 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -109,8 +109,6 @@ uint32_t string_to_arch(const char *arch_string);
 
 #define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
 
-int iself(unsigned char *input);
-
 typedef void (*comp_func_ptr) (char *, int, char *, int *);
 typedef enum { CBFS_COMPRESS_NONE = 0, CBFS_COMPRESS_LZMA = 1 } comp_algo;
 
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 78c864fa52..f987747753 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -121,6 +121,13 @@
  * in the buffer struct.
  */
 
+
+static int iself(const void *input)
+{
+	const Elf32_Ehdr *ehdr = input;
+	return !memcmp(ehdr->e_ident, ELFMAG, 4);
+}
+
 /* Get the ident array, so we can figure out
  * endian-ness, word size, and in future other useful
  * parameters