diff --git a/build/source_list.bzl b/build/source_list.bzl
index 6305574..5181580 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -81,6 +81,7 @@
     "http2/core/http2_constants.h",
     "http2/core/http2_frame_decoder_adapter.h",
     "http2/core/http2_header_block_hpack_listener.h",
+    "http2/core/http2_structures.h",
     "http2/core/http2_trace_logging.h",
     "http2/core/no_op_headers_handler.h",
     "http2/core/priority_write_scheduler.h",
@@ -140,7 +141,6 @@
     "http2/hpack/huffman/huffman_spec_tables.h",
     "http2/hpack/varint/hpack_varint_decoder.h",
     "http2/hpack/varint/hpack_varint_encoder.h",
-    "http2/http2_structures.h",
     "quic/core/chlo_extractor.h",
     "quic/core/congestion_control/bandwidth_sampler.h",
     "quic/core/congestion_control/bbr2_drain.h",
@@ -438,6 +438,7 @@
     "http2/core/array_output_buffer.cc",
     "http2/core/http2_constants.cc",
     "http2/core/http2_frame_decoder_adapter.cc",
+    "http2/core/http2_structures.cc",
     "http2/core/http2_trace_logging.cc",
     "http2/core/recording_headers_handler.cc",
     "http2/core/spdy_alt_svc_wire_format.cc",
@@ -492,7 +493,6 @@
     "http2/hpack/huffman/huffman_spec_tables.cc",
     "http2/hpack/varint/hpack_varint_decoder.cc",
     "http2/hpack/varint/hpack_varint_encoder.cc",
-    "http2/http2_structures.cc",
     "quic/core/chlo_extractor.cc",
     "quic/core/congestion_control/bandwidth_sampler.cc",
     "quic/core/congestion_control/bbr2_drain.cc",
@@ -1122,6 +1122,7 @@
     "http2/adapter/window_manager_test.cc",
     "http2/core/array_output_buffer_test.cc",
     "http2/core/http2_constants_test.cc",
+    "http2/core/http2_structures_test.cc",
     "http2/core/priority_write_scheduler_test.cc",
     "http2/core/spdy_alt_svc_wire_format_test.cc",
     "http2/core/spdy_frame_builder_test.cc",
@@ -1170,7 +1171,6 @@
     "http2/hpack/varint/hpack_varint_decoder_test.cc",
     "http2/hpack/varint/hpack_varint_encoder_test.cc",
     "http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "http2/http2_structures_test.cc",
     "http2/test_tools/hpack_block_builder_test.cc",
     "http2/test_tools/hpack_example_test.cc",
     "http2/test_tools/http2_frame_builder_test.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index 6eea23b..66e3094 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -81,6 +81,7 @@
     "src/quiche/http2/core/http2_constants.h",
     "src/quiche/http2/core/http2_frame_decoder_adapter.h",
     "src/quiche/http2/core/http2_header_block_hpack_listener.h",
+    "src/quiche/http2/core/http2_structures.h",
     "src/quiche/http2/core/http2_trace_logging.h",
     "src/quiche/http2/core/no_op_headers_handler.h",
     "src/quiche/http2/core/priority_write_scheduler.h",
@@ -140,7 +141,6 @@
     "src/quiche/http2/hpack/huffman/huffman_spec_tables.h",
     "src/quiche/http2/hpack/varint/hpack_varint_decoder.h",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder.h",
-    "src/quiche/http2/http2_structures.h",
     "src/quiche/quic/core/chlo_extractor.h",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.h",
     "src/quiche/quic/core/congestion_control/bbr2_drain.h",
@@ -438,6 +438,7 @@
     "src/quiche/http2/core/array_output_buffer.cc",
     "src/quiche/http2/core/http2_constants.cc",
     "src/quiche/http2/core/http2_frame_decoder_adapter.cc",
