diff --git a/core/fxge/BUILD.gn b/core/fxge/BUILD.gn
index 3e24966..d487adf 100644
--- a/core/fxge/BUILD.gn
+++ b/core/fxge/BUILD.gn
@@ -177,11 +177,13 @@
 
   if (is_win) {
     sources += [
+      "cfx_windowsrenderdevice.cpp",
       "cfx_windowsrenderdevice.h",
       "dib/cfx_dibextractor.cpp",
       "dib/cfx_dibextractor.h",
       "win32/cfx_psrenderer.cpp",
       "win32/cfx_psrenderer.h",
+      "win32/cfx_windowsdib.cpp",
       "win32/cfx_windowsdib.h",
       "win32/cgdi_device_driver.cpp",
       "win32/cgdi_device_driver.h",
@@ -199,8 +201,6 @@
       "win32/ctext_only_printer_driver.h",
       "win32/cwin32_platform.cpp",
       "win32/cwin32_platform.h",
-      "win32/fx_win32_device.cpp",
-      "win32/fx_win32_dib.cpp",
     ]
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
@@ -240,7 +240,7 @@
   }
 
   if (is_win) {
-    sources += [ "win32/fx_win32_device_embeddertest.cpp" ]
+    sources += [ "cfx_windowsrenderdevice_embeddertest.cpp" ]
     deps += [
       ":fxge",
       "../fxcodec",
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/cfx_windowsrenderdevice.cpp
similarity index 99%
rename from core/fxge/win32/fx_win32_device.cpp
rename to core/fxge/cfx_windowsrenderdevice.cpp
index d48626d..c4cd5e7 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/cfx_windowsrenderdevice.cpp
@@ -4,11 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxge/cfx_windowsrenderdevice.h"
+
 #include <memory>
 
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxge/cfx_folderfontinfo.h"
-#include "core/fxge/cfx_windowsrenderdevice.h"
 #include "core/fxge/systemfontinfo_iface.h"
 #include "core/fxge/win32/cgdi_display_driver.h"
 #include "core/fxge/win32/cgdi_printer_driver.h"
diff --git a/core/fxge/win32/fx_win32_device_embeddertest.cpp b/core/fxge/cfx_windowsrenderdevice_embeddertest.cpp
similarity index 100%
rename from core/fxge/win32/fx_win32_device_embeddertest.cpp
rename to core/fxge/cfx_windowsrenderdevice_embeddertest.cpp
diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/cfx_windowsdib.cpp
similarity index 100%
rename from core/fxge/win32/fx_win32_dib.cpp
rename to core/fxge/win32/cfx_windowsdib.cpp