diff --git a/allocator/Filelist.aq.mk b/allocator/Filelist.aq.mk
index ead60e1c..63698d77 100644
--- a/allocator/Filelist.aq.mk
+++ b/allocator/Filelist.aq.mk
@@ -9,11 +9,11 @@ me_alloc/merge_blocks                                                         \
 me_alloc/pages                                                                \
 me_alloc/realloc                                                              \
 vg/dummy_block                                                                \
-vg/dummy_mem_status                                                           \
 vg/dummy_mempool                                                              \
 vg/dummy_mempool_bis                                                          \
+vg/dummy_mem_status                                                           \
 vg/valgrind_block                                                             \
-vg/valgrind_mem_status                                                        \
 vg/valgrind_mempool                                                           \
 vg/valgrind_mempool_bis                                                       \
+vg/valgrind_mem_status                                                        \
 
diff --git a/line/Filelist.line.mk b/line/Filelist.line.mk
index 020b59ee..b1a79d04 100644
--- a/line/Filelist.line.mk
+++ b/line/Filelist.line.mk
@@ -2,9 +2,9 @@ SRC_FILES =                                                                   \
 line                                                                          \
 line_edit_actions                                                             \
 line_edit_actions2                                                            \
-line_edit_mode                                                                \
 line_editing                                                                  \
 line_editing2                                                                 \
+line_edit_mode                                                                \
 line_globals                                                                  \
 line_history                                                                  \
 line_internals                                                                \
diff --git a/parser/Filelist.gmr.mk b/parser/Filelist.gmr.mk
index 2b8b91b5..09b9dc53 100644
--- a/parser/Filelist.gmr.mk
+++ b/parser/Filelist.gmr.mk
@@ -114,6 +114,28 @@ primary_state_ids/primary_state_ids_18                                        \
 primary_state_ids/primary_state_ids_19                                        \
 primary_state_ids/primary_state_ids_20                                        \
 primary_state_ids/primary_state_ids_21                                        \
+small_parse_table_map/small_parse_table_map_0                                 \
+small_parse_table_map/small_parse_table_map_1                                 \
+small_parse_table_map/small_parse_table_map_2                                 \
+small_parse_table_map/small_parse_table_map_3                                 \
+small_parse_table_map/small_parse_table_map_4                                 \
+small_parse_table_map/small_parse_table_map_5                                 \
+small_parse_table_map/small_parse_table_map_6                                 \
+small_parse_table_map/small_parse_table_map_7                                 \
+small_parse_table_map/small_parse_table_map_8                                 \
+small_parse_table_map/small_parse_table_map_9                                 \
+small_parse_table_map/small_parse_table_map_10                                \
+small_parse_table_map/small_parse_table_map_11                                \
+small_parse_table_map/small_parse_table_map_12                                \
+small_parse_table_map/small_parse_table_map_13                                \
+small_parse_table_map/small_parse_table_map_14                                \
+small_parse_table_map/small_parse_table_map_15                                \
+small_parse_table_map/small_parse_table_map_16                                \
+small_parse_table_map/small_parse_table_map_17                                \
+small_parse_table_map/small_parse_table_map_18                                \
+small_parse_table_map/small_parse_table_map_19                                \
+small_parse_table_map/small_parse_table_map_20                                \
+small_parse_table_map/small_parse_table_map_21                                \
 small_parse_table/small_parse_table_0                                         \
 small_parse_table/small_parse_table_1                                         \
 small_parse_table/small_parse_table_2                                         \
@@ -946,28 +968,6 @@ small_parse_table/small_parse_table_828                                       \
 small_parse_table/small_parse_table_829                                       \
 small_parse_table/small_parse_table_830                                       \
 small_parse_table/small_parse_table_831                                       \
-small_parse_table_map/small_parse_table_map_0                                 \
-small_parse_table_map/small_parse_table_map_1                                 \
-small_parse_table_map/small_parse_table_map_2                                 \
-small_parse_table_map/small_parse_table_map_3                                 \
-small_parse_table_map/small_parse_table_map_4                                 \
-small_parse_table_map/small_parse_table_map_5                                 \
-small_parse_table_map/small_parse_table_map_6                                 \
-small_parse_table_map/small_parse_table_map_7                                 \
-small_parse_table_map/small_parse_table_map_8                                 \
-small_parse_table_map/small_parse_table_map_9                                 \
-small_parse_table_map/small_parse_table_map_10                                \
-small_parse_table_map/small_parse_table_map_11                                \
-small_parse_table_map/small_parse_table_map_12                                \
-small_parse_table_map/small_parse_table_map_13                                \
-small_parse_table_map/small_parse_table_map_14                                \
-small_parse_table_map/small_parse_table_map_15                                \
-small_parse_table_map/small_parse_table_map_16                                \
-small_parse_table_map/small_parse_table_map_17                                \
-small_parse_table_map/small_parse_table_map_18                                \
-small_parse_table_map/small_parse_table_map_19                                \
-small_parse_table_map/small_parse_table_map_20                                \
-small_parse_table_map/small_parse_table_map_21                                \
 symbols_metadata/symbols_metadata_0                                           \
 symbols_metadata/symbols_metadata_1                                           \
 symbols_names/symbols_names_0                                                 \
diff --git a/stdme/Filelist.me.mk b/stdme/Filelist.me.mk
index b56a029e..b286140d 100644
--- a/stdme/Filelist.me.mk
+++ b/stdme/Filelist.me.mk
@@ -34,10 +34,10 @@ fs/fs_internal                                                                \
 fs/getters                                                                    \
 fs/putfd                                                                      \
 gnl/get_next_line                                                             \
+hash/hasher                                                                   \
 hash/hash_signed                                                              \
 hash/hash_str                                                                 \
 hash/hash_unsigned                                                            \
-hash/hasher                                                                   \
 hash/sip/sip13                                                                \
 hash/sip/sip_utils                                                            \
 hash/sip/sip_utils2                                                           \
@@ -85,6 +85,10 @@ printf/printf                                                                 \
 printf/printf_fd                                                              \
 printf/printf_str                                                             \
 printf/vprintf                                                                \
+string/mod                                                                    \
+string/string_insert                                                          \
+string/string_remove                                                          \
+string/string_reserve                                                         \
 str/str_clone                                                                 \
 str/str_compare                                                               \
 str/str_find_chr                                                              \
@@ -101,10 +105,6 @@ str/str_n_find_str                                                            \
 str/str_split                                                                 \
 str/str_substring                                                             \
 str/str_trim                                                                  \
-string/mod                                                                    \
-string/string_insert                                                          \
-string/string_remove                                                          \
-string/string_reserve                                                         \
 
 GEN_FILES =                                                                   \
 convert/i16_to_str                                                            \