diff --git a/upb/base/string_view.h b/upb/base/string_view.h
index 28b17962f5..41af320db4 100644
--- a/upb/base/string_view.h
+++ b/upb/base/string_view.h
@@ -24,10 +24,6 @@ typedef struct {
   const char* data;
   size_t size;
 } upb_StringView;
-// LINT.ThenChange(
-//  GoogleInternalName0,
-//  //depot/google3/third_party/upb/bits/golang/accessor.go:map_go_string
-// )
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,6 +45,12 @@ UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
   return a.size == b.size && memcmp(a.data, b.data, a.size) == 0;
 }
 
+// LINT.ThenChange(
+//  GoogleInternalName0,
+//  //depot/google3/third_party/upb/bits/golang/accessor.go:map_go_string,
+//  //depot/google3/third_party/upb/bits/typescript/string_view.ts
+// )
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/upb/mem/arena.h b/upb/mem/arena.h
index 1cb9182f4b..9ed5cf8eab 100644
--- a/upb/mem/arena.h
+++ b/upb/mem/arena.h
@@ -31,9 +31,11 @@
 
 typedef struct upb_Arena upb_Arena;
 
+// LINT.IfChange(struct_definition)
 typedef struct {
   char *ptr, *end;
 } _upb_ArenaHead;
+// LINT.ThenChange(//depot/google3/third_party/upb/bits/typescript/arena.ts)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/upb/mem/internal/arena.h b/upb/mem/internal/arena.h
index 21741c53ba..ef56c0fad4 100644
--- a/upb/mem/internal/arena.h
+++ b/upb/mem/internal/arena.h
@@ -15,6 +15,7 @@
 
 typedef struct _upb_MemBlock _upb_MemBlock;
 
+// LINT.IfChange(struct_definition)
 struct upb_Arena {
   _upb_ArenaHead head;
 
@@ -43,6 +44,7 @@ struct upb_Arena {
   // upb_Arena_SpaceAllocated().
   UPB_ATOMIC(_upb_MemBlock*) blocks;
 };
+// LINT.ThenChange(//depot/google3/third_party/upb/bits/typescript/arena.ts)
 
 UPB_INLINE bool _upb_Arena_IsTaggedRefcount(uintptr_t parent_or_count) {
   return (parent_or_count & 1) == 1;
diff --git a/upb/message/internal/array.h b/upb/message/internal/array.h
index a99e2e44c8..71c4894a47 100644
--- a/upb/message/internal/array.h
+++ b/upb/message/internal/array.h
@@ -38,7 +38,6 @@ struct upb_Array {
   size_t size;                   // The number of elements in the array.
   size_t UPB_PRIVATE(capacity);  // Allocated storage. Measured in elements.
 };
-// LINT.ThenChange(GoogleInternalName1)
 
 UPB_INLINE void UPB_PRIVATE(_upb_Array_SetTaggedPtr)(upb_Array* array,
                                                      void* data, size_t lg2) {
@@ -111,6 +110,11 @@ UPB_INLINE void UPB_PRIVATE(_upb_Array_Set)(upb_Array* array, size_t i,
   memcpy(arr_data + (i * elem_size), data, elem_size);
 }
 
+// LINT.ThenChange(
+//  GoogleInternalName1,
+//  //depot/google3/third_party/upb/bits/typescript/array.ts
+//)
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/upb/mini_table/internal/field.h b/upb/mini_table/internal/field.h
index bcc54960a8..fa21ed15bf 100644
--- a/upb/mini_table/internal/field.h
+++ b/upb/mini_table/internal/field.h
@@ -17,6 +17,7 @@
 // Must be last.
 #include "upb/port/def.inc"
 
+// LINT.IfChange(struct_definition)
 struct upb_MiniTableField {
   uint32_t number;
   uint16_t offset;
@@ -175,6 +176,8 @@ UPB_INLINE size_t UPB_PRIVATE(_upb_MiniTableField_ElemSizeLg2)(
   return upb_FieldType_SizeLg2((upb_FieldType)f->UPB_PRIVATE(descriptortype));
 }
 
+// LINT.ThenChange(//depot/google3/third_party/upb/bits/typescript/mini_table_field.ts)
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/upb/mini_table/internal/message.h b/upb/mini_table/internal/message.h
index afdf691106..95ce39d0f9 100644
--- a/upb/mini_table/internal/message.h
+++ b/upb/mini_table/internal/message.h
@@ -39,6 +39,7 @@ typedef enum {
 // upb_MiniTable represents the memory layout of a given upb_MessageDef.
 // The members are public so generated code can initialize them,
 // but users MUST NOT directly read or write any of its members.
+// LINT.IfChange(minitable_struct_definition)
 struct upb_MiniTable {
   const union upb_MiniTableSub* UPB_PRIVATE(subs);
   const struct upb_MiniTableField* UPB_ONLYBITS(fields);
@@ -59,6 +60,7 @@ struct upb_MiniTable {
   // of flexible array members is a GNU extension, not in C99 unfortunately.
   _upb_FastTable_Entry UPB_PRIVATE(fasttable)[];
 };
+// LINT.ThenChange(//depot/google3/third_party/upb/bits/typescript/mini_table.ts)
 
 #ifdef __cplusplus
 extern "C" {