diff --git a/core/fpdfapi/parser/cpdf_hint_tables.h b/core/fpdfapi/parser/cpdf_hint_tables.h
index 6b6a589..e3f280f 100644
--- a/core/fpdfapi/parser/cpdf_hint_tables.h
+++ b/core/fpdfapi/parser/cpdf_hint_tables.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "core/fpdfapi/parser/cpdf_data_avail.h"
-#include "core/fxcrt/fx_stream.h"
 #include "core/fxcrt/unowned_ptr.h"
 
 class CFX_BitStream;
diff --git a/core/fpdfapi/parser/cpdf_linearized_header.h b/core/fpdfapi/parser/cpdf_linearized_header.h
index cb8bb57..44e0422 100644
--- a/core/fpdfapi/parser/cpdf_linearized_header.h
+++ b/core/fpdfapi/parser/cpdf_linearized_header.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fxcrt/fx_stream.h"
+#include "core/fxcrt/fx_system.h"
 
 class CPDF_Dictionary;
 class CPDF_Object;
diff --git a/core/fxcrt/cfx_fileaccess_posix.cpp b/core/fxcrt/cfx_fileaccess_posix.cpp
index b62118d..f08df66 100644
--- a/core/fxcrt/cfx_fileaccess_posix.cpp
+++ b/core/fxcrt/cfx_fileaccess_posix.cpp
@@ -12,6 +12,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/fx_stream.h"
 #include "third_party/base/ptr_util.h"
 
 #ifndef O_BINARY
diff --git a/core/fxcrt/cfx_fileaccess_windows.cpp b/core/fxcrt/cfx_fileaccess_windows.cpp
index b6fa2e0..d1e5ff1 100644
--- a/core/fxcrt/cfx_fileaccess_windows.cpp
+++ b/core/fxcrt/cfx_fileaccess_windows.cpp
@@ -8,6 +8,7 @@
 
 #include <memory>
 
+#include "core/fxcrt/fx_stream.h"
 #include "core/fxcrt/fx_string.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/core/fxcrt/fileaccess_iface.h b/core/fxcrt/fileaccess_iface.h
index 2b357e8..c744b54 100644
--- a/core/fxcrt/fileaccess_iface.h
+++ b/core/fxcrt/fileaccess_iface.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "core/fxcrt/fx_safe_types.h"
-#include "core/fxcrt/fx_stream.h"
 #include "core/fxcrt/fx_string.h"
 
 class FileAccessIface {