+    "src/quiche/http2/core/http2_structures.cc",
     "src/quiche/http2/core/http2_trace_logging.cc",
     "src/quiche/http2/core/recording_headers_handler.cc",
     "src/quiche/http2/core/spdy_alt_svc_wire_format.cc",
@@ -492,7 +493,6 @@
     "src/quiche/http2/hpack/huffman/huffman_spec_tables.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_decoder.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder.cc",
-    "src/quiche/http2/http2_structures.cc",
     "src/quiche/quic/core/chlo_extractor.cc",
     "src/quiche/quic/core/congestion_control/bandwidth_sampler.cc",
     "src/quiche/quic/core/congestion_control/bbr2_drain.cc",
@@ -1123,6 +1123,7 @@
     "src/quiche/http2/adapter/window_manager_test.cc",
     "src/quiche/http2/core/array_output_buffer_test.cc",
     "src/quiche/http2/core/http2_constants_test.cc",
+    "src/quiche/http2/core/http2_structures_test.cc",
     "src/quiche/http2/core/priority_write_scheduler_test.cc",
     "src/quiche/http2/core/spdy_alt_svc_wire_format_test.cc",
     "src/quiche/http2/core/spdy_frame_builder_test.cc",
@@ -1171,7 +1172,6 @@
     "src/quiche/http2/hpack/varint/hpack_varint_decoder_test.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_encoder_test.cc",
     "src/quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "src/quiche/http2/http2_structures_test.cc",
     "src/quiche/http2/test_tools/hpack_block_builder_test.cc",
     "src/quiche/http2/test_tools/hpack_example_test.cc",
     "src/quiche/http2/test_tools/http2_frame_builder_test.cc",
diff --git a/build/source_list.json b/build/source_list.json
index 9aec0c8..05e7585 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -80,6 +80,7 @@
     "quiche/http2/core/http2_constants.h",
     "quiche/http2/core/http2_frame_decoder_adapter.h",
     "quiche/http2/core/http2_header_block_hpack_listener.h",
+    "quiche/http2/core/http2_structures.h",
     "quiche/http2/core/http2_trace_logging.h",
     "quiche/http2/core/no_op_headers_handler.h",
     "quiche/http2/core/priority_write_scheduler.h",
@@ -139,7 +140,6 @@
     "quiche/http2/hpack/huffman/huffman_spec_tables.h",
     "quiche/http2/hpack/varint/hpack_varint_decoder.h",
     "quiche/http2/hpack/varint/hpack_varint_encoder.h",
-    "quiche/http2/http2_structures.h",
     "quiche/quic/core/chlo_extractor.h",
     "quiche/quic/core/congestion_control/bandwidth_sampler.h",
     "quiche/quic/core/congestion_control/bbr2_drain.h",
@@ -437,6 +437,7 @@
     "quiche/http2/core/array_output_buffer.cc",
     "quiche/http2/core/http2_constants.cc",
     "quiche/http2/core/http2_frame_decoder_adapter.cc",
+    "quiche/http2/core/http2_structures.cc",
     "quiche/http2/core/http2_trace_logging.cc",
     "quiche/http2/core/recording_headers_handler.cc",
     "quiche/http2/core/spdy_alt_svc_wire_format.cc",
@@ -491,7 +492,6 @@
     "quiche/http2/hpack/huffman/huffman_spec_tables.cc",
     "quiche/http2/hpack/varint/hpack_varint_decoder.cc",
     "quiche/http2/hpack/varint/hpack_varint_encoder.cc",
-    "quiche/http2/http2_structures.cc",
     "quiche/quic/core/chlo_extractor.cc",
     "quiche/quic/core/congestion_control/bandwidth_sampler.cc",
     "quiche/quic/core/congestion_control/bbr2_drain.cc",
@@ -1122,6 +1122,7 @@
     "quiche/http2/adapter/window_manager_test.cc",
     "quiche/http2/core/array_output_buffer_test.cc",
     "quiche/http2/core/http2_constants_test.cc",
