diff --git a/layout/base/moz.build b/layout/base/moz.build
index 9a7592931b8de..e50d4adf61883 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -116,7 +116,6 @@ LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
     '../../content/svg/content/src',
-    '../../view/src',
     '../forms',
     '../generic',
     '../mathml',
@@ -129,6 +128,7 @@ LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
+    '/view',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/layout/build/moz.build b/layout/build/moz.build
index e939370f71423..fb7e1848bf115 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -75,7 +75,7 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/netwerk/base/src',
     '/netwerk/cookie',
-    '/view/src',
+    '/view',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
diff --git a/view/src/Makefile.in b/view/Makefile.in
similarity index 100%
rename from view/src/Makefile.in
rename to view/Makefile.in
diff --git a/view/moz.build b/view/moz.build
index 76218104c0141..4fa3678d2d567 100644
--- a/view/moz.build
+++ b/view/moz.build
@@ -4,5 +4,19 @@
 # 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/.
 
-DIRS += ['public', 'src']
+EXPORTS += [
+    'nsView.h',
+    'nsViewManager.h',
+]
 
+# nsViewManager.cpp cannot be built in unified mode because it uses PL_ARENA_CONST_ALIGN_MASK.
+SOURCES += [
+    'nsView.cpp',
+    'nsViewManager.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
diff --git a/view/src/nsView.cpp b/view/nsView.cpp
similarity index 100%
rename from view/src/nsView.cpp
rename to view/nsView.cpp
diff --git a/view/public/nsView.h b/view/nsView.h
similarity index 100%
rename from view/public/nsView.h
rename to view/nsView.h
diff --git a/view/src/nsViewManager.cpp b/view/nsViewManager.cpp
similarity index 100%
rename from view/src/nsViewManager.cpp
rename to view/nsViewManager.cpp
diff --git a/view/public/nsViewManager.h b/view/nsViewManager.h
similarity index 100%
rename from view/public/nsViewManager.h
rename to view/nsViewManager.h
diff --git a/view/public/moz.build b/view/public/moz.build
deleted file mode 100644
index 3882a5d2b376d..0000000000000
--- a/view/public/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-EXPORTS += [
-    'nsView.h',
-    'nsViewManager.h',
-]
-
diff --git a/view/src/moz.build b/view/src/moz.build
deleted file mode 100644
index 9cea1fd0b36af..0000000000000
--- a/view/src/moz.build
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-# nsViewManager.cpp cannot be built in unified mode because it uses PL_ARENA_CONST_ALIGN_MASK.
-SOURCES += [
-    'nsView.cpp',
-    'nsViewManager.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
index 9ff922aa1c540..22d506ca401d5 100644
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -82,7 +82,7 @@ LOCAL_INCLUDES += [
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
-    '/view/src',
+    '/view',
 ]
 
 widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']