diff --git a/include/swift/Option/Options.td b/include/swift/Option/Options.td
index dd2d0c0d026f4..dbadf83aa6318 100644
--- a/include/swift/Option/Options.td
+++ b/include/swift/Option/Options.td
@@ -191,7 +191,7 @@ HelpText<"Emit dot files every time driver imports an fine-grained swiftdeps fil
 
 def fine_grained_dependency_include_intrafile :
 Flag<["-"], "fine-grained-dependency-include-intrafile">,
-InternalDebugOpt,
+Flags<[FrontendOption, HelpHidden]>,
 HelpText<"Include within-file dependencies.">;
 
 def emit_fine_grained_dependency_sourcefile_dot_files :
diff --git a/test/NameBinding/reference-dependencies-fine.swift b/test/NameBinding/reference-dependencies-fine.swift
index f9e4b38ab5f65..e15fbcf24e500 100644
--- a/test/NameBinding/reference-dependencies-fine.swift
+++ b/test/NameBinding/reference-dependencies-fine.swift
@@ -4,10 +4,11 @@
 
 // RUN: %empty-directory(%t)
 // RUN: cp %s %t/main.swift
-// RUN: %target-swift-frontend -enable-fine-grained-dependencies -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps
 
+// Need -fine-grained-dependency-include-intrafile to be invarient wrt type-body-fingerprints enabled/disabled
+// RUN: %target-swift-frontend -enable-fine-grained-dependencies -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps
 // Check that the output is deterministic.
-// RUN: %target-swift-frontend -enable-fine-grained-dependencies -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps
+// RUN: %target-swift-frontend -enable-fine-grained-dependencies  -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps
 
 // Merge each entry onto one line and sort to overcome order differences
 // RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps
@@ -339,7 +340,8 @@ struct Outer {
   }
 }
 
-// CHECK-TOPLEVEL-DAG: topLevel interface  '' privateFunc false
+// CHECK-TOPLEVEL-DAG: topLevel interface  '' privateFunc true
+// CHECK-TOPLEVEL-DAG: topLevel implementation  '' privateFunc true
 private func privateFunc() {}
 
 // CHECK-TOPLEVEL-DAG: topLevel interface  '' topLevel1 false
@@ -498,7 +500,8 @@ struct Sentinel2 {}
 // CHECK-POTENTIALMEMBER-DAG: potentialMember interface  4main13PrivateProto3P '' false
 
 // CHECK-NOMINAL-2-DAG: nominal interface  Sa '' false
-// CHECK-NOMINAL-2-DAG: nominal interface  Sb '' false
+// CHECK-NOMINAL-2-DAG: nominal interface  Sb '' true
+// CHECK-NOMINAL-2-DAG: nominal implementation  Sb '' true
 // CHECK-NOMINAL-2-DAG: nominal interface  4main18ClassFromOtherFileC '' false
 // CHECK-NOMINAL-2-DAG: nominal interface  SL '' false
 // CHECK-NOMINAL-2-DAG: nominal interface  s25ExpressibleByFloatLiteralP '' false
diff --git a/test/NameBinding/reference-dependencies-members-fine.swift b/test/NameBinding/reference-dependencies-members-fine.swift
index c1c9ba58dff74..bbb99fbfb3e98 100644
--- a/test/NameBinding/reference-dependencies-members-fine.swift
+++ b/test/NameBinding/reference-dependencies-members-fine.swift
@@ -4,9 +4,11 @@
 
 // RUN: %empty-directory(%t)
 // RUN: cp %s %t/main.swift
-// RUN: %target-swift-frontend -enable-fine-grained-dependencies -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps
 
-// RUN: %target-swift-frontend -enable-fine-grained-dependencies -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps
+// Need -fine-grained-dependency-include-intrafile to be invarient wrt type-body-fingerprints enabled/disabled
+// RUN: %target-swift-frontend -enable-fine-grained-dependencies -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps
+
+// RUN: %target-swift-frontend -enable-fine-grained-dependencies -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps
 // RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps
 // RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps
 
@@ -14,7 +16,6 @@
 
 // RUN: %FileCheck -check-prefix=PROVIDES-NOMINAL %s < %t-processed.swiftdeps
 // RUN: %FileCheck -check-prefix=PROVIDES-NOMINAL-2 %s < %t-processed.swiftdeps
-// RUN: %FileCheck -check-prefix=PROVIDES-NOMINAL-NEGATIVE %s < %t-processed.swiftdeps
 // RUN: %FileCheck -check-prefix=PROVIDES-MEMBER %s < %t-processed.swiftdeps
 // RUN: %FileCheck -check-prefix=PROVIDES-MEMBER-NEGATIVE %s < %t-processed.swiftdeps
 // RUN: %FileCheck -check-prefix=DEPENDS-NOMINAL %s < %t-processed.swiftdeps
@@ -54,15 +55,13 @@ protocol SomeProto {}
 // DEPENDS-MEMBER-DAG:  member interface  4main10OtherClassC deinit false
 extension OtherClass : SomeProto {}
 
-// PROVIDES-NOMINAL-NEGATIVE-NOT:  nominal implementation  4main11OtherStructV '' true
-// PROVIDES-NOMINAL-NEGATIVE-NOT:  nominal interface  4main11OtherStructV '' true
-// DEPENDS-NOMINAL-DAG:  nominal interface  4main11OtherStructV '' false
+// PROVIDES-NOMINAL-DAG:  nominal implementation  4main11OtherStructV '' true
+// PROVIDES-NOMINAL-DAG:  nominal interface  4main11OtherStructV '' true
 extension OtherStruct {
   // PROVIDES-MEMBER-DAG:  potentialMember interface  4main11OtherStructV '' true
   // PROVIDES-MEMBER-DAG:  member interface  4main11OtherStructV foo true
   // PROVIDES-MEMBER-DAG:  member interface  4main11OtherStructV bar true
-  // PROVIDES-MEMBER-NEGATIVE-NOT:  member interface  4main11OtherStructV baz true
-  // DEPENDS-MEMBER-DAG:  member interface  4main11OtherStructV baz false
+  // PROVIDES-MEMBER-DAG:  member interface  4main11OtherStructV baz true
   // DEPENDS-MEMBER-NEGATIVE-NOT::  potentialMember interface  4main11OtherStructV baz false
   func foo() {}
   var bar: () { return () }