diff --git a/gfx/thebes/gfxFontSrcPrincipal.cpp b/gfx/thebes/gfxFontSrcPrincipal.cpp
index 46481b5c91e0..9d6c7683d894 100644
--- a/gfx/thebes/gfxFontSrcPrincipal.cpp
+++ b/gfx/thebes/gfxFontSrcPrincipal.cpp
@@ -7,6 +7,9 @@
 
 #include "nsProxyRelease.h"
 #include "nsURIHashKey.h"
+#include "mozilla/BasePrincipal.h"
+
+using mozilla::BasePrincipal;
 
 gfxFontSrcPrincipal::gfxFontSrcPrincipal(nsIPrincipal* aPrincipal)
 {
diff --git a/widget/nsBaseClipboard.h b/widget/nsBaseClipboard.h
index bb3d54cd0452..1f3f00125880 100644
--- a/widget/nsBaseClipboard.h
+++ b/widget/nsBaseClipboard.h
@@ -40,7 +40,6 @@ protected:
   bool                mIgnoreEmptyNotification;
   nsCOMPtr<nsIClipboardOwner> mClipboardOwner;
   nsCOMPtr<nsITransferable>   mTransferable;
-
 };
 
 #endif // nsBaseClipboard_h__
diff --git a/widget/windows/InkCollector.h b/widget/windows/InkCollector.h
index 82d33bbba6c9..c36e3345f8f3 100644
--- a/widget/windows/InkCollector.h
+++ b/widget/windows/InkCollector.h
@@ -64,7 +64,7 @@ public:
   void SetPointerId(uint16_t aPointerId);
   void ClearPointerId();
 
-  static StaticAutoPtr<InkCollector> sInkCollector;
+  static mozilla::StaticAutoPtr<InkCollector> sInkCollector;
 
 protected:
   void Initialize();
diff --git a/widget/windows/ScreenHelperWin.cpp b/widget/windows/ScreenHelperWin.cpp
index b067929bb7ba..accfec2c4a52 100644
--- a/widget/windows/ScreenHelperWin.cpp
+++ b/widget/windows/ScreenHelperWin.cpp
@@ -10,7 +10,7 @@
 #include "nsTArray.h"
 #include "WinUtils.h"
 
-static LazyLogModule sScreenLog("WidgetScreen");
+static mozilla::LazyLogModule sScreenLog("WidgetScreen");
 
 namespace mozilla {
 namespace widget {
diff --git a/widget/windows/nsColorPicker.cpp b/widget/windows/nsColorPicker.cpp
index c4a9d6823ece..ad72d1203beb 100644
--- a/widget/windows/nsColorPicker.cpp
+++ b/widget/windows/nsColorPicker.cpp
@@ -12,6 +12,7 @@
 #include "nsIWidget.h"
 #include "nsString.h"
 #include "WidgetUtils.h"
+#include "nsPIDOMWindow.h"
 
 using namespace mozilla::widget;
 
diff --git a/widget/windows/nsDataObj.cpp b/widget/windows/nsDataObj.cpp
index 2d06637f0e97..a3a5864fd454 100644
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -34,6 +34,7 @@
 #include "nsIContentPolicy.h"
 #include "nsContentUtils.h"
 #include "nsIPrincipal.h"
+#include "nsNativeCharsetUtils.h"
 
 #include "WinUtils.h"
 #include "mozilla/LazyIdleThread.h"
diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp
index ef0cfc593356..f03d1175a9ee 100644
--- a/widget/windows/nsDeviceContextSpecWin.cpp
+++ b/widget/windows/nsDeviceContextSpecWin.cpp
@@ -38,6 +38,9 @@
 #include "mozilla/gfx/PrintTargetSkPDF.h"
 #include "nsIUUIDGenerator.h"
 #include "mozilla/widget/PDFViaEMFPrintHelper.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsPrintfCString.h"
+#include "nsThreadUtils.h"
 #endif
 
 static mozilla::LazyLogModule kWidgetPrintingLogMod("printing-widget");
diff --git a/widget/windows/nsSound.cpp b/widget/windows/nsSound.cpp
index 763101b33b16..9a6bd70d4cfd 100644
--- a/widget/windows/nsSound.cpp
+++ b/widget/windows/nsSound.cpp
@@ -28,6 +28,7 @@
 #include "nsNativeCharsetUtils.h"
 #include "nsThreadUtils.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "gfxPlatform.h"
 
 using mozilla::LogLevel;
 
@@ -92,7 +93,7 @@ nsSound::GetInstance()
 {
   if (!sInstance) {
     if (gfxPlatform::IsHeadless()) {
-      sInstance = new widget::HeadlessSound();
+      sInstance = new mozilla::widget::HeadlessSound();
     } else {
       RefPtr<nsSound> sound = new nsSound();
       nsresult rv = sound->CreatePlayerThread();