diff --git a/README.md b/README.md
index 739d014..76bbc60 100644
--- a/README.md
+++ b/README.md
@@ -110,16 +110,8 @@
 For sample applications like `pdfium_test` to build, one must set
 `pdf_is_standalone = true`.
 
-By default, the entire project builds with C++14, because features like V8
-support, XFA support, and the Skia backend all have dependencies on libraries
-that require C++14. If one does not need any of those features, and need to fall
-back to building in C++11 mode, then set `use_cxx11 = true`. This fallback is
-temporary and will go away in the future when PDFium fully transitions to C++14.
-See [this bug](https://crbug.com/pdfium/1407) for details.
-
-When building with the experimental Skia backend, Skia itself it built with
-C++17. There is no configuration for this. One just has to use a build toolchain
-that supports C++17.
+By default, the entire project builds with C++14. When building with the
+experimental Skia backend, Skia itself it built with C++17.
 
 When complete the arguments will be stored in `<directory>/args.gn`, and
 GN will automatically use the new arguments to generate build files.
@@ -255,10 +247,6 @@
 1. Code has to conform to the existing style and not Chromium/Google style.
 2. PDFium uses a different Gerrit instance for code reviews, and credentials for
 this Gerrit instance need to be generated before uploading changes.
-3. PDFium is transitioning to C++14, but still supports C++11 compatibility
-for the duration of the transition period. Prefer to use only C++11 features,
-though technically C++14 is allowed in code that is only built when V8, XFA, or
-Skia is turned on.
 
 Before submitting a fix for a bug, it can help if you create an issue in the
 bug tracker. This allows easier discussion about the problem and also helps
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index dd3c1fb..ba9c618 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -14,7 +14,6 @@
 #include "build/build_config.h"
 #include "core/fxcrt/fileaccess_iface.h"
 #include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/ptr_util.h"
 
 #if defined(OS_WIN)
 #include <direct.h>
@@ -123,7 +122,7 @@
 }
 
 FX_FolderHandle* FX_OpenFolder(const char* path) {
-  auto handle = pdfium::MakeUnique<FX_FolderHandle>();
+  auto handle = std::make_unique<FX_FolderHandle>();
 #if defined(OS_WIN)
   handle->m_Handle =
       FindFirstFileExA((ByteString(path) + "/*.*").c_str(), FindExInfoStandard,