3 files changed, 14 insertions, 4 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h
index 944dd4aa6c..0d3db83421 100644
--- a/xfa/include/fwl/basewidget/fwl_barcode.h
+++ b/xfa/include/fwl/basewidget/fwl_barcode.h
@@ -7,11 +7,11 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_
 
+#include "xfa/fxbarcode/include/BC_Library.h"
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
-#include "xfa/include/fxbarcode/BC_BarCode.h"
 
 class CFWL_WidgetImpProperties;
-class IFWL_Barcode;
+
 #define FWL_CLASS_Barcode L"FWL_BARCODE"
 #define FWL_CLASSHASH_Barcode 366886968
 #define FWL_BCDATTRIBUTE_CHARENCODING (1L << 0)
@@ -31,6 +31,7 @@ class IFWL_Barcode;
 #define FWL_PART_BCD_Edge 2
 #define FWL_PART_BCD_Background 3
 #define FWL_BCUPDATECMD_Data FWL_WGTUPDATECMD_User
+
 class IFWL_BarcodeDP : public IFWL_EditDP {
  public:
   virtual BC_CHAR_ENCODING GetCharEncoding() = 0;
diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h
index c6ef766f7f..58ce11727c 100644
--- a/xfa/include/fwl/basewidget/fxmath_barcode.h
+++ b/xfa/include/fwl/basewidget/fxmath_barcode.h
@@ -7,12 +7,21 @@
 #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
 #define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
 
-#include "xfa/include/fxbarcode/BC_BarCode.h"
+#include "core/include/fxcrt/fx_string.h"
+#include "core/include/fxcrt/fx_system.h"
+#include "core/include/fxge/fx_dib.h"
+#include "xfa/fxbarcode/include/BC_Library.h"
+
+class CFX_Font;
+class CFX_Matrix;
+class CFX_RenderDevice;
 
 class IFX_Barcode {
  public:
   virtual ~IFX_Barcode() {}
+
   virtual void Release() = 0;
+
   virtual BC_TYPE GetType() = 0;
   virtual FX_BOOL Encode(const CFX_WideStringC& contents,
                          FX_BOOL isDevice,
@@ -47,6 +56,7 @@ class IFX_Barcode {
   virtual FX_BOOL SetErrorCorrectionLevel(int32_t level) = 0;
   virtual FX_BOOL SetTruncated(FX_BOOL truncated) = 0;
 };
+
 IFX_Barcode* FX_Barcode_Create(BC_TYPE type);
 
 #endif  // XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index 2dec2a8806..7056f3ac58 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/include/fwl/lightwidget/barcode.h
@@ -10,7 +10,6 @@
 #include "xfa/include/fwl/basewidget/fwl_barcode.h"
 #include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fwl/lightwidget/edit.h"
-#include "xfa/include/fxbarcode/BC_BarCode.h"
 
 class CFWL_Widget;
 class CFWL_WidgetProperties;