Simplify includes

diff --git a/include/elfhandle.h b/include/elfhandle.h
index c15dd501ab528cd9c094f7e8186722dba061b95e..b1a92eac04115f2390bd864455b3407c739cab49 100644 (file)
--- 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 cf40090d7f2cfa0afc129cde71ca269d36ab94f6..73c7aeca5dc4f0f43accc7d0aad67484a8dc8159 100644 (file)
--- 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 c8a9c79df9d9bf2ae80ded9428772c61750599a9..73c6b0eb39ee8bcd03016314d03e38d931a1af45 100644 (file)
--- 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 c1d30e35767ef75a19b7aabdf53ac3e8cb346699..b56f13314cddd1b2d678ab6133a1fac3d9166593 100644 (file)
--- 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 a06d4706d0036c638807d6fe52eebbe3e3958521..177bbafbb4e58f1cd43b7527378d6dca6c9749a6 100644 (file)
--- 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 eb2074f0b2f887fc9cd294acca0a814357d3c905..bda2fc18833e62165b4e38b8b7f010458f9c2386 100644 (file)
--- 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 47f9820f5b081d7150947510f751e0df4020ed6c..c90bff2a9a3a7ec11c4b0a49946fd8c26b14c375 100644 (file)
--- 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 be8704bb45d5bd4d499d0eeeff50aa162639a4c6..2c7f040910dee5e28421e0a389867687ed867a86 100644 (file)
--- 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 0182844caca6b818234c51aa055774948332f8d7..c961ceb263fe50fb57dbb6d71bc7b4406e1899bf 100644 (file)
--- 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 38a9dd1a96f91b977dea04028e513ea4d00b584e..8bb93a39922052f4ee484a96b9956b886ffbe996 100644 (file)
--- 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 76a997dce12cdef8c7d7c5ea18a9484e8e801290..7e6206b812cda5b79cdf4d79d23d31852b523bcb 100644 (file)
--- 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 9cd44f70c9ac1615747c3aace5688619a48b16c9..4832db9a0d82d110e11fdbb68d9efc70eba30e04 100644 (file)
--- 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 a179fcd82a0097e57a0e960d31390d917757025f..5aec1a2bc2c5e50312dc32b5ddb8c932e7127534 100644 (file)
--- 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 7b8bfd31d756fc87a2e85cda36d1874d8f7abcec..11a7fb5c4646ae47262d4e0184cce93d9a05a2bb 100644 (file)
--- 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 632c7c368ecb9d605747fdfac86fbe62d88a76c9..665f20a97f3efcd2e21dc9af688cf3a5c14153e8 100644 (file)
--- 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 d7ddc19a1f5356b2114dd4a784c8b0786a3141c9..4b8b230baf2294b1d0a4ee76d413af8fb66c5c8f 100644 (file)
--- 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 9410f134c117ad1fa6b472c7564e93860848b2b4..eaf6ce50c5f649a6b557407270997c86b079c228 100644 (file)
--- 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>