diff --git a/makerom/makerom.vcxproj b/makerom/makerom.vcxproj
index ecc931c..195b75f 100644
--- a/makerom/makerom.vcxproj
+++ b/makerom/makerom.vcxproj
@@ -104,7 +104,7 @@
     <ClInclude Include="desc\dev_sigdata.h" />
     <ClInclude Include="desc\presets.h" />
     <ClInclude Include="desc\prod_sigdata.h" />
-    <ClInclude Include="dir.h" />
+    <ClInclude Include="romfs_fs.h" />
     <ClInclude Include="elf.h" />
     <ClInclude Include="exefs.h" />
     <ClInclude Include="exefs_build.h" />
@@ -201,7 +201,7 @@
     <ClCompile Include="code.c" />
     <ClCompile Include="crypto.c" />
     <ClCompile Include="ctr_utils.c" />
-    <ClCompile Include="dir.c" />
+    <ClCompile Include="romfs_fs.c" />
     <ClCompile Include="elf.c" />
     <ClCompile Include="exefs.c" />
     <ClCompile Include="exheader.c" />
diff --git a/makerom/makerom.vcxproj.filters b/makerom/makerom.vcxproj.filters
index a4f1f21..b0c347c 100644
--- a/makerom/makerom.vcxproj.filters
+++ b/makerom/makerom.vcxproj.filters
@@ -336,7 +336,7 @@
     <ClInclude Include="code.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dir.h">
+    <ClInclude Include="romfs_fs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -470,7 +470,7 @@
     <ClCompile Include="code.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dir.c">
+    <ClCompile Include="romfs_fs.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/makerom/ncch.c b/makerom/ncch.c
index 384c9de..7182f53 100644
--- a/makerom/ncch.c
+++ b/makerom/ncch.c
@@ -1,5 +1,4 @@
 #include "lib.h"
-#include "dir.h"
 #include "ncch_build.h"
 #include "exheader_build.h"
 #include "exheader_read.h"
diff --git a/makerom/romfs.c b/makerom/romfs.c
index 205db6f..7ab6ba1 100644
--- a/makerom/romfs.c
+++ b/makerom/romfs.c
@@ -1,5 +1,4 @@
 #include "lib.h"
-#include "dir.h"
 #include "ncch_build.h"
 #include "romfs.h"
 #include "romfs_gen.h"
diff --git a/makerom/romfs.h b/makerom/romfs.h
index e170b18..eacac3a 100644
--- a/makerom/romfs.h
+++ b/makerom/romfs.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "romfs_fs.h"
 
 typedef enum
 {
diff --git a/makerom/dir.c b/makerom/romfs_fs.c
similarity index 99%
rename from makerom/dir.c
rename to makerom/romfs_fs.c
index 7cb724d..8c21e3a 100644
--- a/makerom/dir.c
+++ b/makerom/romfs_fs.c
@@ -1,5 +1,5 @@
 #include "lib.h"
-#include "dir.h"
+#include "romfs_fs.h"
 #include "utf.h"
 
 /* This is the FS interface for ROMFS generation */
diff --git a/makerom/dir.h b/makerom/romfs_fs.h
similarity index 100%
rename from makerom/dir.h
rename to makerom/romfs_fs.h
diff --git a/makerom/romfs_gen.c b/makerom/romfs_gen.c
index bfa1371..5bed220 100644
--- a/makerom/romfs_gen.c
+++ b/makerom/romfs_gen.c
@@ -1,5 +1,4 @@
 #include "lib.h"
-#include "dir.h"
 #include "ncch_build.h"
 #include "romfs.h"