diff --git a/include/nn/nfp/nfp.h b/include/nn/nfp/nfp.h
index ec04161..9e3e857 100644
--- a/include/nn/nfp/nfp.h
+++ b/include/nn/nfp/nfp.h
@@ -8,19 +8,16 @@ struct SystemEventType;
 
 namespace nn::nfp {
 
-struct DeviceHandle {
-    u64 m_Id;
-};
-
 enum State : u32;
 enum DeviceState : u32;
 enum ModelType : u32;
 enum MountTarget : u32;
 
-struct TagInfo;
 struct CommonInfo;
+struct DeviceHandle;
 struct ModelInfo;
 struct RegisterInfo;
+struct TagInfo;
 
 Result Initialize();
 Result Finalize();
diff --git a/include/nn/nfp/nfp_types.h b/include/nn/nfp/nfp_types.h
index a332002..0b9acdb 100644
--- a/include/nn/nfp/nfp_types.h
+++ b/include/nn/nfp/nfp_types.h
@@ -4,7 +4,9 @@
 
 namespace nn::nfp {
 
-using DeviceHandle = u64;
+struct DeviceHandle {
+    u64 m_Id;
+};
 
 const s32 AmiiboNameLength = 10;