+    "quiche/http2/core/http2_structures_test.cc",
     "quiche/http2/core/priority_write_scheduler_test.cc",
     "quiche/http2/core/spdy_alt_svc_wire_format_test.cc",
     "quiche/http2/core/spdy_frame_builder_test.cc",
@@ -1170,7 +1171,6 @@
     "quiche/http2/hpack/varint/hpack_varint_decoder_test.cc",
     "quiche/http2/hpack/varint/hpack_varint_encoder_test.cc",
     "quiche/http2/hpack/varint/hpack_varint_round_trip_test.cc",
-    "quiche/http2/http2_structures_test.cc",
     "quiche/http2/test_tools/hpack_block_builder_test.cc",
     "quiche/http2/test_tools/hpack_example_test.cc",
     "quiche/http2/test_tools/http2_frame_builder_test.cc",
diff --git a/quiche/http2/core/http2_frame_decoder_adapter.cc b/quiche/http2/core/http2_frame_decoder_adapter.cc
index d73f8fc..4838849 100644
--- a/quiche/http2/core/http2_frame_decoder_adapter.cc
+++ b/quiche/http2/core/http2_frame_decoder_adapter.cc
@@ -18,6 +18,7 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/core/spdy_alt_svc_wire_format.h"
 #include "quiche/http2/core/spdy_headers_handler_interface.h"
 #include "quiche/http2/core/spdy_protocol.h"
@@ -27,7 +28,6 @@
 #include "quiche/http2/hpack/decoder/hpack_decoding_error.h"
 #include "quiche/http2/hpack/hpack_decoder_adapter.h"
 #include "quiche/http2/hpack/hpack_header_table.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/quiche_endian.h"
diff --git a/quiche/http2/core/http2_frame_decoder_adapter.h b/quiche/http2/core/http2_frame_decoder_adapter.h
index a273a51..c7182d5 100644
--- a/quiche/http2/core/http2_frame_decoder_adapter.h
+++ b/quiche/http2/core/http2_frame_decoder_adapter.h
@@ -14,6 +14,7 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/core/spdy_alt_svc_wire_format.h"
 #include "quiche/http2/core/spdy_headers_handler_interface.h"
 #include "quiche/http2/core/spdy_protocol.h"
@@ -21,7 +22,6 @@
 #include "quiche/http2/decoder/http2_frame_decoder.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/hpack/hpack_decoder_adapter.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace spdy {
diff --git a/quiche/http2/http2_structures.cc b/quiche/http2/core/http2_structures.cc
similarity index 98%
rename from quiche/http2/http2_structures.cc
rename to quiche/http2/core/http2_structures.cc
index 89b9c30..ef2e92a 100644
--- a/quiche/http2/http2_structures.cc
+++ b/quiche/http2/core/http2_structures.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 
 #include <cstring>  // For std::memcmp
 #include <ostream>
diff --git a/quiche/http2/http2_structures.h b/quiche/http2/core/http2_structures.h
similarity index 98%
rename from quiche/http2/http2_structures.h
rename to quiche/http2/core/http2_structures.h
index f8af6a0..50fe191 100644
--- a/quiche/http2/http2_structures.h
+++ b/quiche/http2/core/http2_structures.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_HTTP2_HTTP2_STRUCTURES_H_
-#define QUICHE_HTTP2_HTTP2_STRUCTURES_H_
+#ifndef QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_
+#define QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_
 
 // Defines structs for various fixed sized structures in HTTP/2.
 //
@@ -344,4 +344,4 @@
 
 }  // namespace http2
 
