diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index c8b51574263d..1ac0eb9f035e 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -891,7 +891,6 @@ void APZCTreeManager::SampleForWebRender(const Maybe<VsyncId>& aVsyncId,
       aTxn.AddMinimapData(scrollId, minimapData);
     }
 
-#if defined(MOZ_WIDGET_ANDROID)
     if (apzc->IsRootContent()) {
       // Send the root frame metrics to java through the UIController
       if (RefPtr<UiCompositorControllerParent> uiController =
@@ -902,7 +901,6 @@ void APZCTreeManager::SampleForWebRender(const Maybe<VsyncId>& aVsyncId,
         }
       }
     }
-#endif
   }
 
   // Now collect all the async transforms needed for the scrollthumbs.
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index ccfd5a72e4d5..e5ae2efe3ee4 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -6104,7 +6104,6 @@ bool CompositorScrollUpdate::operator==(
          mZoom == aOther.mZoom && mSource == aOther.mSource;
 }
 
-#ifdef MOZ_WIDGET_ANDROID
 std::vector<CompositorScrollUpdate>
 AsyncPanZoomController::GetCompositorScrollUpdates() {
   RecursiveMutexAutoLock lock(mRecursiveMutex);
@@ -6122,7 +6121,6 @@ AsyncPanZoomController::GetCompositorScrollUpdates() {
 
   return {};
 }
-#endif  // defined(MOZ_WIDGET_ANDROID)
 
 wr::MinimapData AsyncPanZoomController::GetMinimapData() const {
   RecursiveMutexAutoLock lock(mRecursiveMutex);
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 390b70f54847..a61e855e7b2d 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -592,7 +592,6 @@ class AsyncPanZoomController {
   const FrameMetrics& Metrics() const;
   FrameMetrics& Metrics();
 
-#ifdef MOZ_WIDGET_ANDROID
   /**
    * Get the CompositorScrollUpdates to be sent to consumers for the current
    * composite.
@@ -602,7 +601,6 @@ class AsyncPanZoomController {
  private:
   // Last CompositorScrollUpdate sent to GeckoView through UIController.
   CompositorScrollUpdate mLastCompositorScrollUpdate;
-#endif  // defined(MOZ_WIDGET_ANDROID)
 
  public:
   wr::MinimapData GetMinimapData() const;
diff --git a/gfx/layers/ipc/UiCompositorControllerChild.cpp b/gfx/layers/ipc/UiCompositorControllerChild.cpp
index 15ea55dda82e..b03636654227 100644
--- a/gfx/layers/ipc/UiCompositorControllerChild.cpp
+++ b/gfx/layers/ipc/UiCompositorControllerChild.cpp
@@ -230,11 +230,9 @@ UiCompositorControllerChild::RecvToolbarAnimatorMessageFromCompositor(
 mozilla::ipc::IPCResult
 UiCompositorControllerChild::RecvNotifyCompositorScrollUpdate(
     const CompositorScrollUpdate& aUpdate) {
-#if defined(MOZ_WIDGET_ANDROID)
   if (mWidget) {
     mWidget->NotifyCompositorScrollUpdate(aUpdate);
   }
-#endif  // defined(MOZ_WIDGET_ANDROID)
 
   return IPC_OK();
 }
diff --git a/gfx/layers/ipc/UiCompositorControllerParent.cpp b/gfx/layers/ipc/UiCompositorControllerParent.cpp
index b06848e6dccd..8a5e0ffb3ccc 100644
--- a/gfx/layers/ipc/UiCompositorControllerParent.cpp
+++ b/gfx/layers/ipc/UiCompositorControllerParent.cpp
@@ -207,12 +207,10 @@ void UiCompositorControllerParent::NotifyFirstPaint() {
 
 void UiCompositorControllerParent::NotifyCompositorScrollUpdate(
     const CompositorScrollUpdate& aUpdate) {
-#if defined(MOZ_WIDGET_ANDROID)
   CompositorThread()->Dispatch(NewRunnableMethod<CompositorScrollUpdate>(
       "UiCompositorControllerParent::SendNotifyCompositorScrollUpdate", this,
       &UiCompositorControllerParent::SendNotifyCompositorScrollUpdate,
       aUpdate));
-#endif
 }
 
 UiCompositorControllerParent::UiCompositorControllerParent(
diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
index 48cb2666561e..d10aa44db641 100644
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -408,10 +408,11 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
   void NotifyLiveResizeStarted();
   void NotifyLiveResizeStopped();
 
-#if defined(MOZ_WIDGET_ANDROID)
-  void RecvToolbarAnimatorMessageFromCompositor(int32_t) override {};
   void NotifyCompositorScrollUpdate(
       const mozilla::layers::CompositorScrollUpdate& aUpdate) override {};
+
+#if defined(MOZ_WIDGET_ANDROID)
+  void RecvToolbarAnimatorMessageFromCompositor(int32_t) override {};
   void RecvScreenPixels(mozilla::ipc::Shmem&& aMem, const ScreenIntSize& aSize,
                         bool aNeedsYFlip) override {};
 #endif
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index f68f4a8185c8..c6401e110692 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -2010,6 +2010,13 @@ class nsIWidget : public nsISupports {
     MOZ_ASSERT(false, "This function should only execute in Windows");
   }
 
+  /**
+   * NotifyCompositorScrollUpdate notify widget about an update to the
+   * composited scroll offset and zoom
+   */
+  virtual void NotifyCompositorScrollUpdate(
+      const mozilla::layers::CompositorScrollUpdate& aUpdate) = 0;
+
 #if defined(MOZ_WIDGET_ANDROID)
   /**
    * RecvToolbarAnimatorMessageFromCompositor receive message from compositor
@@ -2019,13 +2026,6 @@ class nsIWidget : public nsISupports {
    */
   virtual void RecvToolbarAnimatorMessageFromCompositor(int32_t aMessage) = 0;
 
-  /**
-   * NotifyCompositorScrollUpdate notify widget about an update to the
-   * composited scroll offset and zoom
-   */
-  virtual void NotifyCompositorScrollUpdate(
-      const mozilla::layers::CompositorScrollUpdate& aUpdate) = 0;
-
   /**
    * RecvScreenPixels Buffer containing the pixel from the frame buffer. Used
    * for android robocop tests.