diff --git a/include/i686/config.h b/include/i686/config.h
index 2201420794ebea787a5ee6bf490f5888fcbe0e12..8f59038df91c3b9e131e75b7a2c62e2c0b1c86e7 100644
--- a/include/i686/config.h
+++ b/include/i686/config.h
@@ -58,17 +58,17 @@ typedef s_uint64_t 	   counter_t;
 #define NULL 0
 #endif
 
-#include <elf.h>
-
-typedef Elf32_Ehdr  IRDB_Elf_Ehdr;
-typedef Elf32_Shdr  IRDB_Elf_Shdr;
-typedef Elf32_Off   IRDB_Elf_Off;
-typedef Elf32_Half  IRDB_Elf_Half;
-typedef Elf32_Word  IRDB_Elf_Word;
-typedef Elf32_Addr  IRDB_Elf_Addr;
-typedef Elf32_Sym  IRDB_Elf_Sym;
-typedef Elf32_Rel  IRDB_Elf_Rel;
-typedef Elf32_Rela  IRDB_Elf_Rela;
+#include <elfio/elfio.hpp>
+
+typedef ELFIO::Elf32_Ehdr  IRDB_Elf_Ehdr;
+typedef ELFIO::Elf32_Shdr  IRDB_Elf_Shdr;
+typedef ELFIO::Elf32_Off   IRDB_Elf_Off;
+typedef ELFIO::Elf32_Half  IRDB_Elf_Half;
+typedef ELFIO::Elf32_Word  IRDB_Elf_Word;
+typedef ELFIO::Elf32_Addr  IRDB_Elf_Addr;
+typedef ELFIO::Elf32_Sym  IRDB_Elf_Sym;
+typedef ELFIO::Elf32_Rel  IRDB_Elf_Rel;
+typedef ELFIO::Elf32_Rela  IRDB_Elf_Rela;
 #define IRDB_ELF_ST_TYPE ELF32_ST_TYPE
 
 
diff --git a/include/i86pc/config.h b/include/i86pc/config.h
index 2201420794ebea787a5ee6bf490f5888fcbe0e12..8f59038df91c3b9e131e75b7a2c62e2c0b1c86e7 100644
--- a/include/i86pc/config.h
+++ b/include/i86pc/config.h
@@ -58,17 +58,17 @@ typedef s_uint64_t 	   counter_t;
 #define NULL 0
 #endif
 
-#include <elf.h>
-
-typedef Elf32_Ehdr  IRDB_Elf_Ehdr;
-typedef Elf32_Shdr  IRDB_Elf_Shdr;
-typedef Elf32_Off   IRDB_Elf_Off;
-typedef Elf32_Half  IRDB_Elf_Half;
-typedef Elf32_Word  IRDB_Elf_Word;
-typedef Elf32_Addr  IRDB_Elf_Addr;
-typedef Elf32_Sym  IRDB_Elf_Sym;
-typedef Elf32_Rel  IRDB_Elf_Rel;
-typedef Elf32_Rela  IRDB_Elf_Rela;
+#include <elfio/elfio.hpp>
+
+typedef ELFIO::Elf32_Ehdr  IRDB_Elf_Ehdr;
+typedef ELFIO::Elf32_Shdr  IRDB_Elf_Shdr;
+typedef ELFIO::Elf32_Off   IRDB_Elf_Off;
+typedef ELFIO::Elf32_Half  IRDB_Elf_Half;
+typedef ELFIO::Elf32_Word  IRDB_Elf_Word;
+typedef ELFIO::Elf32_Addr  IRDB_Elf_Addr;
+typedef ELFIO::Elf32_Sym  IRDB_Elf_Sym;
+typedef ELFIO::Elf32_Rel  IRDB_Elf_Rel;
+typedef ELFIO::Elf32_Rela  IRDB_Elf_Rela;
 #define IRDB_ELF_ST_TYPE ELF32_ST_TYPE