-#endif  // QUICHE_HTTP2_HTTP2_STRUCTURES_H_
+#endif  // QUICHE_HTTP2_CORE_HTTP2_STRUCTURES_H_
diff --git a/quiche/http2/http2_structures_test.cc b/quiche/http2/core/http2_structures_test.cc
similarity index 99%
rename from quiche/http2/http2_structures_test.cc
rename to quiche/http2/core/http2_structures_test.cc
index 5907733..da0089a 100644
--- a/quiche/http2/http2_structures_test.cc
+++ b/quiche/http2/core/http2_structures_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 
 // Tests are focused on Http2FrameHeader because it has by far the most
 // methods of any of the structures.
diff --git a/quiche/http2/decoder/decode_http2_structures.h b/quiche/http2/decoder/decode_http2_structures.h
index 9740497..414fa39 100644
--- a/quiche/http2/decoder/decode_http2_structures.h
+++ b/quiche/http2/decoder/decode_http2_structures.h
@@ -7,8 +7,8 @@
 
 // Provides functions for decoding the fixed size structures in the HTTP/2 spec.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/decode_http2_structures_test.cc b/quiche/http2/decoder/decode_http2_structures_test.cc
index 155ccaa..26b0d1f 100644
--- a/quiche/http2/decoder/decode_http2_structures_test.cc
+++ b/quiche/http2/decoder/decode_http2_structures_test.cc
@@ -5,7 +5,7 @@
 #include "quiche/http2/decoder/decode_http2_structures.h"
 
 // Tests decoding all of the fixed size HTTP/2 structures (i.e. those defined
-// in quiche/http2/http2_structures.h).
+// in quiche/http2/core/http2_structures.h).
 
 #include <stddef.h>
 
diff --git a/quiche/http2/decoder/frame_decoder_state.h b/quiche/http2/decoder/frame_decoder_state.h
index c643ead..1174cab 100644
--- a/quiche/http2/decoder/frame_decoder_state.h
+++ b/quiche/http2/decoder/frame_decoder_state.h
@@ -17,11 +17,11 @@
 #include <cstdint>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
 #include "quiche/http2/decoder/http2_structure_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/http2_frame_decoder.h b/quiche/http2/decoder/http2_frame_decoder.h
index 3d8f1ac..8baaab0 100644
--- a/quiche/http2/decoder/http2_frame_decoder.h
+++ b/quiche/http2/decoder/http2_frame_decoder.h
@@ -21,6 +21,7 @@
 
 #include <cstdint>
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
@@ -38,7 +39,6 @@
 #include "quiche/http2/decoder/payload_decoders/settings_payload_decoder.h"
 #include "quiche/http2/decoder/payload_decoders/unknown_payload_decoder.h"
 #include "quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/http2_frame_decoder_listener.h b/quiche/http2/decoder/http2_frame_decoder_listener.h
index 9408eab..c06e56a 100644
--- a/quiche/http2/decoder/http2_frame_decoder_listener.h
+++ b/quiche/http2/decoder/http2_frame_decoder_listener.h
@@ -32,7 +32,7 @@
 #include <type_traits>
 
 #include "quiche/http2/core/http2_constants.h"
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/http2_structure_decoder.h b/quiche/http2/decoder/http2_structure_decoder.h
index 1daee07..531f01a 100644
--- a/quiche/http2/decoder/http2_structure_decoder.h
+++ b/quiche/http2/decoder/http2_structure_decoder.h
@@ -6,8 +6,8 @@
 #define QUICHE_HTTP2_DECODER_HTTP2_STRUCTURE_DECODER_H_
 
 // Http2StructureDecoder is a class for decoding the fixed size structures in
-// the HTTP/2 spec, defined in quiche/http2/http2_structures.h. This class
-// is in aid of deciding whether to keep the SlowDecode methods which I
+// the HTTP/2 spec, defined in quiche/http2/core/http2_structures.h. This
+// class is in aid of deciding whether to keep the SlowDecode methods which I
 // (jamessynge) now think may not be worth their complexity. In particular,
 // if most transport buffers are large, so it is rare that a structure is
 // split across buffer boundaries, than the cost of buffering upon
