Simplify includes

17 files changed, 9 insertions, 38 deletions

diff --git a/include/elfhandle.h b/include/elfhandle.h
index c15dd50..b1a92ea 100644
--- a/include/elfhandle.h
+++ b/include/elfhandle.h
@@ -1,7 +1,7 @@
 #ifndef __ELFHANDLE_H__
 #define __ELFHANDLE_H__
 
-#include <libelf/libelf.h>
+#include <libelf.h>
 
 typedef struct {
   int fd;
diff --git a/include/libelfu/elfops.h b/include/libelfu/elfops.h
index cf40090..73c7aec 100644
--- a/include/libelfu/elfops.h
+++ b/include/libelfu/elfops.h
@@ -1,8 +1,8 @@
 #ifndef __LIBELFU_ELFOPS_H_
 #define __LIBELFU_ELFOPS_H_
 
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
+#include <libelf.h>
+#include <gelf.h>
 
 #include <libelfu/types.h>
 
diff --git a/include/libelfu/generic.h b/include/libelfu/generic.h
index c8a9c79..73c6b0e 100644
--- a/include/libelfu/generic.h
+++ b/include/libelfu/generic.h
@@ -1,7 +1,7 @@
 #ifndef __LIBELFU_GENERIC_H__
 #define __LIBELFU_GENERIC_H__
 
-#include <libelf/gelf.h>
+#include <gelf.h>
 
 
 #define ROUNDUP(x, align) ((x) + ((align) - ((x) % (align))) % (align))
diff --git a/include/libelfu/modelops.h b/include/libelfu/modelops.h
index c1d30e3..b56f133 100644
--- a/include/libelfu/modelops.h
+++ b/include/libelfu/modelops.h
@@ -2,7 +2,7 @@
 #define __LIBELFU_MODELOPS_H__
 
 #include <elf.h>
-#include <libelf/gelf.h>
+#include <gelf.h>
 
 #include <libelfu/types.h>
 
diff --git a/include/libelfu/types.h b/include/libelfu/types.h
index a06d470..177bbaf 100644
--- a/include/libelfu/types.h
+++ b/include/libelfu/types.h
@@ -4,7 +4,7 @@
 #include <sys/queue.h>
 
 #include <elf.h>
-#include <libelf/gelf.h>
+#include <gelf.h>
 
 
 typedef struct ElfuScn {
diff --git a/include/printing.h b/include/printing.h
index eb2074f..bda2fc1 100644
--- a/include/printing.h
+++ b/include/printing.h
@@ -1,7 +1,7 @@
 #ifndef __PRINTING_H__
 #define __PRINTING_H__
 
-#include <libelf/libelf.h>
+#include <libelf.h>
 
 
 void printHeader(Elf *e);
diff --git a/src/elfhandle.c b/src/elfhandle.c
index 47f9820..c90bff2 100644
--- a/src/elfhandle.c
+++ b/src/elfhandle.c
@@ -5,8 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-
-#include <libelf/libelf.h>
+#include <libelf.h>
 
 #include "elfhandle.h"
 
diff --git a/src/elfops/check.c b/src/elfops/check.c
index be8704b..2c7f040 100644
--- a/src/elfops/check.c
+++ b/src/elfops/check.c
@@ -1,7 +1,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 int elfu_eCheck(Elf *e)
diff --git a/src/elfops/phdr-fixup-selfref.c b/src/elfops/phdr-fixup-selfref.c
index 0182844..c961ceb 100644
--- a/src/elfops/phdr-fixup-selfref.c
+++ b/src/elfops/phdr-fixup-selfref.c
@@ -1,7 +1,4 @@
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
-#include <libelfu/debug.h>
+#include <libelfu/libelfu.h>
 
 
 void elfu_ePhdrFixupSelfRef(Elf *e)
diff --git a/src/elfops/section-by-name.c b/src/elfops/section-by-name.c
index 38a9dd1..8bb93a3 100644
--- a/src/elfops/section-by-name.c
+++ b/src/elfops/section-by-name.c
@@ -1,8 +1,4 @@
 #include <string.h>
-
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/elfops/section-in-segment.c b/src/elfops/section-in-segment.c
index 76a997d..7e6206b 100644
--- a/src/elfops/section-in-segment.c
+++ b/src/elfops/section-in-segment.c
@@ -1,8 +1,4 @@
 #include <stdlib.h>
-
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/elfops/section-name.c b/src/elfops/section-name.c
index 9cd44f7..4832db9 100644
--- a/src/elfops/section-name.c
+++ b/src/elfops/section-name.c
@@ -1,8 +1,4 @@
 #include <stdlib.h>
-
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/main.c b/src/main.c
index a179fcd..5aec1a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,10 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <getopt.h>
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
-
 #include <libelfu/libelfu.h>
 
 #include "elfhandle.h"
diff --git a/src/model/fromFile.c b/src/model/fromFile.c
index 7b8bfd3..11a7fb5 100644
--- a/src/model/fromFile.c
+++ b/src/model/fromFile.c
@@ -2,8 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/model/reladd.c b/src/model/reladd.c
index 632c7c3..665f20a 100644
--- a/src/model/reladd.c
+++ b/src/model/reladd.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/model/section.c b/src/model/section.c
index d7ddc19..4b8b230 100644
--- a/src/model/section.c
+++ b/src/model/section.c
@@ -1,7 +1,5 @@
 #include <assert.h>
 #include <stdlib.h>
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>
 
 
diff --git a/src/model/toFile.c b/src/model/toFile.c
index 9410f13..eaf6ce5 100644
--- a/src/model/toFile.c
+++ b/src/model/toFile.c
@@ -1,6 +1,4 @@
 #include <stdlib.h>
-#include <libelf/libelf.h>
-#include <libelf/gelf.h>
 #include <libelfu/libelfu.h>