diff --git a/browser/ai_chat/BUILD.gn b/browser/ai_chat/BUILD.gn
index fb587655086a..f882ac93f149 100644
--- a/browser/ai_chat/BUILD.gn
+++ b/browser/ai_chat/BUILD.gn
@@ -38,6 +38,10 @@ static_library("ai_chat") {
     "//content/public/browser",
     "//ui/base",
   ]
+
+  if (is_android) {
+    deps += [ "//brave/build/android:jni_headers" ]
+  }
 }
 
 source_set("unit_tests") {
diff --git a/browser/misc_metrics/BUILD.gn b/browser/misc_metrics/BUILD.gn
index 7d3970fcd5a5..fba208caec0f 100644
--- a/browser/misc_metrics/BUILD.gn
+++ b/browser/misc_metrics/BUILD.gn
@@ -64,10 +64,7 @@ static_library("misc_metrics_impl") {
       "//extensions/browser",
     ]
   } else {
-    sources += [
-      "//brave/browser/misc_metrics/misc_android_metrics.cc",
-      "//brave/browser/misc_metrics/misc_android_metrics.h",
-    ]
+    sources += [ "//brave/browser/misc_metrics/misc_android_metrics.h" ]
   }
 
   if (enable_ai_chat) {
diff --git a/browser/misc_metrics/sources.gni b/browser/misc_metrics/sources.gni
index 6d4cb3240c8a..8f157ce80b42 100644
--- a/browser/misc_metrics/sources.gni
+++ b/browser/misc_metrics/sources.gni
@@ -28,5 +28,7 @@ if (enable_ai_chat) {
       [ "//brave/components/ai_chat/core/browser" ]
 }
 
-brave_browser_misc_metrics_android_sources =
-    [ "//brave/browser/misc_metrics/misc_android_metrics_factory_android.cc" ]
+brave_browser_misc_metrics_android_sources = [
+  "//brave/browser/misc_metrics/misc_android_metrics.cc",
+  "//brave/browser/misc_metrics/misc_android_metrics_factory_android.cc",
+]