4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/readelf/header.c b/plugins/readelf/header.c
index a83f690..33cf107 100644
--- a/plugins/readelf/header.c
+++ b/plugins/readelf/header.c
@@ -24,7 +24,7 @@
 #include "header.h"
 
 
-#include <common/cpp.h>
+#include <format/elf/elf.h>
 #include <plugins/fmtp/parser.h>
 
 
diff --git a/plugins/readelf/header.h b/plugins/readelf/header.h
index 060a363..acfe396 100644
--- a/plugins/readelf/header.h
+++ b/plugins/readelf/header.h
@@ -25,8 +25,8 @@
 #define _PLUGINS_READELF_HEADER_H
 
 
+#include <format/format.h>
 #include <format/preload.h>
-#include <format/elf/elf.h>
 
 
 
diff --git a/plugins/readelf/reader.c b/plugins/readelf/reader.c
index 47b33a0..6f81b3f 100644
--- a/plugins/readelf/reader.c
+++ b/plugins/readelf/reader.c
@@ -24,6 +24,7 @@
 #include "reader.h"
 
 
+#include <format/elf/elf.h>
 #include <plugins/plugin-def.h>
 
 
@@ -62,7 +63,7 @@ G_MODULE_EXPORT bool preload_binary_format(const GPluginModule *plugin, PluginAc
     if (!G_IS_ELF_FORMAT(format))
     {
         result = true;
-        goto hbf_exit;
+        goto pbf_exit;
     }
 
     elf_fmt = G_ELF_FORMAT(format);
@@ -75,7 +76,7 @@ G_MODULE_EXPORT bool preload_binary_format(const GPluginModule *plugin, PluginAc
 
     show_elf_section_string_table(elf_fmt, info, status);
 
- hbf_exit:
+ pbf_exit:
 
     return result;
 
diff --git a/plugins/readelf/reader.h b/plugins/readelf/reader.h
index 8dfdeb8..3837de2 100644
--- a/plugins/readelf/reader.h
+++ b/plugins/readelf/reader.h
@@ -25,7 +25,6 @@
 #define _PLUGINS_READELF_READER_H
 
 
-#include <format/elf/elf.h>
 #include <plugins/plugin.h>
 #include <plugins/plugin-int.h>