diff --git a/caps/src/DomainPolicy.cpp b/caps/DomainPolicy.cpp
similarity index 100%
rename from caps/src/DomainPolicy.cpp
rename to caps/DomainPolicy.cpp
diff --git a/caps/include/DomainPolicy.h b/caps/DomainPolicy.h
similarity index 100%
rename from caps/include/DomainPolicy.h
rename to caps/DomainPolicy.h
diff --git a/caps/idl/moz.build b/caps/idl/moz.build
deleted file mode 100644
index 94881279d1ae..000000000000
--- a/caps/idl/moz.build
+++ /dev/null
@@ -1,14 +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/.
-
-XPIDL_SOURCES += [
-    'nsIDomainPolicy.idl',
-    'nsIPrincipal.idl',
-    'nsIScriptSecurityManager.idl',
-]
-
-XPIDL_MODULE = 'caps'
-
diff --git a/caps/include/moz.build b/caps/include/moz.build
deleted file mode 100644
index 123937e0cdb6..000000000000
--- a/caps/include/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 += [
-    'nsJSPrincipals.h',
-    'nsNullPrincipal.h',
-]
-
diff --git a/caps/moz.build b/caps/moz.build
index 3d9f2b173779..aa5cfe68014c 100644
--- a/caps/moz.build
+++ b/caps/moz.build
@@ -4,6 +4,37 @@
 # 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 += ['idl', 'include', 'src']
 TEST_DIRS += ['tests/mochitest']
 
+XPIDL_SOURCES += [
+    'nsIDomainPolicy.idl',
+    'nsIPrincipal.idl',
+    'nsIScriptSecurityManager.idl',
+]
+
+XPIDL_MODULE = 'caps'
+
+EXPORTS += [
+    'nsJSPrincipals.h',
+    'nsNullPrincipal.h',
+]
+
+UNIFIED_SOURCES += [
+    'DomainPolicy.cpp',
+    'nsJSPrincipals.cpp',
+    'nsNullPrincipal.cpp',
+    'nsNullPrincipalURI.cpp',
+    'nsPrincipal.cpp',
+    'nsScriptSecurityManager.cpp',
+    'nsSystemPrincipal.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/js/xpconnect/src',
+]
+
+FINAL_LIBRARY = 'gklayout'
+
diff --git a/caps/idl/nsIDomainPolicy.idl b/caps/nsIDomainPolicy.idl
similarity index 100%
rename from caps/idl/nsIDomainPolicy.idl
rename to caps/nsIDomainPolicy.idl
diff --git a/caps/idl/nsIPrincipal.idl b/caps/nsIPrincipal.idl
similarity index 100%
rename from caps/idl/nsIPrincipal.idl
rename to caps/nsIPrincipal.idl
diff --git a/caps/idl/nsIScriptSecurityManager.idl b/caps/nsIScriptSecurityManager.idl
similarity index 100%
rename from caps/idl/nsIScriptSecurityManager.idl
rename to caps/nsIScriptSecurityManager.idl
diff --git a/caps/src/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp
similarity index 100%
rename from caps/src/nsJSPrincipals.cpp
rename to caps/nsJSPrincipals.cpp
diff --git a/caps/include/nsJSPrincipals.h b/caps/nsJSPrincipals.h
similarity index 100%
rename from caps/include/nsJSPrincipals.h
rename to caps/nsJSPrincipals.h
diff --git a/caps/src/nsNullPrincipal.cpp b/caps/nsNullPrincipal.cpp
similarity index 100%
rename from caps/src/nsNullPrincipal.cpp
rename to caps/nsNullPrincipal.cpp
diff --git a/caps/include/nsNullPrincipal.h b/caps/nsNullPrincipal.h
similarity index 100%
rename from caps/include/nsNullPrincipal.h
rename to caps/nsNullPrincipal.h
diff --git a/caps/src/nsNullPrincipalURI.cpp b/caps/nsNullPrincipalURI.cpp
similarity index 100%
rename from caps/src/nsNullPrincipalURI.cpp
rename to caps/nsNullPrincipalURI.cpp
diff --git a/caps/src/nsNullPrincipalURI.h b/caps/nsNullPrincipalURI.h
similarity index 100%
rename from caps/src/nsNullPrincipalURI.h
rename to caps/nsNullPrincipalURI.h
diff --git a/caps/src/nsPrincipal.cpp b/caps/nsPrincipal.cpp
similarity index 100%
rename from caps/src/nsPrincipal.cpp
rename to caps/nsPrincipal.cpp
diff --git a/caps/include/nsPrincipal.h b/caps/nsPrincipal.h
similarity index 100%
rename from caps/include/nsPrincipal.h
rename to caps/nsPrincipal.h
diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
similarity index 100%
rename from caps/src/nsScriptSecurityManager.cpp
rename to caps/nsScriptSecurityManager.cpp
diff --git a/caps/include/nsScriptSecurityManager.h b/caps/nsScriptSecurityManager.h
similarity index 100%
rename from caps/include/nsScriptSecurityManager.h
rename to caps/nsScriptSecurityManager.h
diff --git a/caps/src/nsSystemPrincipal.cpp b/caps/nsSystemPrincipal.cpp
similarity index 100%
rename from caps/src/nsSystemPrincipal.cpp
rename to caps/nsSystemPrincipal.cpp
diff --git a/caps/include/nsSystemPrincipal.h b/caps/nsSystemPrincipal.h
similarity index 100%
rename from caps/include/nsSystemPrincipal.h
rename to caps/nsSystemPrincipal.h
diff --git a/caps/src/moz.build b/caps/src/moz.build
deleted file mode 100644
index 797bba56c6f4..000000000000
--- a/caps/src/moz.build
+++ /dev/null
@@ -1,25 +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/.
-
-UNIFIED_SOURCES += [
-    'DomainPolicy.cpp',
-    'nsJSPrincipals.cpp',
-    'nsNullPrincipal.cpp',
-    'nsNullPrincipalURI.cpp',
-    'nsPrincipal.cpp',
-    'nsScriptSecurityManager.cpp',
-    'nsSystemPrincipal.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '../include',
-    '/dom/base',
-    '/js/xpconnect/src',
-]
-
-FINAL_LIBRARY = 'gklayout'
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 7ff40bfd92be..5ab5f784ea15 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -219,7 +219,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/caps/include',
+    '/caps',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
index 3b6527fb12f4..b39fc4b2d0ff 100644
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -33,7 +33,7 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
-    '/caps/include',
+    '/caps',
     '/content/base/src',
     '/docshell/base',
     '/dom/base',
diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build
index 877cac4d4287..962b5a70f7d9 100644
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -20,7 +20,7 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/caps/include',
+    '/caps',
     '/content/base/src',
     '/content/html/document/src',
     '/content/xul/content/src',
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index 3fac14650b2f..0bcd9ce56198 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -65,7 +65,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/caps/include',
+    '/caps',
     '/content/base/src',
     '/db/sqlite3/src',
     '/dom/base',
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 108e14465bf9..09b633189396 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -66,7 +66,7 @@ FAIL_ON_WARNINGS = True
 LOCAL_INCLUDES += [
     '../base',
     '../camera',
-    '/caps/include',
+    '/caps',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/dom/quota/moz.build b/dom/quota/moz.build
index 94dc67cdd0b6..76bd67a9f9cc 100644
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -46,6 +46,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/caps/include',
+    '/caps',
 ]
 
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index a9a5d8ed14d5..8517aa343fff 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -76,7 +76,7 @@ DEFINES['JS_THREADSAFE'] = True
 LOCAL_INCLUDES += [
     '../loader',
     '../wrappers',
-    '/caps/include',
+    '/caps',
     '/content/base/public',
     '/content/base/src',
     '/content/html/content/src',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index e2de6270d08a..1ae2769b7e3f 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -38,7 +38,7 @@ LOCAL_INCLUDES += [
     '../style',
     '../tables',
     '../xul',
-    '/caps/include',
+    '/caps',
     '/content/base/src',
     '/content/canvas/src',
     '/content/html/content/src',
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index 069a2d5c5c2e..8a7113095d1e 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -54,7 +54,7 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../build',
-    '/caps/include',
+    '/caps',
 ]
 
 FAIL_ON_WARNINGS = True