diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
index db4a754..a6de007 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
@@ -207,6 +207,6 @@
   registered_crossrefs_.insert(crossref_offset);
 }
 
-fxcrt::RetainPtr<CPDF_ReadValidator> CPDF_CrossRefAvail::GetValidator() {
+RetainPtr<CPDF_ReadValidator> CPDF_CrossRefAvail::GetValidator() {
   return parser_->GetValidator();
 }
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail.h b/core/fpdfapi/parser/cpdf_cross_ref_avail.h
index fa74bce..e550410 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_avail.h
+++ b/core/fpdfapi/parser/cpdf_cross_ref_avail.h
@@ -40,9 +40,9 @@
 
   void AddCrossRefForCheck(FX_FILESIZE crossref_offset);
 
-  fxcrt::RetainPtr<CPDF_ReadValidator> GetValidator();
+  RetainPtr<CPDF_ReadValidator> GetValidator();
 
-  fxcrt::UnownedPtr<CPDF_SyntaxParser> parser_;
+  UnownedPtr<CPDF_SyntaxParser> parser_;
   const FX_FILESIZE last_crossref_offset_ = 0;
   CPDF_DataAvail::DocAvailStatus current_status_ =
       CPDF_DataAvail::DataNotAvailable;
diff --git a/testing/fake_file_access.cpp b/testing/fake_file_access.cpp
index 290a10d..723f772 100644
--- a/testing/fake_file_access.cpp
+++ b/testing/fake_file_access.cpp
@@ -32,7 +32,7 @@
   }
 
  private:
-  fxcrt::UnownedPtr<FakeFileAccess> simulator_;
+  UnownedPtr<FakeFileAccess> simulator_;
 };
 
 class FileAvailImpl final : public FX_FILEAVAIL {
@@ -50,7 +50,7 @@
   }
 
  private:
-  fxcrt::UnownedPtr<FakeFileAccess> simulator_;
+  UnownedPtr<FakeFileAccess> simulator_;
 };
 
 class DownloadHintsImpl final : public FX_DOWNLOADHINTS {
@@ -69,7 +69,7 @@
   }
 
  private:
-  fxcrt::UnownedPtr<FakeFileAccess> simulator_;
+  UnownedPtr<FakeFileAccess> simulator_;
 };
 
 }  // namespace
diff --git a/testing/fake_file_access.h b/testing/fake_file_access.h
index 1328b16..c8c08e3 100644
--- a/testing/fake_file_access.h
+++ b/testing/fake_file_access.h
@@ -31,7 +31,7 @@
   void SetWholeFileAvailable();
 
  private:
-  fxcrt::UnownedPtr<FPDF_FILEACCESS> file_access_;
+  UnownedPtr<FPDF_FILEACCESS> file_access_;
   std::unique_ptr<FPDF_FILEACCESS> file_access_wrapper_;
   std::unique_ptr<FX_FILEAVAIL> file_avail_;
   std::unique_ptr<FX_DOWNLOADHINTS> download_hints_;