diff --git a/fxbarcode/cbc_codabar.cpp b/fxbarcode/cbc_codabar.cpp
index a766eb6..0c38653 100644
--- a/fxbarcode/cbc_codabar.cpp
+++ b/fxbarcode/cbc_codabar.cpp
@@ -23,6 +23,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "fxbarcode/oned/BC_OnedCodaBarWriter.h"
 
diff --git a/fxbarcode/cbc_codabar.h b/fxbarcode/cbc_codabar.h
index 7597ab8..aa4aaf1 100644
--- a/fxbarcode/cbc_codabar.h
+++ b/fxbarcode/cbc_codabar.h
@@ -7,11 +7,11 @@
 #ifndef FXBARCODE_CBC_CODABAR_H_
 #define FXBARCODE_CBC_CODABAR_H_
 
-#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/fx_string.h"
 #include "fxbarcode/cbc_onecode.h"
 
 class CBC_OnedCodaBarWriter;
+class CFX_Matrix;
 
 class CBC_Codabar final : public CBC_OneCode {
  public:
diff --git a/fxbarcode/cbc_code128.cpp b/fxbarcode/cbc_code128.cpp
index b4dc117..00251e3 100644
--- a/fxbarcode/cbc_code128.cpp
+++ b/fxbarcode/cbc_code128.cpp
@@ -23,6 +23,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "fxbarcode/oned/BC_OnedCode128Writer.h"
 
diff --git a/fxbarcode/cbc_code128.h b/fxbarcode/cbc_code128.h
index 04a05b5..946886c 100644
--- a/fxbarcode/cbc_code128.h
+++ b/fxbarcode/cbc_code128.h
@@ -7,11 +7,11 @@
 #ifndef FXBARCODE_CBC_CODE128_H_
 #define FXBARCODE_CBC_CODE128_H_
 
-#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/fx_string.h"
 #include "fxbarcode/cbc_onecode.h"
 
 class CBC_OnedCode128Writer;
+class CFX_Matrix;
 
 class CBC_Code128 final : public CBC_OneCode {
  public:
diff --git a/fxbarcode/cbc_code39.cpp b/fxbarcode/cbc_code39.cpp
index f09e3c4..c8c1b12 100644
--- a/fxbarcode/cbc_code39.cpp
+++ b/fxbarcode/cbc_code39.cpp
@@ -23,6 +23,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "fxbarcode/oned/BC_OnedCode39Writer.h"
 
diff --git a/fxbarcode/cbc_code39.h b/fxbarcode/cbc_code39.h
index b08e001..d1ab6b8 100644
--- a/fxbarcode/cbc_code39.h
+++ b/fxbarcode/cbc_code39.h
@@ -7,12 +7,12 @@
 #ifndef FXBARCODE_CBC_CODE39_H_
 #define FXBARCODE_CBC_CODE39_H_
 
-#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/cbc_onecode.h"
 
 class CBC_OnedCode39Writer;
+class CFX_Matrix;
+class CFX_RenderDevice;
 
 class CBC_Code39 final : public CBC_OneCode {
  public:
diff --git a/fxbarcode/cbc_codebase.h b/fxbarcode/cbc_codebase.h
index 1e12ae9..3e71b10 100644
--- a/fxbarcode/cbc_codebase.h
+++ b/fxbarcode/cbc_codebase.h
@@ -7,10 +7,11 @@
 #ifndef FXBARCODE_CBC_CODEBASE_H_
 #define FXBARCODE_CBC_CODEBASE_H_
 
+#include <stdint.h>
+
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "core/fxge/dib/fx_dib.h"
 #include "fxbarcode/BC_Library.h"
 
diff --git a/fxbarcode/cbc_datamatrix.cpp b/fxbarcode/cbc_datamatrix.cpp
index bfd2885..43edb5a 100644
--- a/fxbarcode/cbc_datamatrix.cpp
+++ b/fxbarcode/cbc_datamatrix.cpp
@@ -24,6 +24,7 @@
 #include <memory>
 #include <vector>
 
+#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "fxbarcode/datamatrix/BC_DataMatrixWriter.h"
 
diff --git a/fxbarcode/cbc_datamatrix.h b/fxbarcode/cbc_datamatrix.h
index 919a339..c46cc28 100644
--- a/fxbarcode/cbc_datamatrix.h
+++ b/fxbarcode/cbc_datamatrix.h
@@ -8,10 +8,11 @@
 #define FXBARCODE_CBC_DATAMATRIX_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/cbc_codebase.h"
 
 class CBC_DataMatrixWriter;
+class CFX_Matrix;
+class CFX_RenderDevice;
 
 class CBC_DataMatrix final : public CBC_CodeBase {
  public:
diff --git a/fxbarcode/cbc_ean13.h b/fxbarcode/cbc_ean13.h
index 39350d7..fe70043 100644
--- a/fxbarcode/cbc_ean13.h
+++ b/fxbarcode/cbc_ean13.h
@@ -7,7 +7,8 @@
 #ifndef FXBARCODE_CBC_EAN13_H_
 #define FXBARCODE_CBC_EAN13_H_
 
-#include "core/fxcrt/fx_system.h"
+#include <stddef.h>
+
 #include "fxbarcode/cbc_eancode.h"
 
 class CBC_EAN13 final : public CBC_EANCode {
diff --git a/fxbarcode/cbc_ean8.h b/fxbarcode/cbc_ean8.h
index d3a4309..8d96839 100644
--- a/fxbarcode/cbc_ean8.h
+++ b/fxbarcode/cbc_ean8.h
@@ -7,7 +7,8 @@
 #ifndef FXBARCODE_CBC_EAN8_H_
 #define FXBARCODE_CBC_EAN8_H_
 
-#include "core/fxcrt/fx_system.h"
+#include <stddef.h>
+
 #include "fxbarcode/cbc_eancode.h"
 
 class CBC_EAN8 final : public CBC_EANCode {
diff --git a/fxbarcode/cbc_onecode.h b/fxbarcode/cbc_onecode.h
index 637aad2..0fb3c64 100644
--- a/fxbarcode/cbc_onecode.h
+++ b/fxbarcode/cbc_onecode.h
@@ -7,9 +7,11 @@
 #ifndef FXBARCODE_CBC_ONECODE_H_
 #define FXBARCODE_CBC_ONECODE_H_
 
+#include <stdint.h>
+
 #include <memory>
 
-#include "core/fxcrt/fx_system.h"
+#include "core/fxge/dib/fx_dib.h"
 #include "fxbarcode/cbc_codebase.h"
 
 class CBC_OneDimWriter;
diff --git a/fxbarcode/cbc_pdf417i.h b/fxbarcode/cbc_pdf417i.h
index 9ceb31c..5348df0 100644
--- a/fxbarcode/cbc_pdf417i.h
+++ b/fxbarcode/cbc_pdf417i.h
@@ -8,10 +8,11 @@
 #define FXBARCODE_CBC_PDF417I_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/cbc_codebase.h"
 
 class CBC_PDF417Writer;
+class CFX_Matrix;
+class CFX_RenderDevice;
 
 class CBC_PDF417I final : public CBC_CodeBase {
  public:
diff --git a/fxbarcode/cbc_qrcode.h b/fxbarcode/cbc_qrcode.h
index f257417..a015858 100644
--- a/fxbarcode/cbc_qrcode.h
+++ b/fxbarcode/cbc_qrcode.h
@@ -8,10 +8,11 @@
 #define FXBARCODE_CBC_QRCODE_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/cbc_codebase.h"
 
 class CBC_QRCodeWriter;
+class CFX_Matrix;
+class CFX_RenderDevice;
 
 class CBC_QRCode final : public CBC_CodeBase {
  public:
diff --git a/fxbarcode/cbc_upca.h b/fxbarcode/cbc_upca.h
index f02273b..1edb269 100644
--- a/fxbarcode/cbc_upca.h
+++ b/fxbarcode/cbc_upca.h
@@ -7,7 +7,8 @@
 #ifndef FXBARCODE_CBC_UPCA_H_
 #define FXBARCODE_CBC_UPCA_H_
 
-#include "core/fxcrt/fx_system.h"
+#include <stddef.h>
+
 #include "fxbarcode/cbc_eancode.h"
 
 class CBC_UPCA final : public CBC_EANCode {
diff --git a/fxbarcode/cfx_barcode.h b/fxbarcode/cfx_barcode.h
index da3f094..108c749 100644
--- a/fxbarcode/cfx_barcode.h
+++ b/fxbarcode/cfx_barcode.h
@@ -7,11 +7,11 @@
 #ifndef FXBARCODE_CFX_BARCODE_H_
 #define FXBARCODE_CFX_BARCODE_H_
 
+#include <stdint.h>
+
 #include <memory>
 
-#include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "core/fxge/dib/fx_dib.h"
 #include "fxbarcode/BC_Library.h"
 
diff --git a/fxbarcode/common/BC_CommonBitMatrix.h b/fxbarcode/common/BC_CommonBitMatrix.h
index ce40ade..7182a52 100644
--- a/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/fxbarcode/common/BC_CommonBitMatrix.h
@@ -7,9 +7,9 @@
 #ifndef FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
 #define FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
 
-#include <vector>
+#include <stdint.h>
 
-#include "core/fxcrt/fx_system.h"
+#include <vector>
 
 class CBC_CommonBitMatrix {
  public:
diff --git a/fxbarcode/common/BC_CommonByteMatrix.h b/fxbarcode/common/BC_CommonByteMatrix.h
index c219aaa..0b95f73 100644
--- a/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/fxbarcode/common/BC_CommonByteMatrix.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "core/fxcrt/fx_memory_wrappers.h"
-#include "core/fxcrt/fx_system.h"
 #include "third_party/base/span.h"
 
 class CBC_CommonByteMatrix final {
diff --git a/fxbarcode/datamatrix/BC_SymbolInfo.h b/fxbarcode/datamatrix/BC_SymbolInfo.h
index 77a14c9..ce40f74 100644
--- a/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -7,7 +7,8 @@
 #ifndef FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
 #define FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
 
-#include "core/fxcrt/fx_system.h"
+#include <stddef.h>
+#include <stdint.h>
 
 class CBC_SymbolInfo {
  public:
diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index 4c63e05..d3039d3 100644
--- a/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -7,10 +7,12 @@
 #ifndef FXBARCODE_ONED_BC_ONEDIMWRITER_H_
 #define FXBARCODE_ONED_BC_ONEDIMWRITER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_textrenderoptions.h"
 #include "fxbarcode/BC_Library.h"
diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.h b/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 6feb380..0c03d75 100644
--- a/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -7,8 +7,9 @@
 #ifndef FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
 #define FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
 
+#include <stdint.h>
+
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/BC_Library.h"
 #include "fxbarcode/oned/BC_OneDimWriter.h"
 
diff --git a/fxbarcode/oned/BC_OnedCode128Writer.h b/fxbarcode/oned/BC_OnedCode128Writer.h
index 370c025..6635e6c 100644
--- a/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -7,10 +7,11 @@
 #ifndef FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
 #define FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CBC_OnedCode128Writer final : public CBC_OneDimWriter {
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.h b/fxbarcode/oned/BC_OnedEAN13Writer.h
index 4810d5b..69a0b20 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -7,8 +7,9 @@
 #ifndef FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
 #define FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
 
+#include <stdint.h>
+
 #include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/fx_system.h"
 #include "fxbarcode/oned/BC_OnedEANWriter.h"
 
 class CFX_RenderDevice;