@@ -15,10 +15,10 @@
 
 #include <cstdint>
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_http2_structures.h"
 #include "quiche/http2/decoder/decode_status.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc b/quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc
index 6e240a5..a91f952 100644
--- a/quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc
+++ b/quiche/http2/decoder/http2_structure_decoder_remaining_payload_test.cc
@@ -1,8 +1,8 @@
 // Tests decoding all of the fixed size HTTP/2 structures that are in the frame
-// payload (i.e. those defined in quiche/http2/http2_structures.h, except
-// Http2FrameHeader) using Http2StructureDecoder, which handles buffering of
-// structures split across input buffer boundaries, and in turn
-// uses DoDecode when it has all of a structure in a contiguous buffer.
+// payload (i.e. those defined in quiche/http2/core/http2_structures.h,
+// except Http2FrameHeader) using Http2StructureDecoder, which handles buffering
+// of structures split across input buffer boundaries, and in turn uses DoDecode
+// when it has all of a structure in a contiguous buffer.
 
 #include <stddef.h>
 
@@ -13,10 +13,10 @@
 #include "absl/flags/flag.h"
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/http2_structure_decoder.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/http2_structure_decoder_test_util.h"
 #include "quiche/http2/test_tools/http2_structures_test_util.h"
 #include "quiche/http2/test_tools/random_decoder_test_base.h"
diff --git a/quiche/http2/decoder/http2_structure_decoder_test.cc b/quiche/http2/decoder/http2_structure_decoder_test.cc
index 324ff09..87462c6 100644
--- a/quiche/http2/decoder/http2_structure_decoder_test.cc
+++ b/quiche/http2/decoder/http2_structure_decoder_test.cc
@@ -5,7 +5,7 @@
 #include "quiche/http2/decoder/http2_structure_decoder.h"
 
 // Tests decoding all of the fixed size HTTP/2 structures (i.e. those defined in
-// quiche/http2/http2_structures.h) using Http2StructureDecoder, which
+// quiche/http2/core/http2_structures.h) using Http2StructureDecoder, which
 // handles buffering of structures split across input buffer boundaries, and in
 // turn uses DoDecode when it has all of a structure in a contiguous buffer.
 
diff --git a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc
index e69507a..fb5c63e 100644
--- a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.h b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.h
index 2829249..d42a807 100644
--- a/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/altsvc_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a ALTSVC frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc
index fabccd8..b825aac 100644
--- a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder.cc
@@ -7,9 +7,9 @@
 #include <stddef.h>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
index 309a8fc..3d13761 100644
--- a/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/continuation_payload_decoder_test.cc
@@ -10,8 +10,8 @@
 #include <type_traits>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/payload_decoder_base_test_util.h"
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc
index 6f532d3..bce489d 100644
--- a/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
index 2adabfd..3eadc7e 100644
--- a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
diff --git a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc
index c25e6d3..0d269a6 100644
--- a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.h b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.h
index 1f3b69c..f073072 100644
--- a/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/goaway_payload_decoder.h
@@ -10,10 +10,10 @@
 // TODO(jamessynge): Sweep through all payload decoders, changing the names of
 // the PayloadState enums so that they are really states, and not actions.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc
index 54624c5..3c7169a 100644
--- a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.h b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.h
index 05979cd..10aa2ce 100644
--- a/quiche/http2/decoder/payload_decoders/headers_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/headers_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a HEADERS frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/ping_payload_decoder.h b/quiche/http2/decoder/payload_decoders/ping_payload_decoder.h
index 0b9e963..8bf6423 100644
--- a/quiche/http2/decoder/payload_decoders/ping_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/ping_payload_decoder.h
@@ -8,10 +8,10 @@
 // Decodes the payload of a PING frame; for the RFC, see:
 //     http://httpwg.org/specs/rfc7540.html#PING
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc
index 30e12e5..81e1b3b 100644
--- a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.cc
@@ -5,9 +5,9 @@
 #include "quiche/http2/decoder/payload_decoders/priority_payload_decoder.h"
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.h b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.h
index 2056ff9..bd4939c 100644
--- a/quiche/http2/decoder/payload_decoders/priority_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/priority_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a PRIORITY frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc
index 7648f86..3305187 100644
--- a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.h b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.h
index 39d0817..2d4d6fe 100644
--- a/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/priority_update_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a PRIORITY_UPDATE frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
index d5d843b..7aea96a 100644
--- a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.cc
@@ -10,9 +10,9 @@
 
 #include "absl/base/macros.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
