diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp
index 8d7446a941e9..0148f922d96e 100644
--- a/gfx/ipc/GPUParent.cpp
+++ b/gfx/ipc/GPUParent.cpp
@@ -3,9 +3,6 @@
 /* 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/. */
-#ifdef XP_WIN
-#include "WMF.h"
-#endif
 #include "GPUParent.h"
 #include "gfxConfig.h"
 #include "gfxPlatform.h"
@@ -77,9 +74,6 @@ GPUParent::Init(base::ProcessId aParentPid,
   VRManager::ManagerInit();
   LayerTreeOwnerTracker::Initialize();
   mozilla::ipc::SetThisProcessName("GPU Process");
-#ifdef XP_WIN
-  wmf::MFStartup();
-#endif
   return true;
 }
 
@@ -279,10 +273,6 @@ GPUParent::ActorDestroy(ActorDestroyReason aWhy)
     ProcessChild::QuickExit();
   }
 
-#ifdef XP_WIN
-  wmf::MFShutdown();
-#endif
-
 #ifndef NS_FREE_PERMANENT_DATA
   // No point in going through XPCOM shutdown because we don't keep persistent
   // state.
diff --git a/gfx/ipc/GPUProcessHost.cpp b/gfx/ipc/GPUProcessHost.cpp
index 3e2b68611c62..d1214a0e8f66 100644
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -13,8 +13,6 @@
 namespace mozilla {
 namespace gfx {
 
-using namespace ipc;
-
 GPUProcessHost::GPUProcessHost(Listener* aListener)
  : GeckoChildProcessHost(GeckoProcessType_GPU),
    mListener(aListener),
diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build
index cbe62301a214..372356c0865a 100644
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -46,6 +46,7 @@ UNIFIED_SOURCES += [
     'CompositorWidgetVsyncObserver.cpp',
     'D3DMessageUtils.cpp',
     'GPUChild.cpp',
+    'GPUParent.cpp',
     'GPUProcessHost.cpp',
     'GPUProcessImpl.cpp',
     'GPUProcessManager.cpp',
@@ -57,10 +58,6 @@ UNIFIED_SOURCES += [
     'VsyncIOThreadHolder.cpp',
 ]
 
-SOURCES += [
-    'GPUParent.cpp',
-]
-
 IPDL_SOURCES = [
     'GraphicsMessages.ipdlh',
     'PGPU.ipdl',