diff --git a/docs/wrapping-upb.md b/docs/wrapping-upb.md
index 46cc0753d1..6a98c2268a 100644
--- a/docs/wrapping-upb.md
+++ b/docs/wrapping-upb.md
@@ -173,8 +173,8 @@ class MyMessage(_message.Message):
 
 To use reflection-based access:
 
-1. Load and access descriptor data using the interfaces in google3/third_party/upb/upb/def.h.
-2. Access message data using the interfaces in google3/third_party/upb/upb/reflection.h.
+1. Load and access descriptor data using the interfaces in upb/def.h.
+2. Access message data using the interfaces in upb/reflection.h.
 
 ### MiniTables
 
@@ -234,8 +234,8 @@ APIs to do this do not exist yet.
 
 To use MiniTable-based access:
 
-1. Load and access MiniDescriptors data using the interfaces in google3/third_party/upb/upb/mini_table.h.
-2. Access message data using the interfaces in google3/third_party/upb/upb/msg_accessors.h.
+1. Load and access MiniDescriptors data using the interfaces in upb/mini_table.h.
+2. Access message data using the interfaces in upb/msg_accessors.h.
 
 ## Memory Management
 
diff --git a/upb/collections/message_value.h b/upb/collections/message_value.h
index c0d2edad31..4d722962a9 100644
--- a/upb/collections/message_value.h
+++ b/upb/collections/message_value.h
@@ -26,7 +26,7 @@
  */
 
 // Users should include array.h or map.h instead.
-// IWYU pragma: private, include "third_party/upb/upb/collections/array.h"
+// IWYU pragma: private, include "upb/collections/array.h"
 
 #ifndef UPB_MESSAGE_VALUE_H_
 #define UPB_MESSAGE_VALUE_H_
diff --git a/upb/reflection/common.h b/upb/reflection/common.h
index fa74e2cc27..581ecff869 100644
--- a/upb/reflection/common.h
+++ b/upb/reflection/common.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 // Declarations common to all public def types.
 
diff --git a/upb/reflection/def_pool.h b/upb/reflection/def_pool.h
index abe6a3fdb9..aef54ab356 100644
--- a/upb/reflection/def_pool.h
+++ b/upb/reflection/def_pool.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_DEF_POOL_H_
 #define UPB_REFLECTION_DEF_POOL_H_
diff --git a/upb/reflection/enum_def.h b/upb/reflection/enum_def.h
index 246e712d1f..20a07a9587 100644
--- a/upb/reflection/enum_def.h
+++ b/upb/reflection/enum_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_ENUM_DEF_H_
 #define UPB_REFLECTION_ENUM_DEF_H_
diff --git a/upb/reflection/enum_reserved_range.h b/upb/reflection/enum_reserved_range.h
index 8627d882ad..7276bf69d7 100644
--- a/upb/reflection/enum_reserved_range.h
+++ b/upb/reflection/enum_reserved_range.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
 #define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
diff --git a/upb/reflection/enum_value_def.h b/upb/reflection/enum_value_def.h
index 2ab98ddd89..fd43610d9f 100644
--- a/upb/reflection/enum_value_def.h
+++ b/upb/reflection/enum_value_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_ENUM_VALUE_DEF_H_
 #define UPB_REFLECTION_ENUM_VALUE_DEF_H_
diff --git a/upb/reflection/extension_range.h b/upb/reflection/extension_range.h
index 6220397f33..004f9a8bb7 100644
--- a/upb/reflection/extension_range.h
+++ b/upb/reflection/extension_range.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_EXTENSION_RANGE_H_
 #define UPB_REFLECTION_EXTENSION_RANGE_H_
diff --git a/upb/reflection/field_def.h b/upb/reflection/field_def.h
index cd9af2a88f..d85e8d06cd 100644
--- a/upb/reflection/field_def.h
+++ b/upb/reflection/field_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_FIELD_DEF_H_
 #define UPB_REFLECTION_FIELD_DEF_H_
diff --git a/upb/reflection/file_def.h b/upb/reflection/file_def.h
index a5bf2ffe4b..ebaa960f50 100644
--- a/upb/reflection/file_def.h
+++ b/upb/reflection/file_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_FILE_DEF_H_
 #define UPB_REFLECTION_FILE_DEF_H_
diff --git a/upb/reflection/message_def.h b/upb/reflection/message_def.h
index 5122331628..d47bf3386a 100644
--- a/upb/reflection/message_def.h
+++ b/upb/reflection/message_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_MESSAGE_DEF_H_
 #define UPB_REFLECTION_MESSAGE_DEF_H_
diff --git a/upb/reflection/message_reserved_range.h b/upb/reflection/message_reserved_range.h
index a24815a29b..dcdf4e3ae4 100644
--- a/upb/reflection/message_reserved_range.h
+++ b/upb/reflection/message_reserved_range.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
 #define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
diff --git a/upb/reflection/method_def.h b/upb/reflection/method_def.h
index 5ee701adea..3460886b1e 100644
--- a/upb/reflection/method_def.h
+++ b/upb/reflection/method_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_METHOD_DEF_H_
 #define UPB_REFLECTION_METHOD_DEF_H_
diff --git a/upb/reflection/oneof_def.h b/upb/reflection/oneof_def.h
index 709a5c2aa2..bd68273214 100644
--- a/upb/reflection/oneof_def.h
+++ b/upb/reflection/oneof_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_ONEOF_DEF_H_
 #define UPB_REFLECTION_ONEOF_DEF_H_
diff --git a/upb/reflection/service_def.h b/upb/reflection/service_def.h
index b2a9fa09fc..5bedd07be0 100644
--- a/upb/reflection/service_def.h
+++ b/upb/reflection/service_def.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
+// IWYU pragma: private, include "upb/reflection/def.h"
 
 #ifndef UPB_REFLECTION_SERVICE_DEF_H_
 #define UPB_REFLECTION_SERVICE_DEF_H_