diff --git a/lib/libhac-hb/include/nn/hac/AssetHeader.h b/lib/libhac-hb/include/nn/hac/AssetHeader.h
index 7cf8254..67e8ca1 100644
--- a/lib/libhac-hb/include/nn/hac/AssetHeader.h
+++ b/lib/libhac-hb/include/nn/hac/AssetHeader.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <nn/hac/aset.h>
+#include <nn/hac/define/aset.h>
 #include <fnd/List.h>
 #include <fnd/IByteModel.h>
 
diff --git a/lib/libhac-hb/include/nn/hac/aset.h b/lib/libhac-hb/include/nn/hac/define/aset.h
similarity index 100%
rename from lib/libhac-hb/include/nn/hac/aset.h
rename to lib/libhac-hb/include/nn/hac/define/aset.h
diff --git a/lib/libhac-hb/include/nn/hac/nro-hb.h b/lib/libhac-hb/include/nn/hac/define/nro-hb.h
similarity index 100%
rename from lib/libhac-hb/include/nn/hac/nro-hb.h
rename to lib/libhac-hb/include/nn/hac/define/nro-hb.h
diff --git a/programs/nstool/source/NroProcess.cpp b/programs/nstool/source/NroProcess.cpp
index 20951c4..f1da20d 100644
--- a/programs/nstool/source/NroProcess.cpp
+++ b/programs/nstool/source/NroProcess.cpp
@@ -4,7 +4,7 @@
 #include <fnd/OffsetAdjustedIFile.h>
 #include <fnd/Vec.h>
 #include <fnd/lz4.h>
-#include <nn/hac/nro-hb.h>
+#include <nn/hac/define/nro-hb.h>
 #include "NroProcess.h"
 
 NroProcess::NroProcess():
diff --git a/programs/nstool/source/UserSettings.cpp b/programs/nstool/source/UserSettings.cpp
index 5149a85..8e7ae78 100644
--- a/programs/nstool/source/UserSettings.cpp
+++ b/programs/nstool/source/UserSettings.cpp
@@ -24,7 +24,7 @@
 #include <nn/hac/define/nacp.h>
 #include <nn/hac/define/nso.h>
 #include <nn/hac/define/nro.h>
-#include <nn/hac/aset.h>
+#include <nn/hac/define/aset.h>
 #include <nn/pki/SignedData.h>
 #include <nn/pki/CertificateBody.h>
 #include <nn/pki/SignUtils.h>