diff --git a/core/fxge/BUILD.gn b/core/fxge/BUILD.gn
index 32e8bf6..1944170 100644
--- a/core/fxge/BUILD.gn
+++ b/core/fxge/BUILD.gn
@@ -8,6 +8,8 @@
 
 source_set("fxge") {
   sources = [
+    "agg/cfx_agg_bitmapcomposer.cpp",
+    "agg/cfx_agg_bitmapcomposer.h",
     "agg/cfx_agg_imagerenderer.cpp",
     "agg/cfx_agg_imagerenderer.h",
     "agg/fx_agg_driver.cpp",
@@ -56,8 +58,6 @@
     "cfx_unicodeencoding.h",
     "dib/blend.cpp",
     "dib/blend.h",
-    "dib/cfx_bitmapcomposer.cpp",
-    "dib/cfx_bitmapcomposer.h",
     "dib/cfx_bitmapstorer.cpp",
     "dib/cfx_bitmapstorer.h",
     "dib/cfx_cmyk_to_srgb.cpp",
diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/agg/cfx_agg_bitmapcomposer.cpp
similarity index 98%
rename from core/fxge/dib/cfx_bitmapcomposer.cpp
rename to core/fxge/agg/cfx_agg_bitmapcomposer.cpp
index 5665ecf..3b37317 100644
--- a/core/fxge/dib/cfx_bitmapcomposer.cpp
+++ b/core/fxge/agg/cfx_agg_bitmapcomposer.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxge/dib/cfx_bitmapcomposer.h"
+#include "core/fxge/agg/cfx_agg_bitmapcomposer.h"
 
 #include <stddef.h>
 
diff --git a/core/fxge/dib/cfx_bitmapcomposer.h b/core/fxge/agg/cfx_agg_bitmapcomposer.h
similarity index 93%
rename from core/fxge/dib/cfx_bitmapcomposer.h
rename to core/fxge/agg/cfx_agg_bitmapcomposer.h
index ce5826e..bf4f68e 100644
--- a/core/fxge/dib/cfx_bitmapcomposer.h
+++ b/core/fxge/agg/cfx_agg_bitmapcomposer.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXGE_DIB_CFX_BITMAPCOMPOSER_H_
-#define CORE_FXGE_DIB_CFX_BITMAPCOMPOSER_H_
+#ifndef CORE_FXGE_AGG_CFX_AGG_BITMAPCOMPOSER_H_
+#define CORE_FXGE_AGG_CFX_AGG_BITMAPCOMPOSER_H_
 
 #include <stdint.h>
 
@@ -71,4 +71,4 @@
   DataVector<uint8_t> m_pAddClipScan;
 };
 
-#endif  // CORE_FXGE_DIB_CFX_BITMAPCOMPOSER_H_
+#endif  // CORE_FXGE_AGG_CFX_AGG_BITMAPCOMPOSER_H_
diff --git a/core/fxge/agg/cfx_agg_imagerenderer.h b/core/fxge/agg/cfx_agg_imagerenderer.h
index ccf1934..d497ec0 100644
--- a/core/fxge/agg/cfx_agg_imagerenderer.h
+++ b/core/fxge/agg/cfx_agg_imagerenderer.h
@@ -12,7 +12,7 @@
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
-#include "core/fxge/dib/cfx_bitmapcomposer.h"
+#include "core/fxge/agg/cfx_agg_bitmapcomposer.h"
 
 class CFX_DIBBase;
 class CFX_DIBitmap;