diff --git a/include/minikin/SparseBitSet.h b/include/minikin/SparseBitSet.h
index 00babbbf2f5..2552d14d0b7 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 99edb874731..f41a20a4f9e 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 713ac84f0a2..452718217ff 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -490,7 +490,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,