diff --git a/src/device-api/common.js b/src/device-api/common.js
index c8f9383d..2104d87c 100644
--- a/src/device-api/common.js
+++ b/src/device-api/common.js
@@ -8,7 +8,7 @@ import * as serviceManager from '../compose/service-manager';
 import * as volumeManager from '../compose/volume-manager';
 import { InternalInconsistencyError } from '../lib/errors';
 import { lock } from '../lib/update-lock';
-import { appNotFoundMessage } from '../lib/messages';
+import { appNotFoundMessage } from './messages';
 
 export async function doRestart(appId, force) {
 	await deviceState.initialized();
diff --git a/src/lib/messages.ts b/src/device-api/messages.ts
similarity index 100%
rename from src/lib/messages.ts
rename to src/device-api/messages.ts
diff --git a/src/device-api/v2.ts b/src/device-api/v2.ts
index 10d49d72..aeaf99ac 100644
--- a/src/device-api/v2.ts
+++ b/src/device-api/v2.ts
@@ -26,7 +26,7 @@ import {
 	appNotFoundMessage,
 	serviceNotFoundMessage,
 	v2ServiceEndpointInputErrorMessage,
-} from '../lib/messages';
+} from './messages';
 import log from '../lib/supervisor-console';
 import supervisorVersion = require('../lib/supervisor-version');
 import { checkInt, checkTruthy } from '../lib/validation';