diff --git a/leakcanary/leakcanary-android-core/api/leakcanary-android-core.api b/leakcanary/leakcanary-android-core/api/leakcanary-android-core.api
index ab4954bba0..c160056f4a 100644
--- a/leakcanary/leakcanary-android-core/api/leakcanary-android-core.api
+++ b/leakcanary/leakcanary-android-core/api/leakcanary-android-core.api
@@ -137,12 +137,6 @@ public final class leakcanary/LeakCanary$Config$Builder {
 	public final fun showNotifications (Z)Lleakcanary/LeakCanary$Config$Builder;
 }
 
-public final class leakcanary/LeakCanaryAndroidInternalUtils {
-	public static final field INSTANCE Lleakcanary/LeakCanaryAndroidInternalUtils;
-	public final fun addLeakActivityDynamicShortcut (Landroid/app/Application;)V
-	public final fun isInstantApp (Landroid/app/Application;)Z
-}
-
 public final class leakcanary/LogcatEventListener : leakcanary/EventListener {
 	public static final field INSTANCE Lleakcanary/LogcatEventListener;
 	public fun onEvent (Lleakcanary/EventListener$Event;)V
@@ -173,20 +167,3 @@ public final class leakcanary/WorkManagerHeapAnalyzer : leakcanary/EventListener
 	public fun onEvent (Lleakcanary/EventListener$Event;)V
 }
 
-public final class leakcanary/internal/LeakCanaryFileProvider : android/content/ContentProvider {
-	public static final field Companion Lleakcanary/internal/LeakCanaryFileProvider$Companion;
-	public fun <init> ()V
-	public fun attachInfo (Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
-	public fun delete (Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I
-	public fun getType (Landroid/net/Uri;)Ljava/lang/String;
-	public fun insert (Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;
-	public fun onCreate ()Z
-	public fun openFile (Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;
-	public fun query (Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-	public fun update (Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
-}
-
-public final class leakcanary/internal/LeakCanaryFileProvider$Companion {
-	public final fun getUriForFile (Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)Landroid/net/Uri;
-}
-
diff --git a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/LeakCanaryAndroidInternalUtils.kt b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/LeakCanaryAndroidInternalUtils.kt
index 18a767d15f..b56804c3f9 100644
--- a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/LeakCanaryAndroidInternalUtils.kt
+++ b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/LeakCanaryAndroidInternalUtils.kt
@@ -12,11 +12,7 @@ import android.os.Build.VERSION_CODES
 import com.squareup.leakcanary.core.R
 import shark.SharkLog
 
-/**
- * This class is visible so that other LeakCanary modules may use it, but it only exists for
- * internal purposes and its APIs may change at any time.
- */
-object LeakCanaryAndroidInternalUtils {
+internal object LeakCanaryAndroidInternalUtils {
 
   private const val DYNAMIC_SHORTCUT_ID = "com.squareup.leakcanary.dynamic_shortcut"
 
diff --git a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakCanaryFileProvider.kt b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakCanaryFileProvider.kt
index 2fb8d74c76..c5f6ae13a6 100644
--- a/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakCanaryFileProvider.kt
+++ b/leakcanary/leakcanary-android-core/src/main/java/leakcanary/internal/LeakCanaryFileProvider.kt
@@ -40,11 +40,10 @@ import org.xmlpull.v1.XmlPullParserException
 
 /**
  * Copy of androidx.core.content.FileProvider, converted to Kotlin.
- * This is an internal class, only public to be usable in another module.
  * TODO Consider building a public API for exposing files with the right permissions to
  * be shared.
  */
-class LeakCanaryFileProvider : ContentProvider() {
+internal class LeakCanaryFileProvider : ContentProvider() {
 
   private lateinit var mStrategy: PathStrategy
 
diff --git a/leakcanary/leakcanary-app-service/src/main/java/org/leakcanary/internal/LeakUiAppClient.kt b/leakcanary/leakcanary-app-service/src/main/java/org/leakcanary/internal/LeakUiAppClient.kt
index 6a841aedc7..5a008d49d4 100644
--- a/leakcanary/leakcanary-app-service/src/main/java/org/leakcanary/internal/LeakUiAppClient.kt
+++ b/leakcanary/leakcanary-app-service/src/main/java/org/leakcanary/internal/LeakUiAppClient.kt
@@ -1,3 +1,5 @@
+@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
+
 package org.leakcanary.internal
 
 import android.content.ComponentName