diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 52064e2b2c1..d2b7847ed71 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -40,7 +40,6 @@
 #include "nsIScriptElement.h"
 #include "nsScriptLoader.h"
 #include "nsStyleLinkElement.h"
-#include "nsIImageLoadingContent.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsICookieService.h"
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
index 745ba03b433..94fac24e008 100644
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -58,7 +58,6 @@ using mozilla::DefaultXDisplay;
 #include "nsFocusManager.h"
 #include "nsIDOMDragEvent.h"
 #include "nsIScrollableFrame.h"
-#include "nsIImageLoadingContent.h"
 #include "nsIDocShell.h"
 
 #include "nsContentCID.h"
diff --git a/gfx/harfbuzz/src/check-exported-symbols.sh b/gfx/harfbuzz/src/check-exported-symbols.sh
old mode 100755
new mode 100644
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 7ee1e8240d2..363800feeac 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -36,7 +36,6 @@
 #include "nsIDOMHTMLMapElement.h"
 #include "nsTransform2D.h"
 #include "nsITheme.h"
-#include "nsIImageLoadingContent.h"
 
 #include "nsIServiceManager.h"
 #include "nsIURI.h"
diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
index 624182d118b..2592a3faf35 100644
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -46,6 +46,8 @@ else ifeq ($(OS_ARCH),Darwin)
 CPPSRCS += TimeStamp_darwin.cpp
 else ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += TimeStamp_windows.cpp
+else
+$(error No TimeStamp implementation on this platform.  Build will not succeed)
 endif
 
 EXPORTS_NAMESPACES = mozilla