1 files changed, 2 insertions, 8 deletions
diff --git a/layout/base/moz.build b/layout/base/moz.build
index f115280ce..86377e9db 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # 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/.
@@ -96,7 +95,7 @@ EXPORTS += [
     'nsRefreshDriver.h',
     'nsStyleChangeList.h',
     'nsStyleSheetService.h',
-    'ScrollbarStyles.h',
+    'ScrollStyles.h',
     'StackArena.h',
     'Units.h',
     'UnitTransforms.h',
@@ -163,7 +162,7 @@ SOURCES += [
     'RestyleManager.cpp',
     'RestyleManagerBase.cpp',
     'RestyleTracker.cpp',
-    'ScrollbarStyles.cpp',
+    'ScrollStyles.cpp',
     'ServoRestyleManager.cpp',
     'StackArena.cpp',
     'StaticPresData.cpp',
@@ -194,11 +193,6 @@ LOCAL_INCLUDES += [
     '/view',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    LOCAL_INCLUDES += [
-        '/widget/android',
-    ]
-
 FINAL_LIBRARY = 'xul'
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']