diff --git a/include/data/map_headers.h b/include/data/map_headers.h
index 436de3fceb..6610007825 100644
--- a/include/data/map_headers.h
+++ b/include/data/map_headers.h
@@ -6,8 +6,8 @@
 
 #include "map_header.h" // Only for Intellisense/LSPs
 
-#include "res/field/events/zone_event.naix"
-#include "res/field/scripts/scr_seq.naix"
+#include "res/field/events/zone_event.naix.h"
+#include "res/field/scripts/scr_seq.naix.h"
 #include "res/text/bank/location_names.h"
 
 static const MapHeader sMapHeaders[] = {
diff --git a/include/data/move_side_effect_subscripts.h b/include/data/move_side_effect_subscripts.h
index 8abe3a84df..8477d716f2 100644
--- a/include/data/move_side_effect_subscripts.h
+++ b/include/data/move_side_effect_subscripts.h
@@ -1,6 +1,6 @@
 #include "constants/battle.h"
 
-#include "battle/scripts/sub_seq.naix"
+#include "res/battle/scripts/sub_seq.naix.h"
 
 // clang-format off
 static const int sSideEffectSubscripts[] = {
diff --git a/res/battle/scripts/meson.build b/res/battle/scripts/meson.build
index 54e2a10862..f950a5eb58 100644
--- a/res/battle/scripts/meson.build
+++ b/res/battle/scripts/meson.build
@@ -9,7 +9,7 @@ waza_seq_target_name = 'waza_seq.narc'
 
 sub_seq_basename = 'sub_seq'
 sub_seq_narc_name = sub_seq_basename + '.narc'
-sub_seq_naix_name = sub_seq_basename + '.naix'
+sub_seq_naix_name = sub_seq_basename + '.naix.h'
 
 be_seq_private_dir = relative_build_dir / be_seq_target_name + '.p'
 sub_seq_private_dir = relative_build_dir / sub_seq_narc_name + '.p'
diff --git a/res/field/events/meson.build b/res/field/events/meson.build
index 069fbe607c..eab863cc0f 100644
--- a/res/field/events/meson.build
+++ b/res/field/events/meson.build
@@ -545,7 +545,7 @@ events_order = files('zone_event.order')
 events_narc = custom_target('zone_event.narc',
     output: [
         'zone_event.narc',
-        'zone_event.naix',
+        'zone_event.naix.h',
     ],
     input: event_bin_gen.process(events_files, env: json2bin_env),
     depends: [ py_consts_generators ],
diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build
index 8de2a17c45..c540a2cdcb 100644
--- a/res/field/scripts/meson.build
+++ b/res/field/scripts/meson.build
@@ -1136,7 +1136,7 @@ scr_seq_narc_order = files('scripts.order')
 scr_seq_narc = custom_target('scr_seq.narc',
     output: [
         'scr_seq.narc',
-        'scr_seq.naix',
+        'scr_seq.naix.h',
     ],
     input: script_bin_gen.process(
         scr_seq_files,
diff --git a/res/fonts/meson.build b/res/fonts/meson.build
index 70b2818a50..9f91f1b0ba 100644
--- a/res/fonts/meson.build
+++ b/res/fonts/meson.build
@@ -88,7 +88,7 @@ pl_font_ignore = files('pl_font.ignore')
 pl_font_narc = custom_target('pl_font.narc',
     output: [
         'pl_font.narc',
-        'pl_font.naix',
+        'pl_font.naix.h',
     ],
     input: [
         font_nfgrs,
diff --git a/res/graphics/options_menu/meson.build b/res/graphics/options_menu/meson.build
index 6332a81e9c..245abe1384 100644
--- a/res/graphics/options_menu/meson.build
+++ b/res/graphics/options_menu/meson.build
@@ -11,7 +11,7 @@ config_gra_order = files('config_gra.order')
 config_gra_narc = custom_target('config_gra.narc',
     output: [
         'config_gra.narc',
-        'config_gra.naix',
+        'config_gra.naix.h',
     ],
     input: [
         tiles_ncgr,
diff --git a/res/graphics/pokemon_summary_screen/meson.build b/res/graphics/pokemon_summary_screen/meson.build
index 9193f23044..4b1feab958 100644
--- a/res/graphics/pokemon_summary_screen/meson.build
+++ b/res/graphics/pokemon_summary_screen/meson.build
@@ -213,7 +213,7 @@ pokemon_summary_screen_order = files('pokemon_summary_screen.order')
 pokemon_summary_screen_narc = custom_target('pl_pst_gra.narc',
     output: [
         'pl_pst_gra.narc',
-        'pl_pst_gra.naix',
+        'pl_pst_gra.naix.h',
     ],
     input: [
         tiles_ncgr,
diff --git a/res/graphics/shop_menu/meson.build b/res/graphics/shop_menu/meson.build
index 2ab1f2bbb3..6292156f27 100644
--- a/res/graphics/shop_menu/meson.build
+++ b/res/graphics/shop_menu/meson.build
@@ -46,7 +46,7 @@ shop_gra_order = files('shop_gra.order')
 shop_gra_narc = custom_target('shop_gra.narc',
     output: [
         'shop_gra.narc',
-        'shop_gra.naix',
+        'shop_gra.naix.h',
     ],
     input: [
         tiles_ncgr,
diff --git a/res/graphics/signposts/meson.build b/res/graphics/signposts/meson.build
index ad415c347d..864f9a9fee 100644
--- a/res/graphics/signposts/meson.build
+++ b/res/graphics/signposts/meson.build
@@ -72,7 +72,7 @@ field_board_order = files('field_board.order')
 field_board_narc = custom_target('field_board.narc',
     output: [
         'field_board.narc',
-        'field_board.naix',
+        'field_board.naix.h',
     ],
     input: [
         field_board_ncgrs,
diff --git a/res/graphics/windows/meson.build b/res/graphics/windows/meson.build
index c02881f7bf..55b575f24f 100644
--- a/res/graphics/windows/meson.build
+++ b/res/graphics/windows/meson.build
@@ -67,7 +67,7 @@ pl_winframe_order = files('pl_winframe.order')
 pl_winframe_narc = custom_target('pl_winframe.narc',
     output: [
         'pl_winframe.narc',
-        'pl_winframe.naix',
+        'pl_winframe.naix.h',
     ],
     input: [
         pl_winframe_ncgrs_sopc_v101,
diff --git a/res/pokemon/meson.build b/res/pokemon/meson.build
index 6fd1cec3ad..a98cce9de6 100644
--- a/res/pokemon/meson.build
+++ b/res/pokemon/meson.build
@@ -238,7 +238,7 @@ pl_pokegra_narc = custom_target('pl_pokegra.narc',
 pl_otherpoke_narc = custom_target('pl_otherpoke.narc',
     output: [
         'pl_otherpoke.narc',
-        'pl_otherpoke.naix',
+        'pl_otherpoke.naix.h',
     ],
     input: [
         otherpoke_files,
@@ -330,7 +330,7 @@ pokedex_data_giratina_altered_narc = custom_target('zukan_data_gira.narc',
 pokefoot_narc = custom_target('pokefoot.narc',
     output: [
         'pokefoot.narc',
-        'pokefoot.naix',
+        'pokefoot.naix.h',
     ],
     input: pokefoot_files,
     command: [
diff --git a/res/prebuilt/data/meson.build b/res/prebuilt/data/meson.build
index f445a4a6d2..6f9aa4da29 100644
--- a/res/prebuilt/data/meson.build
+++ b/res/prebuilt/data/meson.build
@@ -145,4 +145,4 @@ prebuilt_files = [
 
 foreach f : prebuilt_files
     nitrofs_files += fs.copyfile(f)
-endforeach
\ No newline at end of file
+endforeach
diff --git a/src/applications/options_menu.c b/src/applications/options_menu.c
index ea8b33e32c..bb3fcf10cb 100644
--- a/src/applications/options_menu.c
+++ b/src/applications/options_menu.c
@@ -31,7 +31,7 @@
 #include "unk_020393C8.h"
 #include "vram_transfer.h"
 
-#include "res/graphics/options_menu/config_gra.naix"
+#include "res/graphics/options_menu/config_gra.naix.h"
 #include "res/text/bank/options_menu.h"
 
 #define MENU_TITLE_BASE_TILE      10
diff --git a/src/applications/pokedex/pokedex_footprint.c b/src/applications/pokedex/pokedex_footprint.c
index 5263873096..92f242fb82 100644
--- a/src/applications/pokedex/pokedex_footprint.c
+++ b/src/applications/pokedex/pokedex_footprint.c
@@ -1,6 +1,6 @@
 #include "applications/pokedex/pokedex_footprint.h"
 
-#include "res/pokemon/pokefoot.naix"
+#include "res/pokemon/pokefoot.naix.h"
 
 enum NarcID GetPokedexFootprintsNarcID(void)
 {
diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c
index 66dd80b1d3..3ed0560c9c 100644
--- a/src/applications/pokemon_summary_screen/main.c
+++ b/src/applications/pokemon_summary_screen/main.c
@@ -58,7 +58,7 @@
 #include "vram_transfer.h"
 
 #include "constdata/const_020F410C.h"
-#include "res/graphics/pokemon_summary_screen/pl_pst_gra.naix"
+#include "res/graphics/pokemon_summary_screen/pl_pst_gra.naix.h"
 #include "res/text/bank/pokemon_summary_screen.h"
 
 enum SummaryState {
diff --git a/src/applications/pokemon_summary_screen/sprites.c b/src/applications/pokemon_summary_screen/sprites.c
index 23a3d53270..315ec52db3 100644
--- a/src/applications/pokemon_summary_screen/sprites.c
+++ b/src/applications/pokemon_summary_screen/sprites.c
@@ -9,7 +9,6 @@
 
 #include "applications/pokemon_summary_screen/main.h"
 #include "applications/pokemon_summary_screen/subscreen.h"
-#include "graphics/pokemon_summary_screen/pl_pst_gra.naix"
 
 #include "bg_window.h"
 #include "gx_layers.h"
@@ -22,6 +21,8 @@
 #include "unk_0207C908.h"
 #include "vram_transfer.h"
 
+#include "res/graphics/pokemon_summary_screen/pl_pst_gra.naix.h"
+
 static void SetTypeIcon(PokemonSummaryScreen *summaryScreen, u8 spriteIndex, u8 param2, u8 type);
 static void SetMonAndTypeIcons(PokemonSummaryScreen *summaryScreen);
 static void DrawConditionFlash(Sprite *sprite, u32 statValue, u32 highestValue, const s16 *bounds);
diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c
index 86b8ff1d6b..855210b17a 100644
--- a/src/battle/battle_controller.c
+++ b/src/battle/battle_controller.c
@@ -28,7 +28,6 @@
 #include "battle/common.h"
 #include "battle/ov16_0223B140.h"
 #include "battle/ov16_0223DF00.h"
-#include "battle/scripts/sub_seq.naix"
 #include "battle/struct_ov16_0224DDA8.h"
 #include "battle/struct_ov16_0225BFFC_decl.h"
 
@@ -44,6 +43,8 @@
 #include "trainer_info.h"
 #include "unk_0200F174.h"
 
+#include "res/battle/scripts/sub_seq.naix.h"
+
 enum BattleControllerState {
     STATE_PROCESSING = 0,
     STATE_BREAK_OUT,
diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c
index 855ed5bc32..262f3438d0 100644
--- a/src/battle/battle_lib.c
+++ b/src/battle/battle_lib.c
@@ -27,7 +27,6 @@
 #include "battle/battle_mon.h"
 #include "battle/common.h"
 #include "battle/ov16_0223DF00.h"
-#include "battle/scripts/sub_seq.naix"
 #include "battle/struct_ov16_0225BFFC_decl.h"
 
 #include "charcode_util.h"
@@ -46,6 +45,8 @@
 #include "unk_020366A0.h"
 #include "unk_0208C098.h"
 
+#include "res/battle/scripts/sub_seq.naix.h"
+
 static BOOL BasicTypeMulApplies(BattleContext *battleCtx, int attacker, int defender, int chartEntry);
 static int MapSideEffectToSubscript(BattleContext *battleCtx, enum BattleSideEffectType type, u32 effect);
 static int ApplyTypeMultiplier(BattleContext *battleCtx, int attacker, int mul, int damage, BOOL update, u32 *moveStatus);
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index faa1d95fe0..aeddddbe8e 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -33,7 +33,6 @@
 #include "battle/ov16_0223B140.h"
 #include "battle/ov16_0223DF00.h"
 #include "battle/ov16_02268520.h"
-#include "battle/scripts/sub_seq.naix"
 #include "battle/struct_ov16_0225BFFC_decl.h"
 #include "battle/struct_ov16_0225BFFC_t.h"
 #include "overlay012/ov12_02235E94.h"
@@ -74,6 +73,7 @@
 #include "unk_0208C098.h"
 
 #include "constdata/const_020F2DAC.h"
+#include "res/battle/scripts/sub_seq.naix.h"
 
 typedef BOOL (*BtlCmd)(BattleSystem *, BattleContext *);
 
diff --git a/src/font.c b/src/font.c
index 4d3a2ffc62..82cf6c4888 100644
--- a/src/font.c
+++ b/src/font.c
@@ -5,8 +5,6 @@
 
 #include "constants/narc.h"
 
-#include "fonts/pl_font.naix"
-
 #include "charcode.h"
 #include "font_manager.h"
 #include "graphics.h"
@@ -16,6 +14,8 @@
 #include "strbuf.h"
 #include "text.h"
 
+#include "res/fonts/pl_font.naix.h"
+
 typedef struct {
     TextGlyph curGlyph;
     void *data[FONT_MAX];
diff --git a/src/overlay007/accessory_shop.c b/src/overlay007/accessory_shop.c
index a07a93452f..ebf975c271 100644
--- a/src/overlay007/accessory_shop.c
+++ b/src/overlay007/accessory_shop.c
@@ -26,7 +26,7 @@
 #include "text.h"
 #include "unk_020298BC.h"
 
-#include "res/graphics/shop_menu/shop_gra.naix"
+#include "res/graphics/shop_menu/shop_gra.naix.h"
 #include "res/text/bank/flower_shop.h"
 
 static const AccessoryShopItem sAccessoryShop_ItemLists[ACCESSORY_SHOP_ITEM_LIST_COUNT] = {
diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c
index 1efa0f881f..75150f5729 100644
--- a/src/overlay007/shop_menu.c
+++ b/src/overlay007/shop_menu.c
@@ -61,7 +61,7 @@
 #include "unk_02097B18.h"
 #include "vars_flags.h"
 
-#include "res/graphics/shop_menu/shop_gra.naix"
+#include "res/graphics/shop_menu/shop_gra.naix.h"
 #include "res/text/bank/location_names.h"
 #include "res/text/bank/underground_goods.h"
 #include "res/text/bank/unk_0543.h"
diff --git a/src/pokemon_sprite.c b/src/pokemon_sprite.c
index 9d6f75ec18..192fc0a245 100644
--- a/src/pokemon_sprite.c
+++ b/src/pokemon_sprite.c
@@ -14,7 +14,7 @@
 #include "palette.h"
 #include "pokemon_sprite.h"
 
-#include "res/pokemon/pl_otherpoke.naix"
+#include "res/pokemon/pl_otherpoke.naix.h"
 
 #define MAX_SPINDA_SPOTS       4
 #define SPINDA_SPOT_COORDS_END 0xFF
diff --git a/src/render_window.c b/src/render_window.c
index f76ae45904..675eeed42d 100644
--- a/src/render_window.c
+++ b/src/render_window.c
@@ -8,8 +8,6 @@
 
 #include "struct_defs/struct_02013610.h"
 
-#include "graphics/signposts/field_board.naix"
-#include "graphics/windows/pl_winframe.naix"
 #include "overlay005/ov5_021D2F14.h"
 #include "overlay005/struct_ov5_021D30A8.h"
 
@@ -31,6 +29,9 @@
 #include "unk_0200679C.h"
 #include "unk_020131EC.h"
 
+#include "res/graphics/signposts/field_board.naix.h"
+#include "res/graphics/windows/pl_winframe.naix.h"
+
 #define SIGNPOST_CONTENT_WIDTH_TILES  6
 #define SIGNPOST_CONTENT_HEIGHT_TILES 4
 #define SIGNPOST_BORDER_LEFT_SIZE     1
diff --git a/src/ribbon.c b/src/ribbon.c
index f0307dd140..8d6eea4c48 100644
--- a/src/ribbon.c
+++ b/src/ribbon.c
@@ -5,7 +5,7 @@
 
 #include "constants/pokemon.h"
 
-#include "res/graphics/pokemon_summary_screen/pl_pst_gra.naix"
+#include "res/graphics/pokemon_summary_screen/pl_pst_gra.naix.h"
 #include "res/text/bank/ribbon_names.h"
 
 typedef struct {
diff --git a/src/script_manager.c b/src/script_manager.c
index b9632a461f..cfa97be6ab 100644
--- a/src/script_manager.c
+++ b/src/script_manager.c
@@ -8,7 +8,6 @@
 
 #include "data/field/hidden_items.h"
 #include "field/field_system.h"
-#include "field/scripts/scr_seq.naix"
 
 #include "field_task.h"
 #include "heap.h"
@@ -26,6 +25,7 @@
 
 #include "constdata/const_020EAB80.h"
 #include "constdata/const_020EAC58.h"
+#include "res/field/scripts/scr_seq.naix.h"
 
 static BOOL FieldTask_RunScript(FieldTask *taskManager);
 static ScriptManager *ScriptManager_New();
diff --git a/src/text.c b/src/text.c
index 920e8feff0..c43fa68a2c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -6,8 +6,6 @@
 #include "constants/heap.h"
 #include "constants/narc.h"
 
-#include "fonts/pl_font.naix"
-
 #include "bg_window.h"
 #include "font.h"
 #include "graphics.h"
@@ -17,6 +15,8 @@
 #include "sys_task.h"
 #include "sys_task_manager.h"
 
+#include "res/fonts/pl_font.naix.h"
+
 static enum RenderResult TextPrinter_Render(TextPrinter *printer);
 static u8 Text_CreatePrinterTask(SysTaskFunc taskFunc, TextPrinter *printer, u32 priority);
 static void Text_DestroyPrinterTask(u8 printerID);
diff --git a/subprojects/narc.wrap b/subprojects/narc.wrap
index 16b2672646..de7648b5c9 100644
--- a/subprojects/narc.wrap
+++ b/subprojects/narc.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/lhearachel/narc.git
-revision = v0.2.0
+revision = v0.3.0
 depth = 1
 
 [provide]