--- a/xpcom/idl-parser/xpidl/Makefile.in
+++ b/xpcom/idl-parser/xpidl/Makefile.in
@@ -18,20 +18,16 @@ SDK_BINARY = \
 SDK_BINARY_TARGET = xpidl-parser
 
 PLY_FILES = \
   $(topsrcdir)/other-licenses/ply/ply/__init__.py \
   $(topsrcdir)/other-licenses/ply/ply/lex.py \
   $(topsrcdir)/other-licenses/ply/ply/yacc.py \
   $(NULL)
 
-PLY_DEST = $(SDK_BIN_DIR)/ply
-INSTALL_TARGETS += PLY
-PLY_TARGET = xpidl-parser
-
 include $(topsrcdir)/config/rules.mk
 
 # Generate the PLY lexer and parser.
 $(IDL_PARSER_CACHE_DIR)/xpidllex.py: $(PARSER_SRCS) $(PLY_FILES)
 	$(PYTHON_PATH) \
 	  $(PLY_INCLUDE) \
 	  $(srcdir)/header.py --cachedir=$(IDL_PARSER_CACHE_DIR) --regen
 

--- a/xpcom/idl-parser/xpidl/moz.build
+++ b/xpcom/idl-parser/xpidl/moz.build
@@ -2,8 +2,14 @@
 # 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/.
 
 PYTHON_UNIT_TESTS += [
     'runtests.py',
 ]
+
+SDK_FILES.bin.ply += [
+    '/other-licenses/ply/ply/__init__.py',
+    '/other-licenses/ply/ply/lex.py',
+    '/other-licenses/ply/ply/yacc.py',
+]

deleted file mode 100644
--- a/xpcom/typelib/xpt/tools/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/.
-
-XPT_TOOL_FILES := xpt.py
-# SDK_BIN_DIR is declared in config.mk, so this needs to be a deferred
-# assignment.
-XPT_TOOL_DEST = $(SDK_BIN_DIR)
-XPT_TOOL_TARGET := export
-INSTALL_TARGETS += XPT_TOOL

--- a/xpcom/typelib/xpt/tools/moz.build
+++ b/xpcom/typelib/xpt/tools/moz.build
@@ -2,8 +2,12 @@
 # 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/.
 
 PYTHON_UNIT_TESTS += [
     'runtests.py',
 ]
+
+SDK_FILES.bin += [
+    'xpt.py',
+]