--- a/devtools/client/moz.build
+++ b/devtools/client/moz.build
@@ -35,21 +35,16 @@ DIRS += [
     'webconsole',
     'webide',
 ]
 
 # Shim old theme paths used by DevTools add-ons
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIRS += ['themes/shims']
 
-EXTRA_COMPONENTS += [
-    'devtools-startup.js',
-    'devtools-startup.manifest',
-]
-
 JAR_MANIFESTS += ['jar.mn']
 
 DevToolsModules(
     'definitions.js',
     'menus.js',
 )
 
 with Files('**'):

rename from devtools/client/devtools-startup.js
rename to devtools/shim/devtools-startup.js

rename from devtools/client/devtools-startup.manifest
rename to devtools/shim/devtools-startup.manifest

--- a/devtools/shim/moz.build
+++ b/devtools/shim/moz.build
@@ -6,11 +6,13 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
 # Register the about:debugging page only for 'addon' and 'all' builds.
 if CONFIG['MOZ_DEVTOOLS'] != 'server':
     EXTRA_COMPONENTS += [
         'aboutdebugging-registration.js',
         'aboutdebugging.manifest',
+        'devtools-startup.js',
+        'devtools-startup.manifest',
     ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']