--- nono/vm/vm_luna.h	2026/04/29 17:04:36	1.1.1.2
+++ nono/vm/vm_luna.h	2026/04/29 17:04:45	1.1.1.4
@@ -6,9 +6,12 @@
 
 #pragma once
 
+#include "crtc2.h"
+#include "fuserom.h"
+#include "sysclk.h"
 #include "vm.h"
 
-class VM_LUNA : public VM
+class VM_LUNA final : public VM
 {
 	using inherited = VM;
  public:
@@ -19,15 +22,14 @@ class VM_LUNA : public VM
 	void PowerButton() override;
 
  private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
+	std::unique_ptr<CRTC2Device> crtc2 {};
+	std::unique_ptr<IODevice> prom {};
+	std::unique_ptr<NullDevice> nulldev {};
 
 	static const uint8 maptable[256];
 };
 
-class VM_LUNA88K : public VM
+class VM_LUNA88K final : public VM
 {
 	using inherited = VM;
  public:
@@ -38,11 +40,10 @@ class VM_LUNA88K : public VM
 	void PowerButton() override;
 
  private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<FuseROMDevice> fuserom;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
+	std::unique_ptr<CRTC2Device> crtc2 {};
+	std::unique_ptr<FuseROMDevice> fuserom {};
+	std::unique_ptr<IODevice> prom {};
+	std::unique_ptr<NullDevice> nulldev {};
 
 	static const uint8 maptable[256];
 };