diff --git a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.h b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.h
index c6bf2a2..177f9fe 100644
--- a/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/push_promise_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a PUSH_PROMISE frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc
index 60af02a..da17f9f 100644
--- a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.cc
@@ -5,9 +5,9 @@
 #include "quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.h"
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.h b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
index 68e701e..348d80b 100644
--- a/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/rst_stream_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a RST_STREAM frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc
index 20d0e2b..372b40a 100644
--- a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.cc
@@ -5,9 +5,9 @@
 #include "quiche/http2/decoder/payload_decoders/settings_payload_decoder.h"
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.h b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.h
index c7a6266..5a18705 100644
--- a/quiche/http2/decoder/payload_decoders/settings_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/settings_payload_decoder.h
@@ -8,10 +8,10 @@
 // Decodes the payload of a SETTINGS frame; for the RFC, see:
 //     http://httpwg.org/specs/rfc7540.html#SETTINGS
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc
index 1da41fd..9778ceb 100644
--- a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder.cc
@@ -7,9 +7,9 @@
 #include <stddef.h>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
index 9832806..a077eb8 100644
--- a/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
+++ b/quiche/http2/decoder/payload_decoders/unknown_payload_decoder_test.cc
@@ -10,8 +10,8 @@
 #include <type_traits>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/http2/test_tools/http2_random.h"
