diff --git a/libs/minikin/CmapCoverage.cpp b/libs/minikin/CmapCoverage.cpp
index 2961d2ffa8d57dd66efc489ae50f5fcf66caffac..86d8981c8b0ec8bc8a25d6eb4a8c0fe71ba581ca 100644
--- a/libs/minikin/CmapCoverage.cpp
+++ b/libs/minikin/CmapCoverage.cpp
@@ -17,11 +17,12 @@
 // Determine coverage of font given its raw "cmap" OpenType table
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
 
 #include <vector>
 using std::vector;
 
+#include <log/log.h>
+
 #include <minikin/SparseBitSet.h>
 #include <minikin/CmapCoverage.h>
 
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index 33418ab1b5d9399674c198f44c8bb41a2c49190f..ddda7bc09a6b4e4d28416c1dbd71f314ea908fd4 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -17,9 +17,10 @@
 // #define VERBOSE_DEBUG
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
+
 #include <algorithm>
 
+#include <android/log.h>
 #include "unicode/unistr.h"
 #include "unicode/unorm2.h"
 
diff --git a/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index 7a8e79f508f9a87334c0144928599af905ce1d12..6d45c67126e8438c9be4387045931eab19525f28 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/libs/minikin/FontFamily.cpp
@@ -16,24 +16,24 @@
 
 #define LOG_TAG "Minikin"
 
-#include <cutils/log.h>
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include <android/log.h>
+#include <utils/JenkinsHash.h>
+
 #include <hb.h>
 #include <hb-ot.h>
 
-#include <utils/JenkinsHash.h>
-
 #include "FontLanguage.h"
 #include "FontLanguageListCache.h"
 #include "HbFontCache.h"
 #include "MinikinInternal.h"
-#include <minikin/MinikinFont.h>
 #include <minikin/AnalyzeStyle.h>
 #include <minikin/CmapCoverage.h>
 #include <minikin/FontFamily.h>
+#include <minikin/MinikinFont.h>
 
 using std::vector;
 
diff --git a/libs/minikin/FontLanguageListCache.cpp b/libs/minikin/FontLanguageListCache.cpp
index 6b661f038469ff5ec1675756efccbec2e4273f90..9a409e658bf22c8879a36973c4b776c73859c149 100644
--- a/libs/minikin/FontLanguageListCache.cpp
+++ b/libs/minikin/FontLanguageListCache.cpp
@@ -18,12 +18,13 @@
 
 #include "FontLanguageListCache.h"
 
-#include <cutils/log.h>
 #include <unicode/uloc.h>
 #include <unordered_set>
 
-#include "MinikinInternal.h"
+#include <android/log.h>
+
 #include "FontLanguage.h"
