diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in
deleted file mode 100644
index 78593c1315d9..000000000000
--- a/caps/src/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# 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/.
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(srcdir)/../include \
-		   -I$(topsrcdir)/js/xpconnect/src \
-		   -I$(topsrcdir)/dom/base
diff --git a/caps/src/moz.build b/caps/src/moz.build
index d5d553251916..2de4c3f620a0 100644
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -22,3 +22,8 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LOCAL_INCLUDES += [
+    '../include',
+    '/dom/base',
+    '/js/xpconnect/src',
+]
diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in
deleted file mode 100644
index bfdc5f722b8e..000000000000
--- a/image/encoders/bmp/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build
index 35ae8ac4cf5f..1c5cb9541d89 100644
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -16,3 +16,6 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LOCAL_INCLUDES += [
+    '/image/src',
+]
diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in
deleted file mode 100644
index 5d17eab6513f..000000000000
--- a/image/encoders/ico/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/.
-
-# Decoders need RasterImage.h
-LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
-LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
-LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build
index 80dba5e89e7f..1e39a9cee042 100644
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -16,3 +16,9 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+# Decoders need RasterImage.h
+LOCAL_INCLUDES += [
+    '../bmp',
+    '../png',
+    '/image/src',
+]
diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in
deleted file mode 100644
index befbfd9820fb..000000000000
--- a/parser/xml/src/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/.
-
-MOZILLA_INTERNAL_API = 1
diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in
deleted file mode 100644
index a49bef28b298..000000000000
--- a/toolkit/profile/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# 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/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../xre \
-  -I$(topsrcdir)/profile/dirserviceprovider/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build
index b5dff025f12d..15231378db32 100644
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -25,3 +25,7 @@ LIBRARY_NAME = 'profile_s'
 
 LIBXUL_LIBRARY = True
 
+LOCAL_INCLUDES += [
+    '../xre',
+    '/profile/dirserviceprovider/src',
+]