diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/browser/components/sessionstore/content/content-sessionStore.js
index ef7bcd33101..9de21faa8f7 100644
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/browser/components/sessionstore/content/content-sessionStore.js
@@ -19,11 +19,11 @@ Cu.import("resource://gre/modules/Timer.jsm", this);
 XPCOMUtils.defineLazyModuleGetter(this, "DocShellCapabilities",
   "resource:///modules/sessionstore/DocShellCapabilities.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FormData",
-  "resource:///modules/sessionstore/FormData.jsm");
+  "resource://gre/modules/FormData.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PageStyle",
   "resource:///modules/sessionstore/PageStyle.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ScrollPosition",
-  "resource:///modules/sessionstore/ScrollPosition.jsm");
+  "resource://gre/modules/ScrollPosition.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionHistory",
   "resource:///modules/sessionstore/SessionHistory.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionStorage",
diff --git a/browser/components/sessionstore/src/ContentRestore.jsm b/browser/components/sessionstore/src/ContentRestore.jsm
index ba2fc86fe8b..2565e60e3e2 100644
--- a/browser/components/sessionstore/src/ContentRestore.jsm
+++ b/browser/components/sessionstore/src/ContentRestore.jsm
@@ -14,11 +14,11 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 XPCOMUtils.defineLazyModuleGetter(this, "DocShellCapabilities",
   "resource:///modules/sessionstore/DocShellCapabilities.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FormData",
-  "resource:///modules/sessionstore/FormData.jsm");
+  "resource://gre/modules/FormData.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PageStyle",
   "resource:///modules/sessionstore/PageStyle.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ScrollPosition",
-  "resource:///modules/sessionstore/ScrollPosition.jsm");
+  "resource://gre/modules/ScrollPosition.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionHistory",
   "resource:///modules/sessionstore/SessionHistory.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionStorage",
diff --git a/browser/components/sessionstore/src/moz.build b/browser/components/sessionstore/src/moz.build
index 1746b092967..6c66320375e 100644
--- a/browser/components/sessionstore/src/moz.build
+++ b/browser/components/sessionstore/src/moz.build
@@ -15,14 +15,12 @@ JS_MODULES_PATH = 'modules/sessionstore'
 EXTRA_JS_MODULES = [
     'ContentRestore.jsm',
     'DocShellCapabilities.jsm',
-    'FormData.jsm',
     'FrameTree.jsm',
     'GlobalState.jsm',
     'PageStyle.jsm',
     'PrivacyFilter.jsm',
     'PrivacyLevel.jsm',
     'RecentlyClosedTabsAndWindowsMenuUtils.jsm',
-    'ScrollPosition.jsm',
     'SessionCookies.jsm',
     'SessionFile.jsm',
     'SessionHistory.jsm',
@@ -33,7 +31,6 @@ EXTRA_JS_MODULES = [
     'TabState.jsm',
     'TabStateCache.jsm',
     'Utils.jsm',
-    'XPathGenerator.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 98bde0a4184..c4994b011db 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -41,6 +41,9 @@ EXTRA_JS_MODULES += [
     'RemoteWebProgress.jsm',
     'SelectContentHelper.jsm',
     'SelectParentHelper.jsm',
+    'sessionstore/FormData.jsm',
+    'sessionstore/ScrollPosition.jsm',
+    'sessionstore/XPathGenerator.jsm',
     'ShortcutUtils.jsm',
     'Sntp.jsm',
     'SpatialNavigation.jsm',
diff --git a/browser/components/sessionstore/src/FormData.jsm b/toolkit/modules/sessionstore/FormData.jsm
similarity index 99%
rename from browser/components/sessionstore/src/FormData.jsm
rename to toolkit/modules/sessionstore/FormData.jsm
index 1892096968f..20e27c812aa 100644
--- a/browser/components/sessionstore/src/FormData.jsm
+++ b/toolkit/modules/sessionstore/FormData.jsm
@@ -10,7 +10,7 @@ const Cu = Components.utils;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource:///modules/sessionstore/XPathGenerator.jsm");
+Cu.import("resource://gre/modules/XPathGenerator.jsm");
 
 /**
  * Returns whether the given URL very likely has input
diff --git a/browser/components/sessionstore/src/ScrollPosition.jsm b/toolkit/modules/sessionstore/ScrollPosition.jsm
similarity index 100%
rename from browser/components/sessionstore/src/ScrollPosition.jsm
rename to toolkit/modules/sessionstore/ScrollPosition.jsm
diff --git a/browser/components/sessionstore/src/XPathGenerator.jsm b/toolkit/modules/sessionstore/XPathGenerator.jsm
similarity index 100%
rename from browser/components/sessionstore/src/XPathGenerator.jsm
rename to toolkit/modules/sessionstore/XPathGenerator.jsm