diff --git a/gfx/layers/LayerAttributes.h b/gfx/layers/ScrollbarData.h
similarity index 96%
rename from gfx/layers/LayerAttributes.h
rename to gfx/layers/ScrollbarData.h
index 99423eaab9f0..bbbf6c276a77 100644
--- a/gfx/layers/LayerAttributes.h
+++ b/gfx/layers/ScrollbarData.h
@@ -4,8 +4,8 @@
  * 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/. */
 
-#ifndef mozilla_gfx_layers_LayerAttributes_h
-#define mozilla_gfx_layers_LayerAttributes_h
+#ifndef mozilla_gfx_layers_ScrollbarData_h
+#define mozilla_gfx_layers_ScrollbarData_h
 
 #include "FrameMetrics.h"
 #include "mozilla/Maybe.h"
@@ -134,4 +134,4 @@ struct ScrollbarData {
 }  // namespace layers
 }  // namespace mozilla
 
-#endif  // mozilla_gfx_layers_LayerAttributes_h
+#endif  // mozilla_gfx_layers_ScrollbarData_h
diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h
index 7f3d50392167..fc69c855193a 100644
--- a/gfx/layers/apz/src/APZCTreeManager.h
+++ b/gfx/layers/apz/src/APZCTreeManager.h
@@ -22,7 +22,7 @@
 #include "mozilla/layers/APZTestData.h"       // for APZTestData
 #include "mozilla/layers/APZUtils.h"          // for GeckoViewMetrics
 #include "mozilla/layers/IAPZCTreeManager.h"  // for IAPZCTreeManager
-#include "mozilla/layers/LayerAttributes.h"
+#include "mozilla/layers/ScrollbarData.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/KeyboardMap.h"      // for KeyboardMap
 #include "mozilla/layers/TouchCounter.h"     // for TouchCounter
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 84b1a1c1e492..15de2867f1a5 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -8,9 +8,9 @@
 #define mozilla_layers_AsyncPanZoomController_h
 
 #include "mozilla/layers/GeckoContentController.h"
-#include "mozilla/layers/LayerAttributes.h"
 #include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/layers/SampleTime.h"
+#include "mozilla/layers/ScrollbarData.h"
 #include "mozilla/layers/ZoomConstraints.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
diff --git a/gfx/layers/apz/src/HitTestingTreeNode.h b/gfx/layers/apz/src/HitTestingTreeNode.h
index a2339784c848..ed20f9f56198 100644
--- a/gfx/layers/apz/src/HitTestingTreeNode.h
+++ b/gfx/layers/apz/src/HitTestingTreeNode.h
@@ -9,9 +9,9 @@
 
 #include "mozilla/gfx/CompositorHitTestInfo.h"
 #include "mozilla/gfx/Matrix.h"                  // for Matrix4x4
-#include "mozilla/layers/LayerAttributes.h"      // for ScrollbarData
 #include "mozilla/layers/LayersTypes.h"          // for EventRegions
 #include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid
+#include "mozilla/layers/ScrollbarData.h"        // for ScrollbarData
 #include "mozilla/Maybe.h"                       // for Maybe
 #include "mozilla/RecursiveMutex.h"              // for RecursiveMutexAutoLock
 #include "mozilla/RefPtr.h"                      // for nsRefPtr
diff --git a/gfx/layers/ipc/LayersMessageUtils.h b/gfx/layers/ipc/LayersMessageUtils.h
index b91aa5586716..fae8504c964b 100644
--- a/gfx/layers/ipc/LayersMessageUtils.h
+++ b/gfx/layers/ipc/LayersMessageUtils.h
@@ -26,11 +26,11 @@
 #include "mozilla/layers/FocusTarget.h"
 #include "mozilla/layers/GeckoContentControllerTypes.h"
 #include "mozilla/layers/KeyboardMap.h"
-#include "mozilla/layers/LayerAttributes.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/MatrixMessage.h"
 #include "mozilla/layers/OverlayInfo.h"
 #include "mozilla/layers/RepaintRequest.h"
+#include "mozilla/layers/ScrollbarData.h"
 #include "nsSize.h"
 #include "mozilla/layers/DoubleTapToZoom.h"
 
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 5c8f5e6bb86d..1ab4f1c92ad6 100755
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -180,7 +180,6 @@ EXPORTS.mozilla.layers += [
     "ipc/VideoBridgeChild.h",
     "ipc/VideoBridgeParent.h",
     "ipc/VideoBridgeUtils.h",
-    "LayerAttributes.h",
     "LayersTypes.h",
     "MemoryPressureObserver.h",
     "NativeLayer.h",
@@ -198,6 +197,7 @@ EXPORTS.mozilla.layers += [
     "SampleTime.h",
     "ScreenshotGrabber.h",
     "ScrollableLayerGuid.h",
+    "ScrollbarData.h",
     "ShareableCanvasRenderer.h",
     "SourceSurfaceSharedData.h",
     "SurfacePool.h",
diff --git a/gfx/layers/wr/WebRenderScrollData.h b/gfx/layers/wr/WebRenderScrollData.h
index d4b69394ad1b..a3919ce3d0d7 100644
--- a/gfx/layers/wr/WebRenderScrollData.h
+++ b/gfx/layers/wr/WebRenderScrollData.h
@@ -16,8 +16,8 @@
 #include "LayersTypes.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/GfxMessageUtils.h"
-#include "mozilla/layers/LayerAttributes.h"
 #include "mozilla/layers/FocusTarget.h"
+#include "mozilla/layers/ScrollbarData.h"
 #include "mozilla/layers/WebRenderMessageUtils.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/HashTable.h"
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
index 0735442581e5..d5d4dddb5246 100644
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -41,8 +41,8 @@
 #include "mozilla/dom/EffectsInfo.h"
 #include "mozilla/gfx/UserData.h"
 #include "mozilla/layers/BSPTree.h"
-#include "mozilla/layers/LayerAttributes.h"
 #include "mozilla/layers/ScrollableLayerGuid.h"
+#include "mozilla/layers/ScrollbarData.h"
 #include "nsAutoLayoutPhase.h"
 #include "nsCOMPtr.h"
 #include "nsCSSRenderingBorders.h"