diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index eb4988c5e2..010057d1da 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -453,12 +453,7 @@
 [[noreturn]] SK_API extern void sk_abort_no_print(void);
 
 #ifndef SkDebugf
-    #if SKIA_IMPLEMENTATION
-        SK_API void SkDebugf(const char format[], ...) SK_PRINTF_LIKE(1, 2);
-    #else
-        // TODO(johnstiles): fix external code which misuses format specifiers
-        SK_API void SkDebugf(const char format[], ...);
-    #endif
+    SK_API void SkDebugf(const char format[], ...) SK_PRINTF_LIKE(1, 2);
 #endif
 #if defined(SK_BUILD_FOR_LIBFUZZER)
     SK_API SK_PRINTF_LIKE(1, 2) inline void SkDebugf(const char format[], ...) {}
diff --git a/modules/skparagraph/samples/SampleParagraph.cpp b/modules/skparagraph/samples/SampleParagraph.cpp
index 8ca52e3497..35025c42b2 100644
--- a/modules/skparagraph/samples/SampleParagraph.cpp
+++ b/modules/skparagraph/samples/SampleParagraph.cpp
@@ -3549,7 +3549,7 @@ protected:
         std::vector<LineMetrics> metrics;
         paragraph->getLineMetrics(metrics);
         for (auto& metric : metrics) {
-            SkDebugf("Line[%d:%d <= %d <=%d)\n", metric.fStartIndex, metric.fEndExcludingWhitespaces, metric.fEndIndex, metric.fEndIncludingNewline);
+            SkDebugf("Line[%zu:%zu <= %zu <= %zu)\n", metric.fStartIndex, metric.fEndExcludingWhitespaces, metric.fEndIndex, metric.fEndIncludingNewline);
         }
     }