--- nono/cli/cli_app.cpp	2026/04/29 17:05:13	1.1.1.10
+++ nono/cli/cli_app.cpp	2026/04/29 17:05:16	1.1.1.11
@@ -12,8 +12,6 @@
 #include "cuimessage.h"
 #include "kevent.h"
 #include "mainapp.h"
-#include "mpu680x0.h"
-#include "pluto.h"
 #include "power.h"
 #include "vm.h"
 
@@ -77,7 +75,7 @@ CLIApp::OnCreate()
 {
 	CUIMessage::Connect(UIMessage::APPEXIT,
 		[&](const UIMessage&) { OnAppExit(); });
-	if (gMPU680x0) {
+	if (gMainApp.Has(VMCap::M68K)) {
 		CUIMessage::Connect(UIMessage::HALT,
 			[&](const UIMessage&) { OnHalt(); });
 	}
@@ -85,7 +83,8 @@ CLIApp::OnCreate()
 	UIMessage::Attach(&CUIMessage::Process);
 
 	// 電源投入
-	gPower->PowerButton();
+	auto power = GetPowerDevice();
+	power->PowerButton();
 
 	// メッセージを待つ
 	while (exit_request == false) {