diff --git a/src/formats/file_signature.h b/src/formats/file_signature.h
index 60b3d6f..d9fc4f5 100644
--- a/src/formats/file_signature.h
+++ b/src/formats/file_signature.h
@@ -33,14 +33,14 @@ struct SignToMac {
     // Maching type: extension or file command.
     enum Type { Extension, FileCmd } type;
 
-    // Help strings (and count)
-    int help_len;
-    const char **helps;
-
     // MAC creator and type.
     const char *creator;
     const char *mac;
 
+    // Help strings (and count)
+    int help_len;
+    const char **helps;
+
     constexpr SignToMac(Type t, const char *c, const char *m, const char **hs, int hl)
         : type{t}, creator{c}, mac{m}, help_len{hl}, helps{hs} {}
 };
diff --git a/src/fs/file_reader.h b/src/fs/file_reader.h
index c469509..df3c7bb 100644
--- a/src/fs/file_reader.h
+++ b/src/fs/file_reader.h
@@ -71,10 +71,10 @@ struct FileReader {
 
     uint8_t *data; // Input data.
     uint32_t file_size; // Total size of the file.
+    std::string filename; // Name of the file to read.
 
     utils::RawDataStreamBuf stream_buf; // Stream buffer from raw data buffer.
     std::istream stream; // Stream for reading data.
-    std::string filename; // Name of the file to read.
 };