--- a/layout/base/MobileViewportManager.h
+++ b/layout/base/MobileViewportManager.h
@@ -9,16 +9,17 @@
 #include "mozilla/Maybe.h"
 #include "nsIDOMEventListener.h"
 #include "nsIObserver.h"
 #include "Units.h"
 
 class nsIDOMEventTarget;
 class nsIDocument;
 class nsIPresShell;
+class nsViewportInfo;
 
 class MobileViewportManager final : public nsIDOMEventListener
                                   , public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
   NS_DECL_NSIOBSERVER

--- a/layout/base/PresShell.h
+++ b/layout/base/PresShell.h
@@ -16,33 +16,35 @@
  * 05/03/2000   IBM Corp.       Observer events for reflow states
  */
 
 /* a presentation of a document, part 2 */
 
 #ifndef mozilla_PresShell_h
 #define mozilla_PresShell_h
 
-#include "nsIPresShell.h"
-#include "nsStubDocumentObserver.h"
-#include "nsISelectionController.h"
-#include "nsIObserver.h"
-#include "nsWeakReference.h"
-#include "nsCRT.h"
-#include "nsAutoPtr.h"
-#include "nsIWidget.h"
-#include "nsContentUtils.h" // For AddScriptBlocker().
-#include "nsRefreshDriver.h"
-#include "TouchManager.h"
+#include "MobileViewportManager.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StyleSetHandle.h"
 #include "mozilla/UniquePtr.h"
-#include "MobileViewportManager.h"
+#include "nsAutoPtr.h"
+#include "nsContentUtils.h" // For AddScriptBlocker().
+#include "nsCRT.h"
+#include "nsIObserver.h"
+#include "nsIPresShell.h"
+#include "nsISelectionController.h"
+#include "nsIWidget.h"
+#include "nsPresContext.h"
+#include "nsRefreshDriver.h"
+#include "nsStubDocumentObserver.h"
+#include "nsThreadUtils.h"
+#include "nsWeakReference.h"
+#include "TouchManager.h"
 #include "ZoomConstraintsClient.h"
 
 class nsIDocShell;
 class nsRange;
 
 struct RangePaintInfo;
 struct nsCallbackEventRequest;
 #ifdef MOZ_REFLOW_PERF

--- a/layout/base/TouchManager.cpp
+++ b/layout/base/TouchManager.cpp
@@ -3,18 +3,18 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "TouchManager.h"
 
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/PresShell.h"
 #include "nsIFrame.h"
-#include "mozilla/PresShell.h"
 #include "nsView.h"
 
 using namespace mozilla::dom;
 
 namespace mozilla {
 
 nsDataHashtable<nsUint32HashKey, TouchManager::TouchInfo>* TouchManager::sCaptureTouchList;