--- a/layout/generic/nsBackdropFrame.cpp
+++ b/layout/generic/nsBackdropFrame.cpp
@@ -3,16 +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/. */
 
 /* rendering object for CSS "::backdrop" */
 
 #include "nsBackdropFrame.h"
 
+#include "nsDisplayList.h"
+
 using namespace mozilla;
 
 NS_IMPL_FRAMEARENA_HELPERS(nsBackdropFrame)
 
 /* virtual */ nsIAtom*
 nsBackdropFrame::GetType() const
 {
   return nsGkAtoms::backdropFrame;

--- a/layout/generic/nsBackdropFrame.h
+++ b/layout/generic/nsBackdropFrame.h
@@ -24,23 +24,24 @@ public:
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const override;
 #endif
   virtual nsStyleContext*
     GetParentStyleContext(nsIFrame** aProviderFrame) const override;
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsRect& aDirtyRect,
                                 const nsDisplayListSet& aLists) override;
-  virtual LogicalSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
-                                      WritingMode aWM,
-                                      const LogicalSize& aCBSize,
-                                      nscoord aAvailableISize,
-                                      const LogicalSize& aMargin,
-                                      const LogicalSize& aBorder,
-                                      const LogicalSize& aPadding,
-                                      bool aShrinkWrap) override;
+  virtual mozilla::LogicalSize
+    ComputeAutoSize(nsRenderingContext *aRenderingContext,
+                    mozilla::WritingMode aWM,
+                    const mozilla::LogicalSize& aCBSize,
+                    nscoord aAvailableISize,
+                    const mozilla::LogicalSize& aMargin,
+                    const mozilla::LogicalSize& aBorder,
+                    const mozilla::LogicalSize& aPadding,
+                    bool aShrinkWrap) override;
   virtual void Reflow(nsPresContext* aPresContext,
                       ReflowOutput& aDesiredSize,
                       const ReflowInput& aReflowInput,
                       nsReflowStatus& aStatus) override;
 };
 
 #endif // nsBackdropFrame_h___

--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2,20 +2,22 @@
 /* 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/. */
 
 /* rendering object to wrap rendering objects that should be scrollable */
 
 #include "nsGfxScrollFrame.h"
 
+#include "ActiveLayerTracker.h"
 #include "base/compiler_specific.h"
 #include "DisplayItemClip.h"
 #include "DisplayItemScrollClip.h"
 #include "nsCOMPtr.h"
+#include "nsIContentViewer.h"
 #include "nsPresContext.h"
 #include "nsView.h"
 #include "nsIScrollable.h"
 #include "nsContainerFrame.h"
 #include "nsGkAtoms.h"
 #include "nsNameSpaceManager.h"
 #include "nsContentList.h"
 #include "nsIDocumentInlines.h"
@@ -71,16 +73,17 @@
 #include <cstdlib> // for std::abs(int/long)
 #include <cmath> // for std::abs(float/double)
 
 #define PAINT_SKIP_LOG(...)
 // #define PAINT_SKIP_LOG(...) printf_stderr("PSKIP: " __VA_ARGS__)
 
 using namespace mozilla;
 using namespace mozilla::dom;
+using namespace mozilla::layers;
 using namespace mozilla::layout;
 
 static uint32_t
 GetOverflowChange(const nsRect& aCurScrolledRect, const nsRect& aPrevScrolledRect)
 {
   uint32_t result = 0;
   if (aPrevScrolledRect.x != aCurScrolledRect.x ||
       aPrevScrolledRect.width != aCurScrolledRect.width) {

--- a/layout/generic/nsIStatefulFrame.h
+++ b/layout/generic/nsIStatefulFrame.h
@@ -5,16 +5,17 @@
 /*
  * interface for rendering objects whose state is saved in
  * session-history (back-forward navigation)
  */
 
 #ifndef _nsIStatefulFrame_h
 #define _nsIStatefulFrame_h
 
+#include "nsContentUtils.h"
 #include "nsQueryFrame.h"
 
 class nsPresState;
 
 class nsIStatefulFrame
 {
  public: 
   NS_DECL_QUERYFRAME_TARGET(nsIStatefulFrame)