+#include "MinikinInternal.h"
 
 namespace android {
 
diff --git a/libs/minikin/HbFontCache.cpp b/libs/minikin/HbFontCache.cpp
index 3be942d7b9ed2f44ea97dc93ef49d56b0fd2faf2..08687571ba8e9eb0edc4c0ea2d5c687259f2d4bd 100644
--- a/libs/minikin/HbFontCache.cpp
+++ b/libs/minikin/HbFontCache.cpp
@@ -18,10 +18,11 @@
 
 #include "HbFontCache.h"
 
-#include <cutils/log.h>
+#include <android/log.h>
+#include <utils/LruCache.h>
+
 #include <hb.h>
 #include <hb-ot.h>
-#include <utils/LruCache.h>
 
 #include <minikin/MinikinFont.h>
 #include "MinikinInternal.h"
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index 5ba72a4bb2c4fba27fbfb549d65f99e69ab8b462..45cb06680ff3be10bb623ccfa6310557d57dcd89 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -15,29 +15,28 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
-
-#include <math.h>
 
 #include <algorithm>
 #include <fstream>
 #include <iostream>  // for debugging
+#include <math.h>
 #include <string>
+#include <unicode/ubidi.h>
 #include <vector>
 
+#include <android/log.h>
 #include <utils/JenkinsHash.h>
 #include <utils/LruCache.h>
 #include <utils/Singleton.h>
 #include <utils/String16.h>
 
-#include <unicode/ubidi.h>
 #include <hb-icu.h>
 #include <hb-ot.h>
 
 #include "FontLanguage.h"
 #include "FontLanguageListCache.h"
-#include "LayoutUtils.h"
 #include "HbFontCache.h"
+#include "LayoutUtils.h"
 #include "MinikinInternal.h"
 #include <minikin/MinikinFontFreeType.h>
 #include <minikin/Layout.h>
diff --git a/libs/minikin/LineBreaker.cpp b/libs/minikin/LineBreaker.cpp
index 2a71f044d239e7265dcef5731311d65a72f135f5..bc8cb800ee717449b97275b574f4022bf7edc263 100644
--- a/libs/minikin/LineBreaker.cpp
+++ b/libs/minikin/LineBreaker.cpp
@@ -16,10 +16,11 @@
 
 #define VERBOSE_DEBUG 0
 
+#define LOG_TAG "Minikin"
+
 #include <limits>
 
-#define LOG_TAG "Minikin"
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include <minikin/Layout.h>
 #include <minikin/LineBreaker.h>
diff --git a/libs/minikin/Measurement.cpp b/libs/minikin/Measurement.cpp
index 1ba6678373b9edd23b70d1b211e400133177c938..b292c9aba94cca52242333e2fbe769c7ddda60fe 100644
--- a/libs/minikin/Measurement.cpp
+++ b/libs/minikin/Measurement.cpp
@@ -15,11 +15,12 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
 
 #include <cmath>
 #include <unicode/uchar.h>
 
+#include <android/log.h>
+
 #include <minikin/GraphemeBreak.h>
 #include <minikin/Measurement.h>
 
diff --git a/libs/minikin/MinikinInternal.cpp b/libs/minikin/MinikinInternal.cpp
index 5cb94914c9ebd90497aeac211634bd6a971d5b33..5900c1852cac73134ba2f5c4f14f79c2226ca606 100644
--- a/libs/minikin/MinikinInternal.cpp
+++ b/libs/minikin/MinikinInternal.cpp
@@ -15,12 +15,13 @@
  */
 
 // Definitions internal to Minikin
+#define LOG_TAG "Minikin"
 
 #include "MinikinInternal.h"
 #include "HbFontCache.h"
 #include "generated/UnicodeData.h"
 
-#include <cutils/log.h>
+#include <android/log.h>
 
 namespace android {
 
diff --git a/libs/minikin/SparseBitSet.cpp b/libs/minikin/SparseBitSet.cpp
index de0791445cdcb8d341b7818debd55852d7b9e2d7..aa73c126707ab0131f4b2088b8117cd8255e8c2b 100644
--- a/libs/minikin/SparseBitSet.cpp
+++ b/libs/minikin/SparseBitSet.cpp
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
+#define LOG_TAG "SparseBitSet"
+
 #include <stddef.h>
 #include <string.h>
+
+#include <android/log.h>
+
 #include <minikin/SparseBitSet.h>
 
 namespace android {
diff --git a/libs/minikin/WordBreaker.cpp b/libs/minikin/WordBreaker.cpp
index 38f03caf6a0897608d843c6165121528e71418e7..7fc5824b6d0ef2441511aebc9787f98094b116b5 100644
--- a/libs/minikin/WordBreaker.cpp
+++ b/libs/minikin/WordBreaker.cpp
@@ -15,7 +15,8 @@
  */
 
 #define LOG_TAG "Minikin"
-#include <cutils/log.h>
+
+#include <android/log.h>
 
 #include <minikin/WordBreaker.h>
 #include "MinikinInternal.h"
diff --git a/tests/FontFamilyTest.cpp b/tests/FontFamilyTest.cpp
index 1b2457695c4fa8b593a4d28da495ae055e4fcaae..1975b7e7fd522e68b8ff93b310071e1d46faebfa 100644
--- a/tests/FontFamilyTest.cpp
+++ b/tests/FontFamilyTest.cpp
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include <minikin/FontFamily.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
 
 #include "FontLanguageListCache.h"
 #include "ICUTestBase.h"
diff --git a/tests/FontTestUtils.cpp b/tests/FontTestUtils.cpp
index fdc3ed6ee91de64634123d7b40bf3ae8b063f28b..9d36d2f6cb969da131f9ad3bf9c53ee2b5da09a7 100644
--- a/tests/FontTestUtils.cpp
+++ b/tests/FontTestUtils.cpp
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-#include <libxml/tree.h>
+#define LOG_TAG "Minikin"
 
-#include <minikin/FontCollection.h>
-#include <minikin/FontFamily.h>
+#include <libxml/tree.h>
+#include <unistd.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
 
 #include "FontLanguage.h"
 #include "MinikinFontForTest.h"
+#include <minikin/FontCollection.h>
+#include <minikin/FontFamily.h>
 
 android::FontCollection* getFontCollection(const char* fontDir, const char* fontXml) {
     xmlDoc* doc = xmlReadFile(fontXml, NULL, 0);
diff --git a/tests/HbFontCacheTest.cpp b/tests/HbFontCacheTest.cpp
index 2dee61aff0659759cf86752ed9f2c0733e20e2ab..f1b1d311190bce1ac7b01bf1cdfb2c51b784c42c 100644
--- a/tests/HbFontCacheTest.cpp
+++ b/tests/HbFontCacheTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include "HbFontCache.h"
 
-#include <cutils/log.h>
-#include <hb.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
 #include <utils/Mutex.h>
 
+#include <hb.h>
+
 #include "MinikinInternal.h"
 #include "MinikinFontForTest.h"
 #include <minikin/MinikinFont.h>
diff --git a/tests/MinikinFontForTest.cpp b/tests/MinikinFontForTest.cpp
index 66dd4ea47349c6b5a50f9d2ff4afcda7bc52dcfe..7933d2457e0c2dbb25dc4447f438234c28021b54 100644
--- a/tests/MinikinFontForTest.cpp
+++ b/tests/MinikinFontForTest.cpp
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Minikin"
+
 #include "MinikinFontForTest.h"
 
 #include <minikin/MinikinFont.h>
 
 #include <SkTypeface.h>
 
-#include <cutils/log.h>
+#include <android/log.h>
 
 MinikinFontForTest::MinikinFontForTest(const std::string& font_path) :
     MinikinFontForTest(font_path, SkTypeface::CreateFromFile(font_path.c_str())) {
diff --git a/tests/WordBreakerTests.cpp b/tests/WordBreakerTests.cpp
index 8ed87cc506942f2ca39a603b8ad4ca6acde5365a..0bb614732a60d3f9da4188a00134dbb8b4dfd3c1 100644
--- a/tests/WordBreakerTests.cpp
+++ b/tests/WordBreakerTests.cpp
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
+#define LOG_TAG "Minikin"
+
+#include <android/log.h>
 #include <gtest/gtest.h>
+
 #include "ICUTestBase.h"
 #include "UnicodeUtils.h"
 #include <minikin/WordBreaker.h>
@@ -22,9 +26,6 @@
 #include <unicode/uclean.h>
 #include <unicode/udata.h>
 
-#define LOG_TAG "Minikin"
-#include <cutils/log.h>
-
 #ifndef NELEM
 #define NELEM(x) ((sizeof(x) / sizeof((x)[0])))
 #endif