diff --git a/build/source_list.json b/build/source_list.json
index c6d3fdc..f2b726e 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -110,6 +110,12 @@
     "quiche/http2/hpack/decoder/hpack_string_decoder_listener.h",
     "quiche/http2/hpack/decoder/hpack_whole_entry_buffer.h",
     "quiche/http2/hpack/decoder/hpack_whole_entry_listener.h",
+    "quiche/http2/hpack/hpack_constants.h",
+    "quiche/http2/hpack/hpack_encoder.h",
+    "quiche/http2/hpack/hpack_entry.h",
+    "quiche/http2/hpack/hpack_header_table.h",
+    "quiche/http2/hpack/hpack_output_stream.h",
+    "quiche/http2/hpack/hpack_static_table.h",
     "quiche/http2/hpack/http2_hpack_constants.h",
     "quiche/http2/hpack/huffman/hpack_huffman_decoder.h",
     "quiche/http2/hpack/huffman/hpack_huffman_encoder.h",
@@ -374,13 +380,8 @@
     "quiche/quic/platform/api/quic_thread.h",
     "quiche/spdy/core/array_output_buffer.h",
     "quiche/spdy/core/header_byte_listener_interface.h",
-    "quiche/spdy/core/hpack/hpack_constants.h",
     "quiche/spdy/core/hpack/hpack_decoder_adapter.h",
     "quiche/spdy/core/hpack/hpack_encoder.h",
-    "quiche/spdy/core/hpack/hpack_entry.h",
-    "quiche/spdy/core/hpack/hpack_header_table.h",
-    "quiche/spdy/core/hpack/hpack_output_stream.h",
-    "quiche/spdy/core/hpack/hpack_static_table.h",
     "quiche/spdy/core/http2_frame_decoder_adapter.h",
     "quiche/spdy/core/http2_header_block.h",
     "quiche/spdy/core/http2_header_block_hpack_listener.h",
@@ -465,6 +466,12 @@
     "quiche/http2/hpack/decoder/hpack_string_decoder_listener.cc",
     "quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc",
     "quiche/http2/hpack/decoder/hpack_whole_entry_listener.cc",
+    "quiche/http2/hpack/hpack_constants.cc",
+    "quiche/http2/hpack/hpack_encoder.cc",
+    "quiche/http2/hpack/hpack_entry.cc",
+    "quiche/http2/hpack/hpack_header_table.cc",
+    "quiche/http2/hpack/hpack_output_stream.cc",
+    "quiche/http2/hpack/hpack_static_table.cc",
     "quiche/http2/hpack/http2_hpack_constants.cc",
     "quiche/http2/hpack/huffman/hpack_huffman_decoder.cc",
     "quiche/http2/hpack/huffman/hpack_huffman_encoder.cc",
@@ -676,13 +683,7 @@
     "quiche/quic/core/web_transport_write_blocked_list.cc",
     "quiche/quic/platform/api/quic_socket_address.cc",
     "quiche/spdy/core/array_output_buffer.cc",
-    "quiche/spdy/core/hpack/hpack_constants.cc",
     "quiche/spdy/core/hpack/hpack_decoder_adapter.cc",
-    "quiche/spdy/core/hpack/hpack_encoder.cc",
-    "quiche/spdy/core/hpack/hpack_entry.cc",
-    "quiche/spdy/core/hpack/hpack_header_table.cc",
-    "quiche/spdy/core/hpack/hpack_output_stream.cc",
-    "quiche/spdy/core/hpack/hpack_static_table.cc",
     "quiche/spdy/core/http2_frame_decoder_adapter.cc",
     "quiche/spdy/core/recording_headers_handler.cc",
     "quiche/spdy/core/spdy_alt_svc_wire_format.cc",
@@ -1138,6 +1139,11 @@
     "quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc",
     "quiche/http2/hpack/decoder/hpack_string_decoder_test.cc",
     "quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc",
+    "quiche/http2/hpack/hpack_encoder_test.cc",
+    "quiche/http2/hpack/hpack_entry_test.cc",
+    "quiche/http2/hpack/hpack_header_table_test.cc",
+    "quiche/http2/hpack/hpack_output_stream_test.cc",
+    "quiche/http2/hpack/hpack_static_table_test.cc",
     "quiche/http2/hpack/http2_hpack_constants_test.cc",
     "quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc",
     "quiche/http2/hpack/huffman/hpack_huffman_encoder_test.cc",
@@ -1318,12 +1324,7 @@
     "quiche/quic/tools/simple_ticket_crypter_test.cc",
     "quiche/spdy/core/array_output_buffer_test.cc",
     "quiche/spdy/core/hpack/hpack_decoder_adapter_test.cc",
-    "quiche/spdy/core/hpack/hpack_encoder_test.cc",
-    "quiche/spdy/core/hpack/hpack_entry_test.cc",
-    "quiche/spdy/core/hpack/hpack_header_table_test.cc",
-    "quiche/spdy/core/hpack/hpack_output_stream_test.cc",
     "quiche/spdy/core/hpack/hpack_round_trip_test.cc",
-    "quiche/spdy/core/hpack/hpack_static_table_test.cc",
     "quiche/spdy/core/spdy_alt_svc_wire_format_test.cc",
     "quiche/spdy/core/spdy_frame_builder_test.cc",
     "quiche/spdy/core/spdy_framer_test.cc",