diff --git a/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java b/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
index 415b2cde0d..2eebc9ddea 100644
--- a/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
+++ b/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
@@ -43,7 +43,9 @@ import java.util.RandomAccess;
  * it cannot be modified via the wrapper.
  *
  * @author jonp@google.com (Jon Perlow)
+ * @deprecated use {@link LazyStringArrayList#makeImmutable} instead.
  */
+@Deprecated
 public class UnmodifiableLazyStringList extends AbstractList<String>
     implements LazyStringList, RandomAccess {
 
diff --git a/src/file_lists.cmake b/src/file_lists.cmake
index 9faaf62226..b7367effb6 100644
--- a/src/file_lists.cmake
+++ b/src/file_lists.cmake
@@ -168,8 +168,8 @@ set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/serial_arena.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/service.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/serial_arena.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/callback.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/logging.h