diff --git a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc
index 168b5c8..f425174 100644
--- a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc
+++ b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.cc
@@ -5,10 +5,10 @@
 #include "quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h"
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 
 namespace http2 {
diff --git a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h
index 659a715..bacd2df 100644
--- a/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h
+++ b/quiche/http2/decoder/payload_decoders/window_update_payload_decoder.h
@@ -7,10 +7,10 @@
 
 // Decodes the payload of a WINDOW_UPDATE frame.
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/test_tools/frame_decoder_state_test_util.cc b/quiche/http2/test_tools/frame_decoder_state_test_util.cc
index 7de363f..5543d73 100644
--- a/quiche/http2/test_tools/frame_decoder_state_test_util.cc
+++ b/quiche/http2/test_tools/frame_decoder_state_test_util.cc
@@ -4,7 +4,7 @@
 
 #include "quiche/http2/test_tools/frame_decoder_state_test_util.h"
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/http2/test_tools/http2_structure_decoder_test_util.h"
 #include "quiche/http2/test_tools/http2_structures_test_util.h"
diff --git a/quiche/http2/test_tools/frame_decoder_state_test_util.h b/quiche/http2/test_tools/frame_decoder_state_test_util.h
index 3c6fde9..5d6c91b 100644
--- a/quiche/http2/test_tools/frame_decoder_state_test_util.h
+++ b/quiche/http2/test_tools/frame_decoder_state_test_util.h
@@ -5,8 +5,8 @@
 #ifndef QUICHE_HTTP2_TEST_TOOLS_FRAME_DECODER_STATE_TEST_UTIL_H_
 #define QUICHE_HTTP2_TEST_TOOLS_FRAME_DECODER_STATE_TEST_UTIL_H_
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/random_decoder_test_base.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
diff --git a/quiche/http2/test_tools/frame_parts.h b/quiche/http2/test_tools/frame_parts.h
index 9232fa4..03232bd 100644
--- a/quiche/http2/test_tools/frame_parts.h
+++ b/quiche/http2/test_tools/frame_parts.h
@@ -19,8 +19,8 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/test_tools/frame_parts_collector.h b/quiche/http2/test_tools/frame_parts_collector.h
index 58adcdb..0cd2771 100644
--- a/quiche/http2/test_tools/frame_parts_collector.h
+++ b/quiche/http2/test_tools/frame_parts_collector.h
@@ -13,8 +13,8 @@
 #include <memory>
 #include <vector>
 
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h"
 #include "quiche/common/platform/api/quiche_export.h"
diff --git a/quiche/http2/test_tools/frame_parts_collector_listener.h b/quiche/http2/test_tools/frame_parts_collector_listener.h
index e3353f0..ca1d9bf 100644
--- a/quiche/http2/test_tools/frame_parts_collector_listener.h
+++ b/quiche/http2/test_tools/frame_parts_collector_listener.h
@@ -17,8 +17,8 @@
 #include <cstdint>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts_collector.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
diff --git a/quiche/http2/test_tools/http2_frame_builder.h b/quiche/http2/test_tools/http2_frame_builder.h
index 394d513..225c6a7 100644
--- a/quiche/http2/test_tools/http2_frame_builder.h
+++ b/quiche/http2/test_tools/http2_frame_builder.h
@@ -20,7 +20,7 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
index 5966236..b083f36 100644
--- a/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
+++ b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.cc
@@ -5,8 +5,8 @@
 #include "quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h"
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_logging.h"
 #include "quiche/common/platform/api/quiche_test.h"
 
diff --git a/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
index 4b811cf..61ca846 100644
--- a/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
+++ b/quiche/http2/test_tools/http2_frame_decoder_listener_test_util.h
@@ -10,8 +10,8 @@
 #include <cstdint>
 
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/common/platform/api/quiche_export.h"
 
 namespace http2 {
diff --git a/quiche/http2/test_tools/http2_structures_test_util.cc b/quiche/http2/test_tools/http2_structures_test_util.cc
index 5642acf..8d6b79b 100644
--- a/quiche/http2/test_tools/http2_structures_test_util.cc
+++ b/quiche/http2/test_tools/http2_structures_test_util.cc
@@ -7,7 +7,7 @@
 #include <cstdint>
 
 #include "quiche/http2/core/http2_constants.h"
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_random.h"
 
diff --git a/quiche/http2/test_tools/http2_structures_test_util.h b/quiche/http2/test_tools/http2_structures_test_util.h
index 5a5353e..7cfeb13 100644
--- a/quiche/http2/test_tools/http2_structures_test_util.h
+++ b/quiche/http2/test_tools/http2_structures_test_util.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "quiche/http2/http2_structures.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"
 #include "quiche/http2/test_tools/http2_random.h"
 #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/test_tools/payload_decoder_base_test_util.h b/quiche/http2/test_tools/payload_decoder_base_test_util.h
index dc449fb..0e1c635 100644
--- a/quiche/http2/test_tools/payload_decoder_base_test_util.h
+++ b/quiche/http2/test_tools/payload_decoder_base_test_util.h
@@ -13,11 +13,11 @@
 
 #include "absl/strings/string_view.h"
 #include "quiche/http2/core/http2_constants.h"
+#include "quiche/http2/core/http2_structures.h"
 #include "quiche/http2/decoder/decode_buffer.h"
 #include "quiche/http2/decoder/decode_status.h"
 #include "quiche/http2/decoder/frame_decoder_state.h"
 #include "quiche/http2/decoder/http2_frame_decoder_listener.h"
-#include "quiche/http2/http2_structures.h"
 #include "quiche/http2/test_tools/frame_parts.h"
 #include "quiche/http2/test_tools/http2_constants_test_util.h"
 #include "quiche/http2/test_tools/http2_frame_builder.h"