diff --git a/include/minikin/SparseBitSet.h b/include/minikin/SparseBitSet.h
index 72b83057c6cddcee2c4c3f53a52c9746293c0355..81f67c8f963587a3c6f96fb4728e56681e4ab6e8 100644
--- a/include/minikin/SparseBitSet.h
+++ b/include/minikin/SparseBitSet.h
@@ -19,7 +19,8 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <UniquePtr.h>
+
+#include <memory>
 
 // ---------------------------------------------------------------------------
 
@@ -79,8 +80,8 @@ private:
     static int CountLeadingZeros(element x);
 
     uint32_t mMaxVal;
-    UniquePtr<uint32_t[]> mIndices;
-    UniquePtr<element[]> mBitmaps;
+    std::unique_ptr<uint32_t[]> mIndices;
+    std::unique_ptr<element[]> mBitmaps;
     uint32_t mZeroPageIndex;
 };
 
diff --git a/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index e2d86f0bbb0add15d342628167886575f54f6f26..7a8e79f508f9a87334c0144928599af905ce1d12 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/libs/minikin/FontFamily.cpp
@@ -34,7 +34,6 @@
 #include <minikin/AnalyzeStyle.h>
 #include <minikin/CmapCoverage.h>
 #include <minikin/FontFamily.h>
-#include <UniquePtr.h>
 
 using std::vector;
 
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 9c1d6a873a5c0eac294ccb40ff5cc441853d1c33..5ba72a4bb2c4fba27fbfb549d65f99e69ab8b462 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -496,7 +496,8 @@ private:
     size_t mRunCount;
     bool mIsRtl;
 
-    DISALLOW_COPY_AND_ASSIGN(BidiText);
+    BidiText(const BidiText&) = delete;
+    void operator=(const BidiText&) = delete;
 };
 
 BidiText::Iter::Iter(UBiDi* bidi, size_t start, size_t end, size_t runIndex, size_t runCount,