You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2023/10/26 17:56:11 UTC
[trafficserver] branch master updated: Unified include paths (#10671)
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 04f378d852 Unified include paths (#10671)
04f378d852 is described below
commit 04f378d852d3a4fc63ee8de5966f35f4effcd737
Author: Zhengxi Li <lz...@hotmail.com>
AuthorDate: Thu Oct 26 13:56:06 2023 -0400
Unified include paths (#10671)
This PR does the following:
* Updates the common include path used by all modules.
* The #include lines in code are updated to the relative path to the updated include paths or to where the including files are.
* Most include_directories are cleaned up in cmake files.
The common include path are the following:
# Common includes for everyone
include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
Also, since we are here,moved the private header (P_xxx) and test headers from include/records back to the src/records.
---
.../jsonrpc/jsonrpc-handler-development.en.rst | 4 +-
example/cripts/CMakeLists.txt | 1 -
include/api/APIHooks.h | 2 +-
include/api/FeatureAPIHooks.h | 4 +-
include/api/FetchSM.h | 6 +-
include/api/InkAPIInternal.h | 18 +++---
include/api/LifecycleAPIHooks.h | 2 +-
include/iocore/aio/AIO.h | 2 +-
include/iocore/aio/AIO_fault_injection.h | 4 +-
include/iocore/cache/Cache.h | 8 +--
include/iocore/cache/CacheDefs.h | 4 +-
include/iocore/cache/CacheEvacuateDocVC.h | 12 ++--
include/iocore/cache/CacheVC.h | 20 +++---
include/iocore/cache/HttpTransactCache.h | 2 +-
include/iocore/dns/DNS.h | 8 +--
include/iocore/dns/DNSEventIO.h | 2 +-
include/iocore/dns/DNSProcessor.h | 4 +-
include/iocore/dns/SplitDNS.h | 2 +-
include/iocore/eventsystem/Action.h | 4 +-
include/iocore/eventsystem/ConfigProcessor.h | 2 +-
include/iocore/eventsystem/Continuation.h | 2 +-
include/iocore/eventsystem/EThread.h | 6 +-
include/iocore/eventsystem/Event.h | 2 +-
include/iocore/eventsystem/EventProcessor.h | 6 +-
include/iocore/eventsystem/EventSystem.h | 32 +++++-----
include/iocore/eventsystem/Lock.h | 2 +-
include/iocore/eventsystem/MIOBufferWriter.h | 2 +-
include/iocore/eventsystem/PriorityEventQueue.h | 2 +-
include/iocore/eventsystem/ProtectedQueue.h | 2 +-
include/iocore/eventsystem/Tasks.h | 2 +-
include/iocore/eventsystem/Thread.h | 2 +-
include/iocore/eventsystem/VConnection.h | 2 +-
include/iocore/hostdb/HostDB.h | 6 +-
include/iocore/hostdb/HostDBProcessor.h | 4 +-
include/iocore/hostdb/HostFile.h | 2 +-
include/iocore/io_uring/IOUringEventIO.h | 2 +-
include/iocore/net/AcceptOptions.h | 2 +-
include/iocore/net/AsyncSignalEventIO.h | 2 +-
include/iocore/net/EventIO.h | 2 +-
include/iocore/net/Net.h | 2 +-
include/iocore/net/NetAcceptEventIO.h | 2 +-
include/iocore/net/NetEvent.h | 8 +--
include/iocore/net/NetHandler.h | 6 +-
include/iocore/net/NetProcessor.h | 8 +--
include/iocore/net/NetTimeout.h | 2 +-
include/iocore/net/NetVCOptions.h | 6 +-
include/iocore/net/NetVConnection.h | 18 +++---
include/iocore/net/PollCont.h | 4 +-
include/iocore/net/PreWarm.h | 2 +-
include/iocore/net/QUICMultiCertConfigLoader.h | 4 +-
include/iocore/net/QUICSupport.h | 2 +-
include/iocore/net/ReadWriteEventIO.h | 2 +-
include/iocore/net/SNIActionPerformer.h | 2 +-
include/iocore/net/SSLSNIConfig.h | 6 +-
include/iocore/net/SSLSessionCache.h | 4 +-
include/iocore/net/SSLStats.h | 2 +-
include/iocore/net/SessionAccept.h | 6 +-
include/iocore/net/TLSBasicSupport.h | 2 +-
include/iocore/net/TLSCertSwitchSupport.h | 2 +-
include/iocore/net/TLSSessionResumptionSupport.h | 4 +-
include/iocore/net/TLSTunnelSupport.h | 4 +-
include/iocore/net/UDPConnection.h | 2 +-
include/iocore/net/UDPEventIO.h | 2 +-
include/iocore/net/UDPNet.h | 8 +--
include/iocore/net/UDPPacket.h | 2 +-
include/iocore/net/YamlSNIConfig.h | 4 +-
include/iocore/net/quic/Mock.h | 36 +++++------
include/iocore/net/quic/QUICAckFrameCreator.h | 6 +-
include/iocore/net/quic/QUICAltConnectionManager.h | 6 +-
include/iocore/net/quic/QUICApplication.h | 10 +--
include/iocore/net/quic/QUICApplicationMap.h | 4 +-
include/iocore/net/quic/QUICBidirectionalStream.h | 4 +-
include/iocore/net/quic/QUICConfig.h | 4 +-
include/iocore/net/quic/QUICCongestionController.h | 2 +-
include/iocore/net/quic/QUICConnection.h | 6 +-
include/iocore/net/quic/QUICConnectionTable.h | 6 +-
include/iocore/net/quic/QUICContext.h | 10 +--
include/iocore/net/quic/QUICCryptoStream.h | 4 +-
include/iocore/net/quic/QUICDebugNames.h | 8 +--
include/iocore/net/quic/QUICEchoApp.h | 2 +-
include/iocore/net/quic/QUICEvents.h | 4 +-
include/iocore/net/quic/QUICFlowController.h | 10 +--
include/iocore/net/quic/QUICFrame.h | 4 +-
include/iocore/net/quic/QUICFrameDispatcher.h | 8 +--
include/iocore/net/quic/QUICFrameGenerator.h | 4 +-
include/iocore/net/quic/QUICFrameHandler.h | 2 +-
include/iocore/net/quic/QUICFrameRetransmitter.h | 2 +-
include/iocore/net/quic/QUICHandshake.h | 10 +--
include/iocore/net/quic/QUICHandshakeProtocol.h | 6 +-
include/iocore/net/quic/QUICIncomingFrameBuffer.h | 6 +-
include/iocore/net/quic/QUICKeyGenerator.h | 4 +-
include/iocore/net/quic/QUICLossDetector.h | 20 +++---
.../net/quic/QUICNewRenoCongestionController.h | 6 +-
include/iocore/net/quic/QUICPacket.h | 6 +-
include/iocore/net/quic/QUICPacketFactory.h | 6 +-
.../iocore/net/quic/QUICPacketHeaderProtector.h | 4 +-
.../iocore/net/quic/QUICPacketPayloadProtector.h | 6 +-
.../iocore/net/quic/QUICPacketProtectionKeyInfo.h | 4 +-
include/iocore/net/quic/QUICPacketReceiveQueue.h | 4 +-
include/iocore/net/quic/QUICPadder.h | 8 +--
include/iocore/net/quic/QUICPathManager.h | 2 +-
include/iocore/net/quic/QUICPathValidator.h | 8 +--
include/iocore/net/quic/QUICPinger.h | 8 +--
include/iocore/net/quic/QUICResetTokenTable.h | 2 +-
include/iocore/net/quic/QUICRetryIntegrityTag.h | 2 +-
include/iocore/net/quic/QUICStream.h | 22 +++----
include/iocore/net/quic/QUICStreamAdapter.h | 2 +-
include/iocore/net/quic/QUICStreamFactory.h | 2 +-
include/iocore/net/quic/QUICStreamManager.h | 6 +-
include/iocore/net/quic/QUICStreamManager_native.h | 16 ++---
include/iocore/net/quic/QUICStreamManager_quiche.h | 4 +-
include/iocore/net/quic/QUICStreamState.h | 4 +-
include/iocore/net/quic/QUICStreamVCAdapter.h | 4 +-
include/iocore/net/quic/QUICStream_native.h | 2 +-
include/iocore/net/quic/QUICStream_quiche.h | 2 +-
include/iocore/net/quic/QUICTLS.h | 6 +-
include/iocore/net/quic/QUICTokenCreator.h | 4 +-
include/iocore/net/quic/QUICTransportParameters.h | 2 +-
include/iocore/net/quic/QUICTypes.h | 4 +-
include/iocore/net/quic/QUICUnidirectionalStream.h | 4 +-
include/iocore/net/quic/QUICVersionNegotiator.h | 6 +-
include/iocore/net/quic/qlog/QLog.h | 2 +-
include/iocore/net/quic/qlog/QLogEvent.h | 6 +-
include/iocore/net/quic/qlog/QLogFrame.h | 2 +-
include/iocore/net/quic/qlog/QLogListener.h | 8 +--
include/iocore/net/quic/qlog/QLogUtils.h | 4 +-
include/iocore/utils/OneWayMultiTunnel.h | 2 +-
include/iocore/utils/OneWayTunnel.h | 2 +-
include/mgmt/config/FileManager.h | 2 +-
include/mgmt/rpc/handlers/common/RecordsUtils.h | 6 +-
include/mgmt/rpc/handlers/common/convert.h | 4 +-
include/mgmt/rpc/handlers/config/Configuration.h | 2 +-
include/mgmt/rpc/handlers/plugins/Plugins.h | 2 +-
include/mgmt/rpc/handlers/server/Server.h | 2 +-
include/mgmt/rpc/handlers/storage/Storage.h | 2 +-
include/mgmt/rpc/jsonrpc/Context.h | 2 +-
include/mgmt/rpc/jsonrpc/Defs.h | 2 +-
include/mgmt/rpc/jsonrpc/JsonRPC.h | 4 +-
include/mgmt/rpc/jsonrpc/JsonRPCManager.h | 4 +-
include/mgmt/rpc/jsonrpc/json/YAMLCodec.h | 4 +-
include/mgmt/rpc/server/CommBase.h | 2 +-
include/mgmt/rpc/server/IPCSocketServer.h | 4 +-
include/mgmt/rpc/server/RPCServer.h | 4 +-
include/proxy/CacheControl.h | 4 +-
include/proxy/ControlMatcher.h | 4 +-
include/proxy/IPAllow.h | 4 +-
include/proxy/Milestones.h | 2 +-
include/proxy/ParentConsistentHash.h | 2 +-
include/proxy/ParentRoundRobin.h | 2 +-
include/proxy/ParentSelection.h | 8 +--
include/proxy/PluginVC.h | 6 +-
include/proxy/PoolableSession.h | 2 +-
include/proxy/ProtocolProbeSessionAccept.h | 2 +-
include/proxy/ProxySession.h | 6 +-
include/proxy/ProxyTransaction.h | 2 +-
include/proxy/RegressionSM.h | 2 +-
include/proxy/ReverseProxy.h | 8 +--
include/proxy/Show.h | 2 +-
include/proxy/StatPages.h | 4 +-
include/proxy/Transform.h | 4 +-
include/proxy/TransformInternal.h | 2 +-
include/proxy/hdrs/HTTP.h | 4 +-
include/proxy/hdrs/HdrHeap.h | 2 +-
include/proxy/hdrs/HdrUtils.h | 2 +-
include/proxy/hdrs/HttpCompat.h | 2 +-
include/proxy/hdrs/MIME.h | 4 +-
include/proxy/hdrs/URL.h | 6 +-
include/proxy/http/ConnectingEntry.h | 2 +-
include/proxy/http/Http1ClientSession.h | 10 +--
include/proxy/http/Http1ClientTransaction.h | 2 +-
include/proxy/http/Http1ServerSession.h | 8 +--
include/proxy/http/Http1ServerTransaction.h | 2 +-
include/proxy/http/Http1Transaction.h | 2 +-
include/proxy/http/HttpBodyFactory.h | 8 +--
include/proxy/http/HttpCacheSM.h | 10 +--
include/proxy/http/HttpConfig.h | 6 +-
include/proxy/http/HttpConnectionCount.h | 4 +-
include/proxy/http/HttpDebugNames.h | 2 +-
include/proxy/http/HttpPages.h | 8 +--
include/proxy/http/HttpSM.h | 22 +++----
include/proxy/http/HttpSessionAccept.h | 11 ++--
include/proxy/http/HttpSessionManager.h | 4 +-
include/proxy/http/HttpTransact.h | 28 ++++----
include/proxy/http/HttpTunnel.h | 2 +-
include/proxy/http/HttpUserAgent.h | 14 ++--
include/proxy/http/HttpVCTable.h | 6 +-
include/proxy/http/PreWarmConfig.h | 2 +-
include/proxy/http/PreWarmManager.h | 18 +++---
include/proxy/http/remap/NextHopConsistentHash.h | 2 +-
include/proxy/http/remap/NextHopRoundRobin.h | 2 +-
.../proxy/http/remap/NextHopSelectionStrategy.h | 6 +-
include/proxy/http/remap/NextHopStrategyFactory.h | 2 +-
include/proxy/http/remap/PluginFactory.h | 4 +-
include/proxy/http/remap/RemapConfig.h | 2 +-
include/proxy/http/remap/RemapHitCount.h | 6 +-
include/proxy/http/remap/RemapPluginInfo.h | 2 +-
include/proxy/http/remap/RemapPlugins.h | 10 +--
include/proxy/http/remap/RemapProcessor.h | 8 +--
include/proxy/http/remap/UrlMapping.h | 10 +--
include/proxy/http/remap/UrlMappingPathIndex.h | 4 +-
include/proxy/http/remap/UrlRewrite.h | 10 +--
include/proxy/http2/HPACK.h | 4 +-
include/proxy/http2/HTTP2.h | 4 +-
include/proxy/http2/Http2ClientSession.h | 6 +-
include/proxy/http2/Http2CommonSession.h | 8 +--
include/proxy/http2/Http2CommonSessionInternal.h | 2 +-
include/proxy/http2/Http2ConnectionState.h | 12 ++--
include/proxy/http2/Http2DependencyTree.h | 2 +-
include/proxy/http2/Http2Frame.h | 4 +-
include/proxy/http2/Http2FrequencyCounter.h | 2 +-
include/proxy/http2/Http2ServerSession.h | 8 +--
include/proxy/http2/Http2SessionAccept.h | 4 +-
include/proxy/http2/Http2Stream.h | 12 ++--
include/proxy/http3/Http09App.h | 8 +--
include/proxy/http3/Http3App.h | 18 +++---
include/proxy/http3/Http3Config.h | 2 +-
include/proxy/http3/Http3DataFramer.h | 4 +-
include/proxy/http3/Http3DebugNames.h | 2 +-
include/proxy/http3/Http3Frame.h | 4 +-
include/proxy/http3/Http3FrameCollector.h | 6 +-
include/proxy/http3/Http3FrameDispatcher.h | 6 +-
include/proxy/http3/Http3FrameGenerator.h | 2 +-
include/proxy/http3/Http3FrameHandler.h | 4 +-
include/proxy/http3/Http3HeaderFramer.h | 10 +--
include/proxy/http3/Http3HeaderVIOAdaptor.h | 6 +-
include/proxy/http3/Http3ProtocolEnforcer.h | 4 +-
include/proxy/http3/Http3Session.h | 6 +-
include/proxy/http3/Http3SessionAccept.h | 4 +-
include/proxy/http3/Http3SettingsHandler.h | 4 +-
include/proxy/http3/Http3StreamDataVIOAdaptor.h | 2 +-
include/proxy/http3/Http3Transaction.h | 10 +--
include/proxy/http3/QPACK.h | 16 ++---
include/proxy/logging/Log.h | 4 +-
include/proxy/logging/LogAccess.h | 2 +-
include/proxy/logging/LogBuffer.h | 6 +-
include/proxy/logging/LogBufferSink.h | 2 +-
include/proxy/logging/LogConfig.h | 6 +-
include/proxy/logging/LogField.h | 4 +-
include/proxy/logging/LogFieldAliasMap.h | 2 +-
include/proxy/logging/LogFile.h | 2 +-
include/proxy/logging/LogFilter.h | 6 +-
include/proxy/logging/LogFormat.h | 2 +-
include/proxy/logging/LogObject.h | 14 ++--
include/records/RecCore.h | 2 +-
include/records/RecDefs.h | 2 +-
include/records/RecLocal.h | 2 +-
include/records/RecProcess.h | 2 +-
include/records/RecordsConfig.h | 2 +-
include/shared/overridable_txn_vars.h | 4 +-
include/shared/rpc/RPCClient.h | 4 +-
include/shared/rpc/yaml_codecs.h | 2 +-
include/ts/InkAPIPrivateIOCore.h | 8 +--
include/tscore/BaseLogFile.h | 12 ++--
include/tscore/ConsistentHash.h | 2 +-
include/tscore/ContFlags.h | 2 +-
include/tscore/CryptoHash.h | 2 +-
include/tscore/Diags.h | 6 +-
include/tscore/DiagsTypes.h | 14 ++--
include/tscore/Errata.h | 4 +-
include/tscore/LogMessage.h | 6 +-
include/tscore/Result.h | 2 +-
include/tscore/ink_platform.h | 2 +-
include/tscpp/util/Bravo.h | 2 +-
plugins/escalate/CMakeLists.txt | 2 -
.../access_control/unit_tests/CMakeLists.txt | 2 -
plugins/experimental/cookie_remap/CMakeLists.txt | 2 -
plugins/experimental/fastcgi/src/ats_fastcgi.cc | 2 +-
.../experimental/fastcgi/src/ats_fcgi_client.cc | 2 +-
.../experimental/fastcgi/src/server_intercept.cc | 2 +-
.../experimental/fastcgi/src/server_intercept.h | 2 +-
plugins/experimental/memcache/tsmemcache.cc | 4 +-
plugins/experimental/memcache/tsmemcache.h | 6 +-
plugins/libloader/CMakeLists.txt | 2 -
plugins/lua/CMakeLists.txt | 2 -
plugins/multiplexer/CMakeLists.txt | 2 -
plugins/regex_revalidate/CMakeLists.txt | 2 -
plugins/remap_purge/CMakeLists.txt | 2 -
plugins/server_push_preload/CMakeLists.txt | 2 -
plugins/slice/unit-tests/CMakeLists.txt | 3 -
plugins/stats_over_http/CMakeLists.txt | 2 -
plugins/tcpinfo/CMakeLists.txt | 2 -
src/api/APIHook.cc | 4 +-
src/api/APIHooks.cc | 4 +-
src/api/CMakeLists.txt | 37 +++--------
src/api/FetchSM.cc | 4 +-
src/api/InkAPI.cc | 74 +++++++++++-----------
src/api/InkAPITest.cc | 4 +-
src/api/InkContInternal.cc | 14 ++--
src/api/InkIOCoreAPI.cc | 10 +--
src/cripts/CMakeLists.txt | 4 --
src/iocore/CMakeLists.txt | 12 ----
src/iocore/aio/AIO.cc | 4 +-
src/iocore/aio/AIO_fault_injection.cc | 4 +-
src/iocore/aio/CMakeLists.txt | 6 --
src/iocore/aio/P_AIO.h | 6 +-
src/iocore/aio/test_AIO.cc | 2 +-
src/iocore/cache/CMakeLists.txt | 19 +-----
src/iocore/cache/Cache.cc | 8 +--
src/iocore/cache/CacheEvacuateDocVC.cc | 8 +--
src/iocore/cache/CachePages.cc | 6 +-
src/iocore/cache/CachePagesInternal.cc | 4 +-
src/iocore/cache/CacheRead.cc | 2 +-
src/iocore/cache/CacheVC.cc | 24 +++----
src/iocore/cache/CacheWrite.cc | 2 +-
src/iocore/cache/HttpTransactCache.cc | 10 +--
src/iocore/cache/P_Cache.h | 12 ++--
src/iocore/cache/P_CacheDir.h | 8 +--
src/iocore/cache/P_CacheDisk.h | 4 +-
src/iocore/cache/P_CacheHttp.h | 4 +-
src/iocore/cache/P_CacheInternal.h | 6 +-
src/iocore/cache/P_CacheTest.h | 2 +-
src/iocore/cache/P_RamCache.h | 2 +-
src/iocore/cache/RamCacheCLFUS.cc | 2 +-
src/iocore/cache/Vol.cc | 2 +-
src/iocore/cache/unit_tests/CacheTestHandler.cc | 2 +-
src/iocore/cache/unit_tests/main.cc | 4 +-
src/iocore/cache/unit_tests/main.h | 8 +--
src/iocore/cache/unit_tests/stub.cc | 4 +-
src/iocore/cache/unit_tests/test_CacheDir.cc | 4 +-
src/iocore/cache/unit_tests/test_CacheVol.cc | 4 +-
src/iocore/cache/unit_tests/test_Disk_Failure.cc | 2 +-
.../cache/unit_tests/test_Disk_Init_Failure.cc | 2 +-
.../test_Populated_Cache_Disk_Failure.cc | 2 +-
src/iocore/dns/CMakeLists.txt | 13 ----
src/iocore/dns/DNS.cc | 2 +-
src/iocore/dns/DNSEventIO.cc | 2 +-
src/iocore/dns/P_DNS.h | 8 +--
src/iocore/dns/P_DNSConnection.h | 4 +-
src/iocore/dns/P_DNSProcessor.h | 2 +-
src/iocore/dns/P_SplitDNS.h | 8 +--
src/iocore/dns/P_SplitDNSProcessor.h | 4 +-
src/iocore/dns/test_I_DNS.cc | 4 +-
src/iocore/eventsystem/CMakeLists.txt | 4 --
src/iocore/eventsystem/ConfigProcessor.cc | 2 +-
src/iocore/eventsystem/MIOBufferWriter.cc | 2 +-
src/iocore/eventsystem/P_EventSystem.h | 2 +-
src/iocore/eventsystem/P_Freer.h | 2 +-
src/iocore/eventsystem/P_ProtectedQueue.h | 2 +-
src/iocore/eventsystem/P_Thread.h | 2 +-
src/iocore/eventsystem/P_UnixEThread.h | 4 +-
src/iocore/eventsystem/P_UnixEventProcessor.h | 2 +-
src/iocore/eventsystem/P_UnixSocketManager.h | 2 +-
src/iocore/eventsystem/P_VConnection.h | 2 +-
src/iocore/eventsystem/P_VIO.h | 2 +-
src/iocore/eventsystem/ProxyAllocator.cc | 2 +-
src/iocore/eventsystem/RecProcess.cc | 12 ++--
src/iocore/eventsystem/RecRawStatsImpl.cc | 4 +-
src/iocore/eventsystem/Tasks.cc | 2 +-
.../eventsystem/unit_tests/test_EventSystem.cc | 4 +-
src/iocore/eventsystem/unit_tests/test_IOBuffer.cc | 4 +-
.../eventsystem/unit_tests/test_MIOBufferWriter.cc | 2 +-
src/iocore/hostdb/CMakeLists.txt | 15 -----
src/iocore/hostdb/HostDB.cc | 4 +-
src/iocore/hostdb/HostDBInfo.cc | 2 +-
src/iocore/hostdb/HostFile.cc | 2 +-
src/iocore/hostdb/P_HostDB.h | 8 +--
src/iocore/hostdb/P_HostDBProcessor.h | 2 +-
src/iocore/hostdb/P_RefCountCache.h | 4 +-
src/iocore/hostdb/RefCountCache.cc | 2 +-
src/iocore/hostdb/test_HostFile.cc | 2 +-
src/iocore/hostdb/test_I_HostDB.cc | 4 +-
src/iocore/hostdb/test_RefCountCache.cc | 2 +-
src/iocore/io_uring/CMakeLists.txt | 7 +-
src/iocore/io_uring/IOUringEventIO.cc | 4 +-
src/iocore/io_uring/io_uring.cc | 2 +-
src/iocore/io_uring/unit_tests/test_diskIO.cc | 2 +-
src/iocore/net/ALPNSupport.cc | 2 +-
src/iocore/net/AsyncSignalEventIO.cc | 4 +-
src/iocore/net/BIO_fastopen.cc | 4 +-
src/iocore/net/BoringSSLUtils.cc | 2 +-
src/iocore/net/CMakeLists.txt | 18 ------
src/iocore/net/EventIO.cc | 2 +-
src/iocore/net/Net.cc | 2 +-
src/iocore/net/NetAcceptEventIO.cc | 2 +-
src/iocore/net/NetHandler.cc | 6 +-
src/iocore/net/NetVCOptions.cc | 6 +-
src/iocore/net/OCSPStapling.cc | 2 +-
src/iocore/net/P_Net.h | 4 +-
src/iocore/net/P_NetAccept.h | 4 +-
src/iocore/net/P_NetVConnection.h | 4 +-
src/iocore/net/P_QUICNet.h | 2 +-
src/iocore/net/P_QUICNetProcessor_native.h | 2 +-
src/iocore/net/P_QUICNetProcessor_quiche.h | 2 +-
src/iocore/net/P_QUICNetVConnection_native.h | 64 +++++++++----------
src/iocore/net/P_QUICNetVConnection_quiche.h | 24 +++----
src/iocore/net/P_QUICNextProtocolAccept_native.h | 2 +-
src/iocore/net/P_QUICNextProtocolAccept_quiche.h | 2 +-
src/iocore/net/P_QUICPacketHandler_native.h | 6 +-
src/iocore/net/P_SNIActionPerformer.h | 6 +-
src/iocore/net/P_SSLCertLookup.h | 2 +-
src/iocore/net/P_SSLClientCoordinator.h | 2 +-
src/iocore/net/P_SSLConfig.h | 6 +-
src/iocore/net/P_SSLNetVConnection.h | 16 ++---
src/iocore/net/P_SSLNextProtocolAccept.h | 4 +-
src/iocore/net/P_SSLNextProtocolSet.h | 2 +-
src/iocore/net/P_Socks.h | 6 +-
src/iocore/net/P_UDPConnection.h | 2 +-
src/iocore/net/P_UDPNet.h | 4 +-
src/iocore/net/P_UnixNet.h | 10 +--
src/iocore/net/P_UnixNetProcessor.h | 6 +-
src/iocore/net/P_UnixNetState.h | 2 +-
src/iocore/net/P_UnixNetVConnection.h | 4 +-
src/iocore/net/P_UnixUDPConnection.h | 2 +-
src/iocore/net/PollCont.cc | 2 +-
src/iocore/net/ProxyProtocol.cc | 6 +-
src/iocore/net/QUICMultiCertConfigLoader.cc | 12 ++--
src/iocore/net/QUICNet.cc | 2 +-
src/iocore/net/QUICNetProcessor.cc | 8 +--
src/iocore/net/QUICNetProcessor_quiche.cc | 8 +--
src/iocore/net/QUICNetVConnection.cc | 24 +++----
src/iocore/net/QUICNetVConnection_quiche.cc | 6 +-
src/iocore/net/QUICPacketHandler.cc | 18 +++---
src/iocore/net/QUICPacketHandler_quiche.cc | 4 +-
src/iocore/net/QUICSupport.cc | 2 +-
src/iocore/net/ReadWriteEventIO.cc | 4 +-
src/iocore/net/SSLAPIHooks.cc | 2 +-
src/iocore/net/SSLCertLookup.cc | 4 +-
src/iocore/net/SSLClientCoordinator.cc | 2 +-
src/iocore/net/SSLClientUtils.cc | 6 +-
src/iocore/net/SSLConfig.cc | 8 +--
src/iocore/net/SSLDiags.cc | 4 +-
src/iocore/net/SSLNetProcessor.cc | 2 +-
src/iocore/net/SSLNetVConnection.cc | 12 ++--
src/iocore/net/SSLSNIConfig.cc | 2 +-
src/iocore/net/SSLSessionCache.cc | 4 +-
src/iocore/net/SSLSessionTicket.cc | 4 +-
src/iocore/net/SSLStats.cc | 4 +-
src/iocore/net/SSLUtils.cc | 20 +++---
src/iocore/net/TLSBasicSupport.cc | 4 +-
src/iocore/net/TLSCertSwitchSupport.cc | 2 +-
src/iocore/net/TLSEarlyDataSupport.cc | 2 +-
src/iocore/net/TLSSNISupport.cc | 4 +-
src/iocore/net/TLSSessionResumptionSupport.cc | 6 +-
src/iocore/net/TLSTunnelSupport.cc | 6 +-
src/iocore/net/UDPEventIO.cc | 2 +-
src/iocore/net/UnixNet.cc | 4 +-
src/iocore/net/UnixNetPages.cc | 4 +-
src/iocore/net/UnixNetProcessor.cc | 2 +-
src/iocore/net/UnixUDPNet.cc | 6 +-
src/iocore/net/YamlSNIConfig.cc | 2 +-
src/iocore/net/libinknet_stub.cc | 8 +--
src/iocore/net/quic/CMakeLists.txt | 7 --
src/iocore/net/quic/QUICAckFrameCreator.cc | 6 +-
src/iocore/net/quic/QUICAddrVerifyState.cc | 2 +-
src/iocore/net/quic/QUICAltConnectionManager.cc | 6 +-
src/iocore/net/quic/QUICApplication.cc | 4 +-
src/iocore/net/quic/QUICApplicationMap.cc | 2 +-
src/iocore/net/quic/QUICBidirectionalStream.cc | 4 +-
src/iocore/net/quic/QUICConfig.cc | 12 ++--
src/iocore/net/quic/QUICConnectionTable.cc | 2 +-
src/iocore/net/quic/QUICContext.cc | 8 +--
src/iocore/net/quic/QUICCryptoStream.cc | 2 +-
src/iocore/net/quic/QUICDebugNames.cc | 4 +-
src/iocore/net/quic/QUICEchoApp.cc | 8 +--
src/iocore/net/quic/QUICFlowController.cc | 4 +-
src/iocore/net/quic/QUICFrame.cc | 10 +--
src/iocore/net/quic/QUICFrameDispatcher.cc | 4 +-
src/iocore/net/quic/QUICFrameGenerator.cc | 2 +-
src/iocore/net/quic/QUICFrameRetransmitter.cc | 6 +-
src/iocore/net/quic/QUICGlobals.cc | 12 ++--
src/iocore/net/quic/QUICHKDF.cc | 2 +-
src/iocore/net/quic/QUICHandshake.cc | 14 ++--
src/iocore/net/quic/QUICIncomingFrameBuffer.cc | 2 +-
src/iocore/net/quic/QUICIntUtil.cc | 2 +-
src/iocore/net/quic/QUICKeyGenerator.cc | 6 +-
src/iocore/net/quic/QUICKeyGenerator_boringssl.cc | 2 +-
src/iocore/net/quic/QUICKeyGenerator_openssl.cc | 2 +-
src/iocore/net/quic/QUICLossDetector.cc | 16 ++---
src/iocore/net/quic/QUICPacket.cc | 8 +--
src/iocore/net/quic/QUICPacketFactory.cc | 6 +-
src/iocore/net/quic/QUICPacketHeaderProtector.cc | 8 +--
.../quic/QUICPacketHeaderProtector_boringssl.cc | 2 +-
.../net/quic/QUICPacketHeaderProtector_openssl.cc | 2 +-
src/iocore/net/quic/QUICPacketPayloadProtector.cc | 6 +-
.../quic/QUICPacketPayloadProtector_boringssl.cc | 4 +-
.../net/quic/QUICPacketPayloadProtector_openssl.cc | 4 +-
src/iocore/net/quic/QUICPacketProtectionKeyInfo.cc | 2 +-
src/iocore/net/quic/QUICPacketReceiveQueue.cc | 12 ++--
src/iocore/net/quic/QUICPadder.cc | 4 +-
src/iocore/net/quic/QUICPathManager.cc | 6 +-
src/iocore/net/quic/QUICPathValidator.cc | 4 +-
src/iocore/net/quic/QUICPinger.cc | 2 +-
src/iocore/net/quic/QUICResetTokenTable.cc | 4 +-
src/iocore/net/quic/QUICRetryIntegrityTag.cc | 2 +-
src/iocore/net/quic/QUICStream.cc | 4 +-
src/iocore/net/quic/QUICStreamAdapter.cc | 2 +-
src/iocore/net/quic/QUICStreamBase.cc | 4 +-
src/iocore/net/quic/QUICStreamFactory.cc | 8 +--
src/iocore/net/quic/QUICStreamManager.cc | 6 +-
src/iocore/net/quic/QUICStreamManager_native.cc | 2 +-
src/iocore/net/quic/QUICStreamManager_quiche.cc | 4 +-
src/iocore/net/quic/QUICStreamState.cc | 2 +-
src/iocore/net/quic/QUICStreamVCAdapter.cc | 4 +-
src/iocore/net/quic/QUICStream_quiche.cc | 4 +-
src/iocore/net/quic/QUICTLS.cc | 6 +-
src/iocore/net/quic/QUICTLS_boringssl.cc | 8 +--
src/iocore/net/quic/QUICTLS_openssl.cc | 8 +--
src/iocore/net/quic/QUICTokenCreator.cc | 2 +-
.../net/quic/QUICTransferProgressProvider.cc | 4 +-
src/iocore/net/quic/QUICTransportParameters.cc | 14 ++--
src/iocore/net/quic/QUICTypes.cc | 6 +-
src/iocore/net/quic/QUICUnidirectionalStream.cc | 4 +-
src/iocore/net/quic/QUICVersionNegotiator.cc | 4 +-
src/iocore/net/quic/qlog/QLog.cc | 2 +-
src/iocore/net/quic/qlog/QLogEvent.cc | 2 +-
src/iocore/net/quic/qlog/QLogFrame.cc | 2 +-
src/iocore/net/quic/test/event_processor_main.cc | 4 +-
src/iocore/net/quic/test/main.cc | 4 +-
.../net/quic/test/test_QUICAckFrameCreator.cc | 2 +-
.../net/quic/test/test_QUICAddrVerifyState.cc | 2 +-
.../net/quic/test/test_QUICAltConnectionManager.cc | 4 +-
.../net/quic/test/test_QUICFlowController.cc | 4 +-
src/iocore/net/quic/test/test_QUICFrame.cc | 6 +-
.../net/quic/test/test_QUICFrameDispatcher.cc | 4 +-
.../net/quic/test/test_QUICFrameRetransmitter.cc | 2 +-
.../net/quic/test/test_QUICHandshakeProtocol.cc | 20 +++---
.../net/quic/test/test_QUICIncomingFrameBuffer.cc | 4 +-
src/iocore/net/quic/test/test_QUICInvariants.cc | 2 +-
src/iocore/net/quic/test/test_QUICKeyGenerator.cc | 4 +-
src/iocore/net/quic/test/test_QUICLossDetector.cc | 14 ++--
src/iocore/net/quic/test/test_QUICPacket.cc | 2 +-
src/iocore/net/quic/test/test_QUICPacketFactory.cc | 6 +-
.../quic/test/test_QUICPacketHeaderProtector.cc | 18 +++---
src/iocore/net/quic/test/test_QUICPathValidator.cc | 4 +-
src/iocore/net/quic/test/test_QUICPinger.cc | 2 +-
src/iocore/net/quic/test/test_QUICStream.cc | 8 +--
src/iocore/net/quic/test/test_QUICStreamManager.cc | 8 +--
src/iocore/net/quic/test/test_QUICStreamState.cc | 6 +-
.../net/quic/test/test_QUICTransportParameters.cc | 2 +-
src/iocore/net/quic/test/test_QUICType.cc | 4 +-
src/iocore/net/quic/test/test_QUICTypeUtil.cc | 4 +-
.../net/quic/test/test_QUICVersionNegotiator.cc | 10 +--
src/iocore/net/quic/test_MTHashTable.cc | 4 +-
src/iocore/net/test_I_Net.cc | 2 +-
src/iocore/net/test_I_UDPNet.cc | 14 ++--
src/iocore/net/unit_tests/test_ProxyProtocol.cc | 2 +-
src/iocore/net/unit_tests/test_SSLSNIConfig.cc | 2 +-
src/iocore/net/unit_tests/test_YamlSNIConfig.cc | 2 +-
src/iocore/net/unit_tests/unit_test_main.cc | 10 +--
src/iocore/utils/CMakeLists.txt | 11 ----
src/iocore/utils/Machine.cc | 2 +-
src/iocore/utils/OneWayMultiTunnel.cc | 4 +-
src/iocore/utils/OneWayTunnel.cc | 4 +-
src/mgmt/config/AddConfigFilesHere.cc | 4 +-
src/mgmt/config/CMakeLists.txt | 11 ----
src/mgmt/config/FileManager.cc | 4 +-
src/mgmt/rpc/CMakeLists.txt | 25 +-------
src/mgmt/rpc/config/JsonRPCConfig.cc | 4 +-
src/mgmt/rpc/handlers/common/RecordsUtils.cc | 6 +-
src/mgmt/rpc/handlers/config/Configuration.cc | 8 +--
src/mgmt/rpc/handlers/plugins/Plugins.cc | 4 +-
src/mgmt/rpc/handlers/records/Records.cc | 4 +-
src/mgmt/rpc/handlers/server/Server.cc | 8 +--
src/mgmt/rpc/handlers/storage/Storage.cc | 6 +-
src/mgmt/rpc/jsonrpc/Context.cc | 2 +-
src/mgmt/rpc/jsonrpc/JsonRPCManager.cc | 4 +-
src/mgmt/rpc/jsonrpc/error/RPCError.cc | 2 +-
.../rpc/jsonrpc/unit_tests/test_basic_protocol.cc | 6 +-
src/mgmt/rpc/server/CommBase.cc | 2 +-
src/mgmt/rpc/server/IPCSocketServer.cc | 4 +-
src/mgmt/rpc/server/RPCServer.cc | 4 +-
src/mgmt/rpc/server/unit_tests/test_rpcserver.cc | 10 +--
src/proxy/CMakeLists.txt | 22 -------
src/proxy/CacheControl.cc | 14 ++--
src/proxy/ControlBase.cc | 10 +--
src/proxy/ControlMatcher.cc | 20 +++---
src/proxy/HostStatus.cc | 6 +-
src/proxy/HttpAPIHooks.cc | 2 +-
src/proxy/IPAllow.cc | 2 +-
src/proxy/ParentConsistentHash.cc | 4 +-
src/proxy/ParentRoundRobin.cc | 4 +-
src/proxy/ParentSelection.cc | 20 +++---
src/proxy/ParentSelectionStrategy.cc | 2 +-
src/proxy/Plugin.cc | 2 +-
src/proxy/PluginVC.cc | 6 +-
src/proxy/ProtocolProbeSessionAccept.cc | 14 ++--
src/proxy/ProxySession.cc | 8 +--
src/proxy/ProxyTransaction.cc | 4 +-
src/proxy/RegressionSM.cc | 4 +-
src/proxy/ReverseProxy.cc | 16 ++---
src/proxy/StatPages.cc | 6 +-
src/proxy/Transform.cc | 10 +--
src/proxy/hdrs/CMakeLists.txt | 7 --
src/proxy/hdrs/HTTP.cc | 4 +-
src/proxy/hdrs/HdrHeap.cc | 10 +--
src/proxy/hdrs/HdrTSOnly.cc | 4 +-
src/proxy/hdrs/HdrToken.cc | 8 +--
src/proxy/hdrs/HdrUtils.cc | 2 +-
src/proxy/hdrs/HeaderValidator.cc | 4 +-
src/proxy/hdrs/HttpCompat.cc | 4 +-
src/proxy/hdrs/HuffmanCodec.cc | 2 +-
src/proxy/hdrs/MIME.cc | 10 +--
src/proxy/hdrs/URL.cc | 6 +-
src/proxy/hdrs/VersionConverter.cc | 4 +-
src/proxy/hdrs/XPACK.cc | 4 +-
src/proxy/hdrs/load_http_hdr.cc | 6 +-
src/proxy/hdrs/test_urlhash.cc | 8 +--
src/proxy/hdrs/unit_tests/test_HdrHeap.cc | 4 +-
src/proxy/hdrs/unit_tests/test_HdrUtils.cc | 6 +-
src/proxy/hdrs/unit_tests/test_Hdrs.cc | 4 +-
src/proxy/hdrs/unit_tests/test_HeaderValidator.cc | 4 +-
src/proxy/hdrs/unit_tests/test_Huffmancode.cc | 2 +-
src/proxy/hdrs/unit_tests/test_URL.cc | 2 +-
src/proxy/hdrs/unit_tests/test_XPACK.cc | 4 +-
src/proxy/hdrs/unit_tests/test_mime.cc | 4 +-
src/proxy/hdrs/unit_tests/unit_test_main.cc | 4 +-
src/proxy/http/CMakeLists.txt | 21 +-----
src/proxy/http/ConnectingEntry.cc | 4 +-
src/proxy/http/ForwardedConfig.cc | 2 +-
src/proxy/http/Http1ClientSession.cc | 18 +++---
src/proxy/http/Http1ClientTransaction.cc | 6 +-
src/proxy/http/Http1ServerSession.cc | 6 +-
src/proxy/http/Http1ServerTransaction.cc | 4 +-
src/proxy/http/HttpBodyFactory.cc | 10 +--
src/proxy/http/HttpCacheSM.cc | 6 +-
src/proxy/http/HttpConfig.cc | 14 ++--
src/proxy/http/HttpConnectionCount.cc | 6 +-
src/proxy/http/HttpDebugNames.cc | 16 ++---
src/proxy/http/HttpPages.cc | 6 +-
src/proxy/http/HttpProxyServerMain.cc | 36 +++++------
src/proxy/http/HttpSM.cc | 65 ++++++++++---------
src/proxy/http/HttpSessionAccept.cc | 8 +--
src/proxy/http/HttpSessionManager.cc | 8 +--
src/proxy/http/HttpTransact.cc | 32 +++++-----
src/proxy/http/HttpTransactHeaders.cc | 18 +++---
src/proxy/http/HttpTunnel.cc | 10 +--
src/proxy/http/HttpVCTable.cc | 8 +--
src/proxy/http/PreWarmConfig.cc | 4 +-
src/proxy/http/PreWarmManager.cc | 16 ++---
src/proxy/http/RegressionHttpTransact.cc | 4 +-
src/proxy/http/TestUrl.cc | 2 +-
src/proxy/http/remap/AclFiltering.cc | 4 +-
src/proxy/http/remap/CMakeLists.txt | 13 ----
src/proxy/http/remap/NextHopConsistentHash.cc | 6 +-
src/proxy/http/remap/NextHopHealthStatus.cc | 4 +-
src/proxy/http/remap/NextHopRoundRobin.cc | 4 +-
src/proxy/http/remap/NextHopSelectionStrategy.cc | 6 +-
src/proxy/http/remap/NextHopStrategyFactory.cc | 6 +-
src/proxy/http/remap/PluginDso.cc | 6 +-
src/proxy/http/remap/PluginFactory.cc | 6 +-
src/proxy/http/remap/RemapConfig.cc | 12 ++--
src/proxy/http/remap/RemapHitCount.cc | 4 +-
src/proxy/http/remap/RemapPluginInfo.cc | 4 +-
src/proxy/http/remap/RemapPlugins.cc | 2 +-
src/proxy/http/remap/RemapProcessor.cc | 2 +-
src/proxy/http/remap/UrlMapping.cc | 2 +-
src/proxy/http/remap/UrlMappingPathIndex.cc | 2 +-
src/proxy/http/remap/UrlRewrite.cc | 10 +--
.../http/remap/unit-tests/nexthop_test_stubs.cc | 6 +-
.../http/remap/unit-tests/nexthop_test_stubs.h | 4 +-
.../http/remap/unit-tests/plugin_testing_calls.cc | 2 +-
.../http/remap/unit-tests/plugin_testing_common.h | 2 +-
.../remap/unit-tests/test_NextHopConsistentHash.cc | 10 +--
.../remap/unit-tests/test_NextHopRoundRobin.cc | 8 +--
.../unit-tests/test_NextHopStrategyFactory.cc | 8 +--
src/proxy/http/remap/unit-tests/test_PluginDso.cc | 2 +-
.../http/remap/unit-tests/test_PluginFactory.cc | 8 +--
.../http/remap/unit-tests/test_RemapPlugin.cc | 2 +-
src/proxy/http/testheaders.cc | 4 +-
src/proxy/http/unit_tests/CMakeLists.txt | 8 ---
src/proxy/http/unit_tests/main.cc | 4 +-
src/proxy/http/unit_tests/test_ForwardedConfig.cc | 2 +-
src/proxy/http/unit_tests/test_HttpTransact.cc | 2 +-
src/proxy/http/unit_tests/test_HttpUserAgent.cc | 14 ++--
src/proxy/http/unit_tests/test_PreWarm.cc | 2 +-
.../http/unit_tests/test_error_page_selection.cc | 2 +-
src/proxy/http2/CMakeLists.txt | 17 +----
src/proxy/http2/HPACK.cc | 2 +-
src/proxy/http2/HTTP2.cc | 12 ++--
src/proxy/http2/Http2ClientSession.cc | 10 +--
src/proxy/http2/Http2CommonSession.cc | 4 +-
src/proxy/http2/Http2ConnectionState.cc | 24 +++----
src/proxy/http2/Http2DebugNames.cc | 4 +-
src/proxy/http2/Http2Frame.cc | 2 +-
src/proxy/http2/Http2FrequencyCounter.cc | 2 +-
src/proxy/http2/Http2ServerSession.cc | 8 +--
src/proxy/http2/Http2SessionAccept.cc | 8 +--
src/proxy/http2/Http2Stream.cc | 12 ++--
src/proxy/http2/test_HPACK.cc | 6 +-
src/proxy/http2/unit_tests/main.cc | 6 +-
src/proxy/http2/unit_tests/test_HTTP2.cc | 2 +-
.../http2/unit_tests/test_HpackIndexingTable.cc | 2 +-
.../http2/unit_tests/test_Http2DependencyTree.cc | 2 +-
src/proxy/http2/unit_tests/test_Http2Frame.cc | 2 +-
.../http2/unit_tests/test_Http2FrequencyCounter.cc | 2 +-
src/proxy/http3/CMakeLists.txt | 16 -----
src/proxy/http3/Http09App.cc | 16 ++---
src/proxy/http3/Http3.cc | 2 +-
src/proxy/http3/Http3App.cc | 26 ++++----
src/proxy/http3/Http3Config.cc | 2 +-
src/proxy/http3/Http3DataFramer.cc | 6 +-
src/proxy/http3/Http3DebugNames.cc | 4 +-
src/proxy/http3/Http3Frame.cc | 6 +-
src/proxy/http3/Http3FrameCollector.cc | 4 +-
src/proxy/http3/Http3FrameDispatcher.cc | 6 +-
src/proxy/http3/Http3HeaderFramer.cc | 10 +--
src/proxy/http3/Http3HeaderVIOAdaptor.cc | 8 +--
src/proxy/http3/Http3ProtocolEnforcer.cc | 4 +-
src/proxy/http3/Http3Session.cc | 6 +-
src/proxy/http3/Http3SessionAccept.cc | 14 ++--
src/proxy/http3/Http3SettingsHandler.cc | 2 +-
src/proxy/http3/Http3StreamDataVIOAdaptor.cc | 4 +-
src/proxy/http3/Http3Transaction.cc | 18 +++---
src/proxy/http3/Http3Types.cc | 2 +-
src/proxy/http3/QPACK.cc | 6 +-
src/proxy/http3/test/Mock.h | 2 +-
src/proxy/http3/test/main.cc | 2 +-
src/proxy/http3/test/main_qpack.cc | 10 +--
src/proxy/http3/test/stub.cc | 4 +-
src/proxy/http3/test/test_Http3Frame.cc | 6 +-
src/proxy/http3/test/test_Http3FrameDispatcher.cc | 4 +-
src/proxy/http3/test/test_QPACK.cc | 8 +--
src/proxy/logging/CMakeLists.txt | 13 +---
src/proxy/logging/Log.cc | 30 ++++-----
src/proxy/logging/LogAccess.cc | 12 ++--
src/proxy/logging/LogAccessTest.h | 2 +-
src/proxy/logging/LogBuffer.cc | 22 +++----
src/proxy/logging/LogConfig.cc | 22 +++----
src/proxy/logging/LogField.cc | 12 ++--
src/proxy/logging/LogFieldAliasMap.cc | 2 +-
src/proxy/logging/LogFile.cc | 22 +++----
src/proxy/logging/LogFilter.cc | 18 +++---
src/proxy/logging/LogFormat.cc | 18 +++---
src/proxy/logging/LogObject.cc | 14 ++--
src/proxy/logging/LogStandalone.cc | 10 +--
src/proxy/logging/LogUtils.cc | 8 +--
src/proxy/logging/RolledLogDeleter.cc | 4 +-
src/proxy/logging/YamlLogConfig.cc | 8 +--
src/proxy/logging/YamlLogConfigDecoders.cc | 6 +-
.../logging/unit-tests/benchmark_LogObject.cc | 6 +-
src/proxy/logging/unit-tests/test_LogUtils.cc | 4 +-
src/proxy/private/SSLProxySession.cc | 6 +-
src/proxy/shared/CMakeLists.txt | 2 +-
src/proxy/shared/DiagsConfig.cc | 4 +-
src/records/CMakeLists.txt | 8 ---
src/records/P_RecCore.cc | 8 +--
{include => src}/records/P_RecCore.h | 2 +-
{include => src}/records/P_RecDefs.h | 2 +-
{include => src}/records/P_RecFile.h | 0
{include => src}/records/P_RecLocal.h | 0
{include => src}/records/P_RecMessage.h | 0
{include => src}/records/P_RecProcess.h | 4 +-
{include => src}/records/P_RecUtils.h | 0
src/records/RecConfigParse.cc | 8 +--
src/records/RecCore.cc | 6 +-
src/records/RecDebug.cc | 4 +-
src/records/RecFile.cc | 6 +-
src/records/RecHttp.cc | 4 +-
src/records/RecMessage.cc | 10 +--
src/records/RecRawStats.cc | 4 +-
src/records/RecUtils.cc | 4 +-
src/records/RecYAMLDecoder.cc | 2 +-
src/records/test_I_RecProcess.cc | 2 +-
src/records/test_RecordsConfig.cc | 2 +-
{include => src}/records/test_RecordsConfig.h | 0
.../unit_tests/unit_test_main_on_eventsystem.cc | 4 +-
src/tests/CMakeLists.txt | 32 +++++-----
src/traffic_cache_tool/CacheScan.cc | 8 +--
src/traffic_crashlog/traffic_crashlog.cc | 2 +-
src/traffic_ctl/CMakeLists.txt | 1 -
src/traffic_layout/engine.cc | 2 +-
src/traffic_layout/info.cc | 2 +-
src/traffic_logcat/CMakeLists.txt | 1 -
src/traffic_logcat/logcat.cc | 24 +++----
src/traffic_logstats/CMakeLists.txt | 1 -
src/traffic_logstats/logstats.cc | 6 +-
src/traffic_quic/quic_client.cc | 6 +-
src/traffic_quic/quic_client.h | 12 ++--
src/traffic_quic/traffic_quic.cc | 36 +++++------
src/traffic_server/CMakeLists.txt | 13 ----
src/traffic_server/EventName.cc | 10 +--
src/traffic_server/RpcAdminPubHandlers.cc | 12 ++--
src/traffic_server/SocksProxy.cc | 6 +-
src/traffic_server/traffic_server.cc | 72 ++++++++++-----------
src/tscore/CMakeLists.txt | 1 -
src/tscpp/util/CMakeLists.txt | 1 -
src/wccp/wccp-test-router.cc | 2 +-
tests/fuzzing/CMakeLists.txt | 14 +---
tests/fuzzing/fuzz_esi.cc | 2 +-
tests/fuzzing/fuzz_hpack.cc | 4 +-
tests/fuzzing/fuzz_http.cc | 4 +-
tests/fuzzing/fuzz_json.cc | 6 +-
tests/fuzzing/fuzz_proxy_protocol.cc | 2 +-
tests/gold_tests/jsonrpc/plugins/CMakeLists.txt | 2 -
.../jsonrpc/plugins/jsonrpc_plugin_handler_test.cc | 2 +-
tools/benchmark/benchmark_ProxyAllocator.cc | 4 +-
786 files changed, 2220 insertions(+), 2566 deletions(-)
diff --git a/doc/developer-guide/jsonrpc/jsonrpc-handler-development.en.rst b/doc/developer-guide/jsonrpc/jsonrpc-handler-development.en.rst
index cba7aebf10..3eb5140448 100644
--- a/doc/developer-guide/jsonrpc/jsonrpc-handler-development.en.rst
+++ b/doc/developer-guide/jsonrpc/jsonrpc-handler-development.en.rst
@@ -141,7 +141,7 @@ The actual registration:
.. code-block:: cpp
- #include "rpc/jsonrpc/JsonRPC.h"
+ #include "mgmt/rpc/jsonrpc/JsonRPC.h"
...
rpc::add_method_handler("my_handler_impl", &my_handler_impl);
@@ -169,7 +169,7 @@ Registration for notifications uses a different API:
.. code-block:: cpp
- #include "rpc/jsonrpc/JsonRPC.h"
+ #include "mgmt/rpc/jsonrpc/JsonRPC.h"
rpc::add_notification_handler("my_notification_handler", &my_notification_handler);
diff --git a/example/cripts/CMakeLists.txt b/example/cripts/CMakeLists.txt
index 3a24078a10..dab7ce79a2 100644
--- a/example/cripts/CMakeLists.txt
+++ b/example/cripts/CMakeLists.txt
@@ -28,7 +28,6 @@
add_atsplugin(cripts_example1 example1.cc)
-target_include_directories(cripts_example1 PRIVATE "${PROJECT_SOURCE_DIR}/include")
target_link_libraries(cripts_example1 PRIVATE ts::cripts)
# This is a hack, but useful to run clang-tidy across all of Cripts
diff --git a/include/api/APIHooks.h b/include/api/APIHooks.h
index e1e379769e..4bd675a4af 100644
--- a/include/api/APIHooks.h
+++ b/include/api/APIHooks.h
@@ -23,7 +23,7 @@
#pragma once
-#include "APIHook.h"
+#include "api/APIHook.h"
#include "ts/InkAPIPrivateIOCore.h"
diff --git a/include/api/FeatureAPIHooks.h b/include/api/FeatureAPIHooks.h
index 1d62cfc7c6..2163c0b9db 100644
--- a/include/api/FeatureAPIHooks.h
+++ b/include/api/FeatureAPIHooks.h
@@ -23,8 +23,8 @@
#pragma once
-#include "APIHook.h"
-#include "APIHooks.h"
+#include "api/APIHook.h"
+#include "api/APIHooks.h"
#include "ts/InkAPIPrivateIOCore.h"
diff --git a/include/api/FetchSM.h b/include/api/FetchSM.h
index 984887ddc8..621c538ccc 100644
--- a/include/api/FetchSM.h
+++ b/include/api/FetchSM.h
@@ -29,9 +29,9 @@
#pragma once
-#include "P_Net.h"
-#include "HttpSM.h"
-#include "HttpTunnel.h"
+#include "../../src/iocore/net/P_Net.h"
+#include "proxy/http/HttpSM.h"
+#include "proxy/http/HttpTunnel.h"
class PluginVC;
diff --git a/include/api/InkAPIInternal.h b/include/api/InkAPIInternal.h
index e3a7f0e2b1..d17fb28a81 100644
--- a/include/api/InkAPIInternal.h
+++ b/include/api/InkAPIInternal.h
@@ -23,15 +23,15 @@
#pragma once
-#include "EventSystem.h"
-#include "URL.h"
-#include "Net.h"
-#include "HTTP.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/hdrs/URL.h"
+#include "iocore/net/Net.h"
+#include "proxy/hdrs/HTTP.h"
#include "tscore/List.h"
-#include "ConfigProcessor.h"
-#include "Cache.h"
-#include "Tasks.h"
-#include "Plugin.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "iocore/cache/Cache.h"
+#include "iocore/eventsystem/Tasks.h"
+#include "proxy/Plugin.h"
#include "api/APIHook.h"
#include "api/APIHooks.h"
@@ -152,7 +152,7 @@ private:
std::unordered_map<std::string, std::tuple<INKContInternal *, swoc::file::path, swoc::file::file_time_type>> cb_table;
};
-#include "HttpAPIHooks.h"
+#include "proxy/HttpAPIHooks.h"
class HttpHookState
{
diff --git a/include/api/LifecycleAPIHooks.h b/include/api/LifecycleAPIHooks.h
index 50178be8a7..fafb7700d8 100644
--- a/include/api/LifecycleAPIHooks.h
+++ b/include/api/LifecycleAPIHooks.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "FeatureAPIHooks.h"
+#include "api/FeatureAPIHooks.h"
#include "ts/apidefs.h"
diff --git a/include/iocore/aio/AIO.h b/include/iocore/aio/AIO.h
index 6d793a5ffa..8e72fda285 100644
--- a/include/iocore/aio/AIO.h
+++ b/include/iocore/aio/AIO.h
@@ -31,7 +31,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "records/RecProcess.h"
static constexpr ts::ModuleVersion AIO_MODULE_PUBLIC_VERSION(1, 0, ts::ModuleVersion::PUBLIC);
diff --git a/include/iocore/aio/AIO_fault_injection.h b/include/iocore/aio/AIO_fault_injection.h
index c95693a524..3e42150f0f 100644
--- a/include/iocore/aio/AIO_fault_injection.h
+++ b/include/iocore/aio/AIO_fault_injection.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Continuation.h"
-#include "Lock.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/Lock.h"
#include "tscore/ink_assert.h"
#include "tscore/ink_mutex.h"
#include <cerrno>
diff --git a/include/iocore/cache/Cache.h b/include/iocore/cache/Cache.h
index faaacc1475..8b4ae1a073 100644
--- a/include/iocore/cache/Cache.h
+++ b/include/iocore/cache/Cache.h
@@ -24,10 +24,10 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
-#include "AIO.h"
-#include "CacheDefs.h"
-#include "Store.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/aio/AIO.h"
+#include "iocore/cache/CacheDefs.h"
+#include "iocore/cache/Store.h"
static constexpr ts::ModuleVersion CACHE_MODULE_VERSION(1, 0);
diff --git a/include/iocore/cache/CacheDefs.h b/include/iocore/cache/CacheDefs.h
index 6cfded4f40..8165ce1973 100644
--- a/include/iocore/cache/CacheDefs.h
+++ b/include/iocore/cache/CacheDefs.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Event.h"
-#include "VConnection.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/VConnection.h"
#include "tscore/Version.h"
#include "tscore/CryptoHash.h"
diff --git a/include/iocore/cache/CacheEvacuateDocVC.h b/include/iocore/cache/CacheEvacuateDocVC.h
index 13cbc99cd9..03ce9d5d1b 100644
--- a/include/iocore/cache/CacheEvacuateDocVC.h
+++ b/include/iocore/cache/CacheEvacuateDocVC.h
@@ -24,16 +24,16 @@
#pragma once
/*
-#include "P_CacheDir.h"
+#include "../../../src/iocore/cache/P_CacheDir.h"
*/
-#include "CacheVC.h"
+#include "iocore/cache/CacheVC.h"
// eventsystem
-#include "Continuation.h"
-#include "EThread.h"
-#include "Event.h"
-#include "ProxyAllocator.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/ProxyAllocator.h"
// tscore
#include "tscore/ink_assert.h"
diff --git a/include/iocore/cache/CacheVC.h b/include/iocore/cache/CacheVC.h
index fc9fd60a5f..f5ffe23c09 100644
--- a/include/iocore/cache/CacheVC.h
+++ b/include/iocore/cache/CacheVC.h
@@ -25,21 +25,21 @@
/*
// inkcache
-#include "Cache.h"
-#include "P_CacheDir.h"
-#include "P_CacheVol.h"
+#include "iocore/cache/Cache.h"
+#include "../../../src/iocore/cache/P_CacheDir.h"
+#include "../../../src/iocore/cache/P_CacheVol.h"
*/
-#include "P_CacheHttp.h"
+#include "../../../src/iocore/cache/P_CacheHttp.h"
// aio
-#include "AIO.h"
+#include "iocore/aio/AIO.h"
// inkevent
-#include "Action.h"
-#include "Continuation.h"
-#include "Event.h"
-#include "IOBuffer.h"
-#include "VIO.h"
+#include "iocore/eventsystem/Action.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/eventsystem/VIO.h"
// tscore
#include "tscore/ink_hrtime.h"
diff --git a/include/iocore/cache/HttpTransactCache.h b/include/iocore/cache/HttpTransactCache.h
index 09243fd697..09af4fdff8 100644
--- a/include/iocore/cache/HttpTransactCache.h
+++ b/include/iocore/cache/HttpTransactCache.h
@@ -31,7 +31,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "HttpConfig.h"
+#include "proxy/http/HttpConfig.h"
// This is needed since txn_conf->cache_guaranteed_max_lifetime is currently not
// readily available in the cache. ToDo: We should fix this with TS-1919
diff --git a/include/iocore/dns/DNS.h b/include/iocore/dns/DNS.h
index b34fa61713..1f66efd173 100644
--- a/include/iocore/dns/DNS.h
+++ b/include/iocore/dns/DNS.h
@@ -30,7 +30,7 @@
#pragma once
-#include "EventSystem.h"
-#include "HostDB.h"
-#include "Net.h"
-#include "DNSProcessor.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/hostdb/HostDB.h"
+#include "iocore/net/Net.h"
+#include "iocore/dns/DNSProcessor.h"
diff --git a/include/iocore/dns/DNSEventIO.h b/include/iocore/dns/DNSEventIO.h
index 9e8c8304e2..e20c3c3e10 100644
--- a/include/iocore/dns/DNSEventIO.h
+++ b/include/iocore/dns/DNSEventIO.h
@@ -30,7 +30,7 @@
#pragma once
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
struct DNSConnection;
diff --git a/include/iocore/dns/DNSProcessor.h b/include/iocore/dns/DNSProcessor.h
index c860cc3575..4730fa5350 100644
--- a/include/iocore/dns/DNSProcessor.h
+++ b/include/iocore/dns/DNSProcessor.h
@@ -24,8 +24,8 @@
#pragma once
#include "tscore/ink_resolver.h"
-#include "EventSystem.h"
-#include "SRV.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/dns/SRV.h"
// Events
#define DNS_EVENT_LOOKUP DNS_EVENT_EVENTS_START
diff --git a/include/iocore/dns/SplitDNS.h b/include/iocore/dns/SplitDNS.h
index d5ef0a0ba1..150e166796 100644
--- a/include/iocore/dns/SplitDNS.h
+++ b/include/iocore/dns/SplitDNS.h
@@ -30,7 +30,7 @@
#pragma once
-#include "SplitDNSProcessor.h"
+#include "iocore/dns/SplitDNSProcessor.h"
#include "tscore/Version.h"
static constexpr ts::ModuleVersion SPLITDNS_MODULE_PUBLIC_VERSION(1, 0, ts::ModuleVersion::PUBLIC);
diff --git a/include/iocore/eventsystem/Action.h b/include/iocore/eventsystem/Action.h
index 666c1c7de4..50561c4791 100644
--- a/include/iocore/eventsystem/Action.h
+++ b/include/iocore/eventsystem/Action.h
@@ -25,8 +25,8 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Thread.h"
-#include "Continuation.h"
+#include "iocore/eventsystem/Thread.h"
+#include "iocore/eventsystem/Continuation.h"
/**
Represents an operation initiated on a Processor.
diff --git a/include/iocore/eventsystem/ConfigProcessor.h b/include/iocore/eventsystem/ConfigProcessor.h
index ea6d33abf1..6af0da2020 100644
--- a/include/iocore/eventsystem/ConfigProcessor.h
+++ b/include/iocore/eventsystem/ConfigProcessor.h
@@ -25,7 +25,7 @@
#include <atomic>
-#include "Tasks.h"
+#include "iocore/eventsystem/Tasks.h"
class ProxyMutex;
diff --git a/include/iocore/eventsystem/Continuation.h b/include/iocore/eventsystem/Continuation.h
index 984819e357..a702a3ea5e 100644
--- a/include/iocore/eventsystem/Continuation.h
+++ b/include/iocore/eventsystem/Continuation.h
@@ -37,7 +37,7 @@
#include "tscore/ink_platform.h"
#include "tscore/List.h"
-#include "Lock.h"
+#include "iocore/eventsystem/Lock.h"
#include "tscore/ContFlags.h"
class Continuation;
diff --git a/include/iocore/eventsystem/EThread.h b/include/iocore/eventsystem/EThread.h
index e547656688..8f7e069773 100644
--- a/include/iocore/eventsystem/EThread.h
+++ b/include/iocore/eventsystem/EThread.h
@@ -27,9 +27,9 @@
#include "tscore/ink_platform.h"
#include "tscore/ink_rand.h"
#include "tscore/Version.h"
-#include "Thread.h"
-#include "PriorityEventQueue.h"
-#include "ProtectedQueue.h"
+#include "iocore/eventsystem/Thread.h"
+#include "iocore/eventsystem/PriorityEventQueue.h"
+#include "iocore/eventsystem/ProtectedQueue.h"
#include "tscpp/util/Histogram.h"
// TODO: This would be much nicer to have "run-time" configurable (or something)
diff --git a/include/iocore/eventsystem/Event.h b/include/iocore/eventsystem/Event.h
index 2e84ad8d76..17522e9168 100644
--- a/include/iocore/eventsystem/Event.h
+++ b/include/iocore/eventsystem/Event.h
@@ -25,7 +25,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Action.h"
+#include "iocore/eventsystem/Action.h"
//
// Defines
diff --git a/include/iocore/eventsystem/EventProcessor.h b/include/iocore/eventsystem/EventProcessor.h
index 61fafcff35..1d5ff07cf4 100644
--- a/include/iocore/eventsystem/EventProcessor.h
+++ b/include/iocore/eventsystem/EventProcessor.h
@@ -24,9 +24,9 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Continuation.h"
-#include "Processor.h"
-#include "Event.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/Processor.h"
+#include "iocore/eventsystem/Event.h"
#include <atomic>
#ifdef TS_MAX_THREADS_IN_EACH_THREAD_TYPE
diff --git a/include/iocore/eventsystem/EventSystem.h b/include/iocore/eventsystem/EventSystem.h
index 63144a293d..dae0387965 100644
--- a/include/iocore/eventsystem/EventSystem.h
+++ b/include/iocore/eventsystem/EventSystem.h
@@ -28,23 +28,23 @@
#include "tscore/ink_platform.h"
#include "ts/apidefs.h"
-#include "IOBuffer.h"
-#include "Action.h"
-#include "Continuation.h"
-#include "EThread.h"
-#include "Event.h"
-#include "EventProcessor.h"
-
-#include "Lock.h"
-#include "PriorityEventQueue.h"
-#include "Processor.h"
-#include "ProtectedQueue.h"
-#include "Thread.h"
-#include "VIO.h"
-#include "VConnection.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/eventsystem/Action.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/EventProcessor.h"
+
+#include "iocore/eventsystem/Lock.h"
+#include "iocore/eventsystem/PriorityEventQueue.h"
+#include "iocore/eventsystem/Processor.h"
+#include "iocore/eventsystem/ProtectedQueue.h"
+#include "iocore/eventsystem/Thread.h"
+#include "iocore/eventsystem/VIO.h"
+#include "iocore/eventsystem/VConnection.h"
#include "records/RecProcess.h"
-#include "SocketManager.h"
-#include "RecProcess.h"
+#include "iocore/eventsystem/SocketManager.h"
+#include "iocore/eventsystem/RecProcess.h"
static constexpr ts::ModuleVersion EVENT_SYSTEM_MODULE_PUBLIC_VERSION(1, 0, ts::ModuleVersion::PUBLIC);
diff --git a/include/iocore/eventsystem/Lock.h b/include/iocore/eventsystem/Lock.h
index 61edd616bf..d0a92bff2c 100644
--- a/include/iocore/eventsystem/Lock.h
+++ b/include/iocore/eventsystem/Lock.h
@@ -25,7 +25,7 @@
#include "tscore/ink_platform.h"
#include "tscore/Diags.h"
-#include "Thread.h"
+#include "iocore/eventsystem/Thread.h"
#define MAX_LOCK_TIME HRTIME_MSECONDS(200)
#define THREAD_MUTEX_THREAD_HOLDING (-1024 * 1024)
diff --git a/include/iocore/eventsystem/MIOBufferWriter.h b/include/iocore/eventsystem/MIOBufferWriter.h
index 5aa47e2597..10aee82e4a 100644
--- a/include/iocore/eventsystem/MIOBufferWriter.h
+++ b/include/iocore/eventsystem/MIOBufferWriter.h
@@ -36,7 +36,7 @@
#include "tscpp/util/ts_bw.h"
#if !defined(UNIT_TEST_BUFFER_WRITER)
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
#endif
/** BufferWriter interface on top of IOBuffer blocks.
diff --git a/include/iocore/eventsystem/PriorityEventQueue.h b/include/iocore/eventsystem/PriorityEventQueue.h
index 505e0a0e7e..2a475e4ac7 100644
--- a/include/iocore/eventsystem/PriorityEventQueue.h
+++ b/include/iocore/eventsystem/PriorityEventQueue.h
@@ -24,7 +24,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Event.h"
+#include "iocore/eventsystem/Event.h"
// <5ms, 10, 20, 40, 80, 160, 320, 640, 1280, 2560, 5120
#define N_PQ_LIST 10
diff --git a/include/iocore/eventsystem/ProtectedQueue.h b/include/iocore/eventsystem/ProtectedQueue.h
index 1c971faf4c..f6a8421c32 100644
--- a/include/iocore/eventsystem/ProtectedQueue.h
+++ b/include/iocore/eventsystem/ProtectedQueue.h
@@ -35,7 +35,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Event.h"
+#include "iocore/eventsystem/Event.h"
struct ProtectedQueue {
void enqueue(Event *e);
void signal();
diff --git a/include/iocore/eventsystem/Tasks.h b/include/iocore/eventsystem/Tasks.h
index 84ff2515ca..1a849a9301 100644
--- a/include/iocore/eventsystem/Tasks.h
+++ b/include/iocore/eventsystem/Tasks.h
@@ -24,7 +24,7 @@
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
extern EventType ET_TASK;
diff --git a/include/iocore/eventsystem/Thread.h b/include/iocore/eventsystem/Thread.h
index 97d427ab08..31a446186b 100644
--- a/include/iocore/eventsystem/Thread.h
+++ b/include/iocore/eventsystem/Thread.h
@@ -60,7 +60,7 @@
#include <functional>
-#include "ProxyAllocator.h"
+#include "iocore/eventsystem/ProxyAllocator.h"
#include "tscore/Ptr.h"
#include "tscore/ink_platform.h"
#include "tscore/ink_thread.h"
diff --git a/include/iocore/eventsystem/VConnection.h b/include/iocore/eventsystem/VConnection.h
index d81a630d8d..9c731181e7 100644
--- a/include/iocore/eventsystem/VConnection.h
+++ b/include/iocore/eventsystem/VConnection.h
@@ -26,7 +26,7 @@
#include "tscore/ink_platform.h"
#include "tscore/PluginUserArgs.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#if !defined(I_VIO_h)
#error "include VIO.h"
diff --git a/include/iocore/hostdb/HostDB.h b/include/iocore/hostdb/HostDB.h
index 61c488c50e..f5014ba002 100644
--- a/include/iocore/hostdb/HostDB.h
+++ b/include/iocore/hostdb/HostDB.h
@@ -30,10 +30,10 @@
#pragma once
-#include "EventSystem.h"
-#include "Net.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Net.h"
-#include "HostDBProcessor.h"
+#include "iocore/hostdb/HostDBProcessor.h"
// TS-1925: switch from MMH to MD5 hash; bumped to version 2
// switch from MD5 to SHA256 hash; bumped to version 3
diff --git a/include/iocore/hostdb/HostDBProcessor.h b/include/iocore/hostdb/HostDBProcessor.h
index 760a8924dc..bb06a3f85f 100644
--- a/include/iocore/hostdb/HostDBProcessor.h
+++ b/include/iocore/hostdb/HostDBProcessor.h
@@ -36,8 +36,8 @@
#include "swoc/MemSpan.h"
-#include "EventSystem.h"
-#include "SRV.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/dns/SRV.h"
// Event returned on a lookup
#define EVENT_HOST_DB_LOOKUP (HOSTDB_EVENT_EVENTS_START + 0)
diff --git a/include/iocore/hostdb/HostFile.h b/include/iocore/hostdb/HostFile.h
index cbc71e5d61..a16e49f24d 100644
--- a/include/iocore/hostdb/HostFile.h
+++ b/include/iocore/hostdb/HostFile.h
@@ -25,7 +25,7 @@
#include "swoc/swoc_file.h"
-#include "HostDBProcessor.h"
+#include "iocore/hostdb/HostDBProcessor.h"
#include "swoc/TextView.h"
#include <memory>
diff --git a/include/iocore/io_uring/IOUringEventIO.h b/include/iocore/io_uring/IOUringEventIO.h
index cf0962091c..36f73fa78d 100644
--- a/include/iocore/io_uring/IOUringEventIO.h
+++ b/include/iocore/io_uring/IOUringEventIO.h
@@ -24,7 +24,7 @@
#pragma once
#include "tscore/ink_config.h"
#if TS_USE_LINUX_IO_URING
-#include "../net/EventIO.h"
+#include "iocore/net/EventIO.h"
class IOUringContext;
class IOUringEventIO : public EventIO
diff --git a/include/iocore/net/AcceptOptions.h b/include/iocore/net/AcceptOptions.h
index 8c26f25919..43069ef2b4 100644
--- a/include/iocore/net/AcceptOptions.h
+++ b/include/iocore/net/AcceptOptions.h
@@ -26,7 +26,7 @@
#include "tscore/ink_inet.h"
-#include "Event.h"
+#include "iocore/eventsystem/Event.h"
struct AcceptOptions {
using self = AcceptOptions; ///< Self reference type.
diff --git a/include/iocore/net/AsyncSignalEventIO.h b/include/iocore/net/AsyncSignalEventIO.h
index 515b0c1933..f351c6afc7 100644
--- a/include/iocore/net/AsyncSignalEventIO.h
+++ b/include/iocore/net/AsyncSignalEventIO.h
@@ -23,7 +23,7 @@
*/
#pragma once
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
class EThread;
diff --git a/include/iocore/net/EventIO.h b/include/iocore/net/EventIO.h
index 684dc5ca33..633c3038ee 100644
--- a/include/iocore/net/EventIO.h
+++ b/include/iocore/net/EventIO.h
@@ -22,7 +22,7 @@
*/
#pragma once
-#include "P_UnixPollDescriptor.h"
+#include "../../../src/iocore/net/P_UnixPollDescriptor.h"
using EventLoop = PollDescriptor *;
diff --git a/include/iocore/net/Net.h b/include/iocore/net/Net.h
index d24f29f910..9ab7e525da 100644
--- a/include/iocore/net/Net.h
+++ b/include/iocore/net/Net.h
@@ -41,7 +41,7 @@
#pragma once
#include "tscore/Version.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include <netinet/in.h>
#ifndef UIO_MAXIOV
diff --git a/include/iocore/net/NetAcceptEventIO.h b/include/iocore/net/NetAcceptEventIO.h
index 0e525bba07..d302a8f02e 100644
--- a/include/iocore/net/NetAcceptEventIO.h
+++ b/include/iocore/net/NetAcceptEventIO.h
@@ -23,7 +23,7 @@
#pragma once
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
struct NetAccept;
diff --git a/include/iocore/net/NetEvent.h b/include/iocore/net/NetEvent.h
index 33d767a2dc..202d578f20 100644
--- a/include/iocore/net/NetEvent.h
+++ b/include/iocore/net/NetEvent.h
@@ -25,10 +25,10 @@
#include <atomic>
-#include "EventSystem.h"
-#include "P_UnixNetState.h"
-#include "EventIO.h"
-#include "ReadWriteEventIO.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "../../../src/iocore/net/P_UnixNetState.h"
+#include "iocore/net/EventIO.h"
+#include "iocore/net/ReadWriteEventIO.h"
class NetHandler;
diff --git a/include/iocore/net/NetHandler.h b/include/iocore/net/NetHandler.h
index 1e953b92b3..93a27f18d8 100644
--- a/include/iocore/net/NetHandler.h
+++ b/include/iocore/net/NetHandler.h
@@ -23,9 +23,9 @@
#pragma once
-#include "Continuation.h"
-#include "EThread.h"
-#include "NetEvent.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/net/NetEvent.h"
//
// NetHandler
diff --git a/include/iocore/net/NetProcessor.h b/include/iocore/net/NetProcessor.h
index 154195e5b9..0c71e974b6 100644
--- a/include/iocore/net/NetProcessor.h
+++ b/include/iocore/net/NetProcessor.h
@@ -24,10 +24,10 @@
#pragma once
-#include "EventSystem.h"
-#include "Socks.h"
-#include "NetVConnection.h"
-#include "AcceptOptions.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Socks.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/AcceptOptions.h"
struct socks_conf_struct;
#define NET_CONNECT_TIMEOUT 30
diff --git a/include/iocore/net/NetTimeout.h b/include/iocore/net/NetTimeout.h
index 904c76d637..b10570994b 100644
--- a/include/iocore/net/NetTimeout.h
+++ b/include/iocore/net/NetTimeout.h
@@ -26,7 +26,7 @@
#include "tscore/List.h"
#include "tscore/ink_hrtime.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
/**
NetTimeout - handle active & inactive timeout
diff --git a/include/iocore/net/NetVCOptions.h b/include/iocore/net/NetVCOptions.h
index d2d8eba879..eff56d78e1 100644
--- a/include/iocore/net/NetVCOptions.h
+++ b/include/iocore/net/NetVCOptions.h
@@ -23,9 +23,9 @@
*/
#pragma once
#include "tscore/ink_inet.h"
-#include "EventSystem.h"
-#include "Event.h"
-#include "YamlSNIConfig.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/net/YamlSNIConfig.h"
#include <cstdint>
diff --git a/include/iocore/net/NetVConnection.h b/include/iocore/net/NetVConnection.h
index 757222acc4..8bdea61d17 100644
--- a/include/iocore/net/NetVConnection.h
+++ b/include/iocore/net/NetVConnection.h
@@ -23,22 +23,22 @@
*/
#pragma once
-#include "NetVCOptions.h"
-#include "ProxyProtocol.h"
-#include "Net.h"
+#include "iocore/net/NetVCOptions.h"
+#include "iocore/net/ProxyProtocol.h"
+#include "iocore/net/Net.h"
#include <string_view>
#include <optional>
#include "tscore/ink_inet.h"
-#include "Action.h"
-#include "VConnection.h"
-#include "Event.h"
+#include "iocore/eventsystem/Action.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "iocore/eventsystem/Event.h"
#include "tscore/List.h"
-#include "IOBuffer.h"
-#include "Socks.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/net/Socks.h"
#include "ts/apidefs.h"
-#include "YamlSNIConfig.h"
+#include "iocore/net/YamlSNIConfig.h"
#include "swoc/TextView.h"
#define CONNECT_SUCCESS 1
diff --git a/include/iocore/net/PollCont.h b/include/iocore/net/PollCont.h
index 93bd0cccaa..0e9203b651 100644
--- a/include/iocore/net/PollCont.h
+++ b/include/iocore/net/PollCont.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Continuation.h"
-#include "Net.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/net/Net.h"
class NetHandler;
struct PollDescriptor;
diff --git a/include/iocore/net/PreWarm.h b/include/iocore/net/PreWarm.h
index 4add8a0425..2164d6e506 100644
--- a/include/iocore/net/PreWarm.h
+++ b/include/iocore/net/PreWarm.h
@@ -24,7 +24,7 @@
#pragma once
// inknet
-#include "SSLTypes.h"
+#include "iocore/net/SSLTypes.h"
// records
#include "records/RecHttp.h"
diff --git a/include/iocore/net/QUICMultiCertConfigLoader.h b/include/iocore/net/QUICMultiCertConfigLoader.h
index 6ee7df7bc0..fb6e62127b 100644
--- a/include/iocore/net/QUICMultiCertConfigLoader.h
+++ b/include/iocore/net/QUICMultiCertConfigLoader.h
@@ -23,8 +23,8 @@
#pragma once
-#include "P_SSLCertLookup.h"
-#include "P_SSLUtils.h"
+#include "../../../src/iocore/net/P_SSLCertLookup.h"
+#include "../../../src/iocore/net/P_SSLUtils.h"
class QUICCertConfig
{
diff --git a/include/iocore/net/QUICSupport.h b/include/iocore/net/QUICSupport.h
index c6c26044f1..29ad4801d9 100644
--- a/include/iocore/net/QUICSupport.h
+++ b/include/iocore/net/QUICSupport.h
@@ -25,7 +25,7 @@
#include <openssl/ssl.h>
-#include "quic/QUICConnection.h"
+#include "iocore/net/quic/QUICConnection.h"
class QUICSupport
{
diff --git a/include/iocore/net/ReadWriteEventIO.h b/include/iocore/net/ReadWriteEventIO.h
index 2152e3715f..d9cc77d138 100644
--- a/include/iocore/net/ReadWriteEventIO.h
+++ b/include/iocore/net/ReadWriteEventIO.h
@@ -24,7 +24,7 @@
#pragma once
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
class NetHandler;
class NetEvent;
diff --git a/include/iocore/net/SNIActionPerformer.h b/include/iocore/net/SNIActionPerformer.h
index b747941207..5e49822857 100644
--- a/include/iocore/net/SNIActionPerformer.h
+++ b/include/iocore/net/SNIActionPerformer.h
@@ -32,7 +32,7 @@
#include <vector>
#include <optional>
-#include "TLSSNISupport.h"
+#include "iocore/net/TLSSNISupport.h"
#include "tscore/ink_inet.h"
#include "ts/DbgCtl.h"
diff --git a/include/iocore/net/SSLSNIConfig.h b/include/iocore/net/SSLSNIConfig.h
index deb503f1f9..434d43d202 100644
--- a/include/iocore/net/SSLSNIConfig.h
+++ b/include/iocore/net/SSLSNIConfig.h
@@ -39,9 +39,9 @@
#include "tscpp/util/ts_ip.h"
-#include "ConfigProcessor.h"
-#include "SNIActionPerformer.h"
-#include "YamlSNIConfig.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "iocore/net/SNIActionPerformer.h"
+#include "iocore/net/YamlSNIConfig.h"
#include <functional>
diff --git a/include/iocore/net/SSLSessionCache.h b/include/iocore/net/SSLSessionCache.h
index 11b165a634..d41d75f8b0 100644
--- a/include/iocore/net/SSLSessionCache.h
+++ b/include/iocore/net/SSLSessionCache.h
@@ -23,10 +23,10 @@
#include "tscore/List.h"
#include "tscore/ink_mutex.h"
-#include "P_EventSystem.h"
+#include "../../../src/iocore/eventsystem/P_EventSystem.h"
#include "records/RecProcess.h"
#include "tscore/ink_platform.h"
-#include "P_SSLUtils.h"
+#include "../../../src/iocore/net/P_SSLUtils.h"
#include "ts/apidefs.h"
#include <openssl/ssl.h>
#include <mutex>
diff --git a/include/iocore/net/SSLStats.h b/include/iocore/net/SSLStats.h
index e63c40f5f9..b57150846f 100644
--- a/include/iocore/net/SSLStats.h
+++ b/include/iocore/net/SSLStats.h
@@ -26,7 +26,7 @@
#include <unordered_map>
#include "records/RecProcess.h"
-#include "SSLDiags.h"
+#include "iocore/net/SSLDiags.h"
#include "api/Metrics.h"
diff --git a/include/iocore/net/SessionAccept.h b/include/iocore/net/SessionAccept.h
index 49f354bb66..7bcf1f00b5 100644
--- a/include/iocore/net/SessionAccept.h
+++ b/include/iocore/net/SessionAccept.h
@@ -23,9 +23,9 @@
#pragma once
-#include "Net.h"
-#include "VConnection.h"
-#include "NetVConnection.h"
+#include "iocore/net/Net.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "iocore/net/NetVConnection.h"
struct AclRecord;
struct HttpProxyPort;
diff --git a/include/iocore/net/TLSBasicSupport.h b/include/iocore/net/TLSBasicSupport.h
index 440aa1387a..97a9de4e20 100644
--- a/include/iocore/net/TLSBasicSupport.h
+++ b/include/iocore/net/TLSBasicSupport.h
@@ -27,7 +27,7 @@
#include <openssl/ssl.h>
#include "tscore/ink_hrtime.h"
-#include "P_SSLUtils.h"
+#include "../../../src/iocore/net/P_SSLUtils.h"
class TLSBasicSupport
{
diff --git a/include/iocore/net/TLSCertSwitchSupport.h b/include/iocore/net/TLSCertSwitchSupport.h
index 451933f5f3..ebfe2eb544 100644
--- a/include/iocore/net/TLSCertSwitchSupport.h
+++ b/include/iocore/net/TLSCertSwitchSupport.h
@@ -25,7 +25,7 @@
#pragma once
#include <openssl/ssl.h>
-#include "P_SSLCertLookup.h"
+#include "../../../src/iocore/net/P_SSLCertLookup.h"
class TLSCertSwitchSupport
{
diff --git a/include/iocore/net/TLSSessionResumptionSupport.h b/include/iocore/net/TLSSessionResumptionSupport.h
index fb27ed3a39..a1ff716a3b 100644
--- a/include/iocore/net/TLSSessionResumptionSupport.h
+++ b/include/iocore/net/TLSSessionResumptionSupport.h
@@ -27,8 +27,8 @@
#include <openssl/ssl.h>
#include "tscore/ink_inet.h"
-#include "P_SSLCertLookup.h"
-#include "P_SSLUtils.h"
+#include "../../../src/iocore/net/P_SSLCertLookup.h"
+#include "../../../src/iocore/net/P_SSLUtils.h"
class TLSSessionResumptionSupport
{
diff --git a/include/iocore/net/TLSTunnelSupport.h b/include/iocore/net/TLSTunnelSupport.h
index 491940e000..249470f116 100644
--- a/include/iocore/net/TLSTunnelSupport.h
+++ b/include/iocore/net/TLSTunnelSupport.h
@@ -24,13 +24,13 @@
#pragma once
-#include "PreWarm.h"
+#include "iocore/net/PreWarm.h"
#include <openssl/ssl.h>
#include "tscore/ink_memory.h"
#include "tscore/ink_inet.h"
-#include "YamlSNIConfig.h"
+#include "iocore/net/YamlSNIConfig.h"
class TLSTunnelSupport
{
diff --git a/include/iocore/net/UDPConnection.h b/include/iocore/net/UDPConnection.h
index 0cec141c27..5aff836c12 100644
--- a/include/iocore/net/UDPConnection.h
+++ b/include/iocore/net/UDPConnection.h
@@ -31,7 +31,7 @@
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#define INK_ETHERNET_MTU_SIZE 1472
class UDPPacket;
/**
diff --git a/include/iocore/net/UDPEventIO.h b/include/iocore/net/UDPEventIO.h
index b5623d3792..3a53374ff4 100644
--- a/include/iocore/net/UDPEventIO.h
+++ b/include/iocore/net/UDPEventIO.h
@@ -23,7 +23,7 @@
#pragma once
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
class UDPNetHandler;
class UnixUDPConnection;
diff --git a/include/iocore/net/UDPNet.h b/include/iocore/net/UDPNet.h
index 53c27b3792..ed896a64b2 100644
--- a/include/iocore/net/UDPNet.h
+++ b/include/iocore/net/UDPNet.h
@@ -32,9 +32,9 @@
#pragma once
#include "tscore/Version.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/ink_inet.h"
-#include "NetVCOptions.h"
+#include "iocore/net/NetVCOptions.h"
/**
UDP service
@@ -107,5 +107,5 @@ public:
extern UDPNetProcessor &udpNet;
extern EventType ET_UDP;
-#include "UDPPacket.h"
-#include "UDPConnection.h"
+#include "iocore/net/UDPPacket.h"
+#include "iocore/net/UDPConnection.h"
diff --git a/include/iocore/net/UDPPacket.h b/include/iocore/net/UDPPacket.h
index 29878ac5ec..1d5c5413d0 100644
--- a/include/iocore/net/UDPPacket.h
+++ b/include/iocore/net/UDPPacket.h
@@ -31,7 +31,7 @@
#pragma once
-#include "UDPConnection.h"
+#include "iocore/net/UDPConnection.h"
struct UDPPacketInternal {
// packet scheduling stuff: keep it a doubly linked list
diff --git a/include/iocore/net/YamlSNIConfig.h b/include/iocore/net/YamlSNIConfig.h
index 90043c136f..eed19f56be 100644
--- a/include/iocore/net/YamlSNIConfig.h
+++ b/include/iocore/net/YamlSNIConfig.h
@@ -29,8 +29,8 @@
#include <memory>
#include <cstdint>
-#include "SNIActionPerformer.h"
-#include "SSLTypes.h"
+#include "iocore/net/SNIActionPerformer.h"
+#include "iocore/net/SSLTypes.h"
#include "tscpp/util/ts_ip.h"
diff --git a/include/iocore/net/quic/Mock.h b/include/iocore/net/quic/Mock.h
index 00fb738dc8..c90dd4a544 100644
--- a/include/iocore/net/quic/Mock.h
+++ b/include/iocore/net/quic/Mock.h
@@ -23,30 +23,30 @@
#pragma once
-#include "P_Net.h"
+#include "../../../../src/iocore/net/P_Net.h"
-#include "QUICApplication.h"
-#include "QUICStreamManager.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStreamManager.h"
#if TS_HAS_QUICHE
-#include "QUICStreamManager_quiche.h"
+#include "iocore/net/quic/QUICStreamManager_quiche.h"
#else
-#include "QUICStreamManager_native.h"
+#include "iocore/net/quic/QUICStreamManager_native.h"
#endif
-#include "QUICLossDetector.h"
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPinger.h"
-#include "QUICPadder.h"
-#include "QUICEvents.h"
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPathManager.h"
-#include "QUICPinger.h"
-#include "QUICPadder.h"
-#include "QUICHandshakeProtocol.h"
-#include "QUICStreamAdapter.h"
+#include "iocore/net/quic/QUICLossDetector.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPinger.h"
+#include "iocore/net/quic/QUICPadder.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPathManager.h"
+#include "iocore/net/quic/QUICPinger.h"
+#include "iocore/net/quic/QUICPadder.h"
+#include "iocore/net/quic/QUICHandshakeProtocol.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
#if TS_HAS_QUICHE
-#include "QUICStream_quiche.h"
+#include "iocore/net/quic/QUICStream_quiche.h"
#else
-#include "QUICStream_native.h"
+#include "iocore/net/quic/QUICStream_native.h"
#endif
class MockQUICContext;
diff --git a/include/iocore/net/quic/QUICAckFrameCreator.h b/include/iocore/net/quic/QUICAckFrameCreator.h
index ab1fabd835..1e1c397780 100644
--- a/include/iocore/net/quic/QUICAckFrameCreator.h
+++ b/include/iocore/net/quic/QUICAckFrameCreator.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICFrameGenerator.h"
-#include "QUICTypes.h"
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrame.h"
#include <list>
class QUICConnection;
diff --git a/include/iocore/net/quic/QUICAltConnectionManager.h b/include/iocore/net/quic/QUICAltConnectionManager.h
index 37d6837884..185af27dc6 100644
--- a/include/iocore/net/quic/QUICAltConnectionManager.h
+++ b/include/iocore/net/quic/QUICAltConnectionManager.h
@@ -26,9 +26,9 @@
#include <inttypes.h>
#include <queue>
-#include "QUICFrameGenerator.h"
-#include "QUICTypes.h"
-#include "QUICConnection.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConnection.h"
class QUICConnectionTable;
class QUICResetTokenTable;
diff --git a/include/iocore/net/quic/QUICApplication.h b/include/iocore/net/quic/QUICApplication.h
index ffd4a53dd6..0a87d8b1c9 100644
--- a/include/iocore/net/quic/QUICApplication.h
+++ b/include/iocore/net/quic/QUICApplication.h
@@ -23,11 +23,11 @@
#pragma once
-#include "EventSystem.h"
-#include "IOBuffer.h"
-#include "QUICTypes.h"
-#include "QUICConnection.h"
-#include "QUICStream.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICStream.h"
class QUICApplication;
diff --git a/include/iocore/net/quic/QUICApplicationMap.h b/include/iocore/net/quic/QUICApplicationMap.h
index 5a3c1fae4c..b803cc707d 100644
--- a/include/iocore/net/quic/QUICApplicationMap.h
+++ b/include/iocore/net/quic/QUICApplicationMap.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICApplication.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICApplication.h"
#include <map>
class QUICApplicationMap
diff --git a/include/iocore/net/quic/QUICBidirectionalStream.h b/include/iocore/net/quic/QUICBidirectionalStream.h
index 30295279ea..898d781fa1 100644
--- a/include/iocore/net/quic/QUICBidirectionalStream.h
+++ b/include/iocore/net/quic/QUICBidirectionalStream.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICStream.h"
-#include "QUICStream_native.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICStream_native.h"
class QUICBidirectionalStream : public QUICStreamBase, public QUICTransferProgressProvider
{
diff --git a/include/iocore/net/quic/QUICConfig.h b/include/iocore/net/quic/QUICConfig.h
index ccbdace0ca..40f6794d55 100644
--- a/include/iocore/net/quic/QUICConfig.h
+++ b/include/iocore/net/quic/QUICConfig.h
@@ -25,8 +25,8 @@
#include <openssl/ssl.h>
-#include "ConfigProcessor.h"
-#include "P_SSLCertLookup.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "../../../../src/iocore/net/P_SSLCertLookup.h"
class QUICConfigParams : public ConfigInfo
{
diff --git a/include/iocore/net/quic/QUICCongestionController.h b/include/iocore/net/quic/QUICCongestionController.h
index 7417ac873a..9ecfa75a1e 100644
--- a/include/iocore/net/quic/QUICCongestionController.h
+++ b/include/iocore/net/quic/QUICCongestionController.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFrame.h"
class QUICCongestionController
{
diff --git a/include/iocore/net/quic/QUICConnection.h b/include/iocore/net/quic/QUICConnection.h
index 58d262b02a..5324c62e67 100644
--- a/include/iocore/net/quic/QUICConnection.h
+++ b/include/iocore/net/quic/QUICConnection.h
@@ -23,9 +23,9 @@
#pragma once
-#include "EventSystem.h"
-#include "NetVConnection.h"
-#include "QUICFrameHandler.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
class QUICApplication;
class QUICStreamManager;
diff --git a/include/iocore/net/quic/QUICConnectionTable.h b/include/iocore/net/quic/QUICConnectionTable.h
index edd0bd53f0..ffdde56289 100644
--- a/include/iocore/net/quic/QUICConnectionTable.h
+++ b/include/iocore/net/quic/QUICConnectionTable.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICConnection.h"
-#include "MTHashTable.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/MTHashTable.h"
class QUICConnectionTable
{
diff --git a/include/iocore/net/quic/QUICContext.h b/include/iocore/net/quic/QUICContext.h
index 5a0de04e12..0b258b67dd 100644
--- a/include/iocore/net/quic/QUICContext.h
+++ b/include/iocore/net/quic/QUICContext.h
@@ -23,11 +23,11 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICConnection.h"
-#include "QUICConfig.h"
-#include "QUICEvents.h"
-#include "QUICCongestionController.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICCongestionController.h"
class QUICRTTProvider;
class QUICCongestionController;
diff --git a/include/iocore/net/quic/QUICCryptoStream.h b/include/iocore/net/quic/QUICCryptoStream.h
index a1331f82de..9ef12f87a1 100644
--- a/include/iocore/net/quic/QUICCryptoStream.h
+++ b/include/iocore/net/quic/QUICCryptoStream.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICStream.h"
-#include "QUICStream_native.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICStream_native.h"
/**
* @brief QUIC Crypto stream
diff --git a/include/iocore/net/quic/QUICDebugNames.h b/include/iocore/net/quic/QUICDebugNames.h
index f80c8ae620..66b3bda650 100644
--- a/include/iocore/net/quic/QUICDebugNames.h
+++ b/include/iocore/net/quic/QUICDebugNames.h
@@ -23,10 +23,10 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICEvents.h"
-#include "QUICTransportParameters.h"
-#include "QUICStreamState.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
+#include "iocore/net/quic/QUICStreamState.h"
class QUICDebugNames
{
diff --git a/include/iocore/net/quic/QUICEchoApp.h b/include/iocore/net/quic/QUICEchoApp.h
index 8a61f90850..e60a2597bb 100644
--- a/include/iocore/net/quic/QUICEchoApp.h
+++ b/include/iocore/net/quic/QUICEchoApp.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICApplication.h"
+#include "iocore/net/quic/QUICApplication.h"
/**
* @brief Echo over QUIC
diff --git a/include/iocore/net/quic/QUICEvents.h b/include/iocore/net/quic/QUICEvents.h
index 7bc98b966d..ab42fe92ac 100644
--- a/include/iocore/net/quic/QUICEvents.h
+++ b/include/iocore/net/quic/QUICEvents.h
@@ -23,8 +23,8 @@
#pragma once
-#include "EventSystem.h"
-#include "Event.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/Event.h"
enum {
QUIC_EVENT_PACKET_READ_READY = QUIC_EVENT_EVENTS_START,
diff --git a/include/iocore/net/quic/QUICFlowController.h b/include/iocore/net/quic/QUICFlowController.h
index 1d3281d705..e61deb6b78 100644
--- a/include/iocore/net/quic/QUICFlowController.h
+++ b/include/iocore/net/quic/QUICFlowController.h
@@ -23,11 +23,11 @@
#pragma once
-#include "EventSystem.h"
-#include "QUICTypes.h"
-#include "QUICFrame.h"
-#include "QUICFrameGenerator.h"
-#include "QUICLossDetector.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICLossDetector.h"
class QUICRateAnalyzer
{
diff --git a/include/iocore/net/quic/QUICFrame.h b/include/iocore/net/quic/QUICFrame.h
index f76dd53c64..5d97c05709 100644
--- a/include/iocore/net/quic/QUICFrame.h
+++ b/include/iocore/net/quic/QUICFrame.h
@@ -27,12 +27,12 @@
#include "tscore/Allocator.h"
#include "tscore/List.h"
#include "tscore/Ptr.h"
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
#include <vector>
#include <iterator>
#include <set>
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICFrame;
class QUICStreamFrame;
diff --git a/include/iocore/net/quic/QUICFrameDispatcher.h b/include/iocore/net/quic/QUICFrameDispatcher.h
index 435103badc..c5939c3b16 100644
--- a/include/iocore/net/quic/QUICFrameDispatcher.h
+++ b/include/iocore/net/quic/QUICFrameDispatcher.h
@@ -25,10 +25,10 @@
#include <vector>
-#include "QUICConnection.h"
-#include "QUICFrame.h"
-#include "QUICFrameHandler.h"
-#include "QUICContext.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICContext.h"
class QUICFrameDispatcher
{
diff --git a/include/iocore/net/quic/QUICFrameGenerator.h b/include/iocore/net/quic/QUICFrameGenerator.h
index c54001e61c..3ab01888b0 100644
--- a/include/iocore/net/quic/QUICFrameGenerator.h
+++ b/include/iocore/net/quic/QUICFrameGenerator.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICFrame.h"
-#include "QUICFrameRetransmitter.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICFrameRetransmitter.h"
class QUICFrameGenerator
{
diff --git a/include/iocore/net/quic/QUICFrameHandler.h b/include/iocore/net/quic/QUICFrameHandler.h
index 5a2870f986..a5902c9101 100644
--- a/include/iocore/net/quic/QUICFrameHandler.h
+++ b/include/iocore/net/quic/QUICFrameHandler.h
@@ -24,7 +24,7 @@
#pragma once
#include <vector>
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICFrame;
diff --git a/include/iocore/net/quic/QUICFrameRetransmitter.h b/include/iocore/net/quic/QUICFrameRetransmitter.h
index fd0756537d..959dd63a70 100644
--- a/include/iocore/net/quic/QUICFrameRetransmitter.h
+++ b/include/iocore/net/quic/QUICFrameRetransmitter.h
@@ -24,7 +24,7 @@
#pragma once
#include <deque>
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFrame.h"
class QUICFrameGenerator;
diff --git a/include/iocore/net/quic/QUICHandshake.h b/include/iocore/net/quic/QUICHandshake.h
index 923f0aaeba..12f9743a1b 100644
--- a/include/iocore/net/quic/QUICHandshake.h
+++ b/include/iocore/net/quic/QUICHandshake.h
@@ -23,11 +23,11 @@
#pragma once
-#include "QUICConnection.h"
-#include "QUICTransportParameters.h"
-#include "QUICFrameHandler.h"
-#include "QUICFrameGenerator.h"
-#include "QUICCryptoStream.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICCryptoStream.h"
/**
* @class QUICHandshake
diff --git a/include/iocore/net/quic/QUICHandshakeProtocol.h b/include/iocore/net/quic/QUICHandshakeProtocol.h
index 8bc6e77618..39f9c56c18 100644
--- a/include/iocore/net/quic/QUICHandshakeProtocol.h
+++ b/include/iocore/net/quic/QUICHandshakeProtocol.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICKeyGenerator.h"
-#include "QUICTypes.h"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
class QUICHandshakeProtocol;
class QUICPacketProtectionKeyInfo;
diff --git a/include/iocore/net/quic/QUICIncomingFrameBuffer.h b/include/iocore/net/quic/QUICIncomingFrameBuffer.h
index 6251908b6d..3f0659f137 100644
--- a/include/iocore/net/quic/QUICIncomingFrameBuffer.h
+++ b/include/iocore/net/quic/QUICIncomingFrameBuffer.h
@@ -26,9 +26,9 @@
#include <map>
#include <queue>
-#include "QUICTypes.h"
-#include "QUICFrame.h"
-#include "QUICTransferProgressProvider.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICTransferProgressProvider.h"
class QUICIncomingFrameBuffer
{
diff --git a/include/iocore/net/quic/QUICKeyGenerator.h b/include/iocore/net/quic/QUICKeyGenerator.h
index db2924c786..fe70029b38 100644
--- a/include/iocore/net/quic/QUICKeyGenerator.h
+++ b/include/iocore/net/quic/QUICKeyGenerator.h
@@ -23,8 +23,8 @@
#pragma once
#include <openssl/evp.h>
-#include "QUICTypes.h"
-#include "QUICHKDF.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICHKDF.h"
#ifdef OPENSSL_IS_BORINGSSL
typedef EVP_AEAD QUIC_EVP_CIPHER;
diff --git a/include/iocore/net/quic/QUICLossDetector.h b/include/iocore/net/quic/QUICLossDetector.h
index 7177b1a59c..134c36ddb7 100644
--- a/include/iocore/net/quic/QUICLossDetector.h
+++ b/include/iocore/net/quic/QUICLossDetector.h
@@ -27,17 +27,17 @@
#include <map>
#include <set>
-#include "EventSystem.h"
-#include "Action.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/Action.h"
#include "tscore/ink_hrtime.h"
-#include "VConnection.h"
-#include "QUICTypes.h"
-#include "QUICPacket.h"
-#include "QUICFrame.h"
-#include "QUICFrameHandler.h"
-#include "QUICConnection.h"
-#include "QUICContext.h"
-#include "QUICCongestionController.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICContext.h"
+#include "iocore/net/quic/QUICCongestionController.h"
class QUICPadder;
class QUICPinger;
diff --git a/include/iocore/net/quic/QUICNewRenoCongestionController.h b/include/iocore/net/quic/QUICNewRenoCongestionController.h
index c1154d2d18..c682f4c728 100644
--- a/include/iocore/net/quic/QUICNewRenoCongestionController.h
+++ b/include/iocore/net/quic/QUICNewRenoCongestionController.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICContext.h"
-#include "QUICCongestionController.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICContext.h"
+#include "iocore/net/quic/QUICCongestionController.h"
class QUICNewRenoCongestionController : public QUICCongestionController
{
diff --git a/include/iocore/net/quic/QUICPacket.h b/include/iocore/net/quic/QUICPacket.h
index fff32d22e0..cad26c446e 100644
--- a/include/iocore/net/quic/QUICPacket.h
+++ b/include/iocore/net/quic/QUICPacket.h
@@ -27,10 +27,10 @@
#include <atomic>
#include <cstddef>
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
-#include "QUICTypes.h"
-#include "QUICRetryIntegrityTag.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICRetryIntegrityTag.h"
#define QUIC_FIELD_OFFSET_CONNECTION_ID 1
#define QUIC_FIELD_OFFSET_PACKET_NUMBER 4
diff --git a/include/iocore/net/quic/QUICPacketFactory.h b/include/iocore/net/quic/QUICPacketFactory.h
index 2d59de66c9..4f6dff66b9 100644
--- a/include/iocore/net/quic/QUICPacketFactory.h
+++ b/include/iocore/net/quic/QUICPacketFactory.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICPacket.h"
-#include "QUICPacketPayloadProtector.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICPacketPayloadProtector.h"
class QUICPacketProtectionKeyInfo;
diff --git a/include/iocore/net/quic/QUICPacketHeaderProtector.h b/include/iocore/net/quic/QUICPacketHeaderProtector.h
index 215b3ed0d4..2e802f1acb 100644
--- a/include/iocore/net/quic/QUICPacketHeaderProtector.h
+++ b/include/iocore/net/quic/QUICPacketHeaderProtector.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
class QUICPacketProtectionKeyInfo;
diff --git a/include/iocore/net/quic/QUICPacketPayloadProtector.h b/include/iocore/net/quic/QUICPacketPayloadProtector.h
index e90d4941e8..2a9d8784eb 100644
--- a/include/iocore/net/quic/QUICPacketPayloadProtector.h
+++ b/include/iocore/net/quic/QUICPacketPayloadProtector.h
@@ -23,9 +23,9 @@
#pragma once
-#include "IOBuffer.h"
-#include "QUICTypes.h"
-#include "QUICKeyGenerator.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
class QUICPacketProtectionKeyInfo;
diff --git a/include/iocore/net/quic/QUICPacketProtectionKeyInfo.h b/include/iocore/net/quic/QUICPacketProtectionKeyInfo.h
index 71d077d8b1..bc72d401dc 100644
--- a/include/iocore/net/quic/QUICPacketProtectionKeyInfo.h
+++ b/include/iocore/net/quic/QUICPacketProtectionKeyInfo.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
class QUICPacketProtectionKeyInfoProvider
{
diff --git a/include/iocore/net/quic/QUICPacketReceiveQueue.h b/include/iocore/net/quic/QUICPacketReceiveQueue.h
index a274bc0550..f07be34053 100644
--- a/include/iocore/net/quic/QUICPacketReceiveQueue.h
+++ b/include/iocore/net/quic/QUICPacketReceiveQueue.h
@@ -23,10 +23,10 @@
#pragma once
-#include "UDPPacket.h"
+#include "iocore/net/UDPPacket.h"
#include "tscore/List.h"
-#include "QUICPacket.h"
+#include "iocore/net/quic/QUICPacket.h"
class QUICPacketFactory;
class QUICPacketHeaderProtector;
diff --git a/include/iocore/net/quic/QUICPadder.h b/include/iocore/net/quic/QUICPadder.h
index 71e2016356..dded3f5e15 100644
--- a/include/iocore/net/quic/QUICPadder.h
+++ b/include/iocore/net/quic/QUICPadder.h
@@ -23,11 +23,11 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICFrameHandler.h"
-#include "QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
-#include "Lock.h"
+#include "iocore/eventsystem/Lock.h"
class QUICPadder : public QUICFrameOnceGenerator
{
diff --git a/include/iocore/net/quic/QUICPathManager.h b/include/iocore/net/quic/QUICPathManager.h
index 1d4542a629..4b2e9fa339 100644
--- a/include/iocore/net/quic/QUICPathManager.h
+++ b/include/iocore/net/quic/QUICPathManager.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICConnectionInfoProvider;
class QUICPathValidator;
diff --git a/include/iocore/net/quic/QUICPathValidator.h b/include/iocore/net/quic/QUICPathValidator.h
index 7f3119695b..604b565983 100644
--- a/include/iocore/net/quic/QUICPathValidator.h
+++ b/include/iocore/net/quic/QUICPathValidator.h
@@ -25,10 +25,10 @@
#include <vector>
#include <unordered_map>
-#include "QUICTypes.h"
-#include "QUICFrameHandler.h"
-#include "QUICFrameGenerator.h"
-#include "QUICConnection.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICConnection.h"
class QUICPathValidator : public QUICFrameHandler, public QUICFrameGenerator
{
diff --git a/include/iocore/net/quic/QUICPinger.h b/include/iocore/net/quic/QUICPinger.h
index 4b41083fff..8c57c8f6de 100644
--- a/include/iocore/net/quic/QUICPinger.h
+++ b/include/iocore/net/quic/QUICPinger.h
@@ -24,11 +24,11 @@
#pragma once
#include <vector>
-#include "QUICTypes.h"
-#include "QUICFrameHandler.h"
-#include "QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
-#include "Lock.h"
+#include "iocore/eventsystem/Lock.h"
class QUICPinger : public QUICFrameOnceGenerator
{
diff --git a/include/iocore/net/quic/QUICResetTokenTable.h b/include/iocore/net/quic/QUICResetTokenTable.h
index 559b264758..08fcd4a7d5 100644
--- a/include/iocore/net/quic/QUICResetTokenTable.h
+++ b/include/iocore/net/quic/QUICResetTokenTable.h
@@ -21,7 +21,7 @@
#pragma once
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICConnection;
diff --git a/include/iocore/net/quic/QUICRetryIntegrityTag.h b/include/iocore/net/quic/QUICRetryIntegrityTag.h
index 757f05fd30..ebe7ee4c0e 100644
--- a/include/iocore/net/quic/QUICRetryIntegrityTag.h
+++ b/include/iocore/net/quic/QUICRetryIntegrityTag.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICRetryIntegrityTag
{
diff --git a/include/iocore/net/quic/QUICStream.h b/include/iocore/net/quic/QUICStream.h
index 3435abc17a..d410fd8e53 100644
--- a/include/iocore/net/quic/QUICStream.h
+++ b/include/iocore/net/quic/QUICStream.h
@@ -25,17 +25,17 @@
#include "tscore/List.h"
-#include "P_VConnection.h"
-#include "Event.h"
-
-#include "QUICFrame.h"
-#include "QUICStreamState.h"
-#include "QUICFlowController.h"
-#include "QUICIncomingFrameBuffer.h"
-#include "QUICFrameGenerator.h"
-#include "QUICConnection.h"
-#include "QUICFrameRetransmitter.h"
-#include "QUICDebugNames.h"
+#include "../../../../src/iocore/eventsystem/P_VConnection.h"
+#include "iocore/eventsystem/Event.h"
+
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICStreamState.h"
+#include "iocore/net/quic/QUICFlowController.h"
+#include "iocore/net/quic/QUICIncomingFrameBuffer.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICFrameRetransmitter.h"
+#include "iocore/net/quic/QUICDebugNames.h"
class QUICStreamAdapter;
class QUICStreamStateListener;
diff --git a/include/iocore/net/quic/QUICStreamAdapter.h b/include/iocore/net/quic/QUICStreamAdapter.h
index 3c3a0e331e..d563f0be69 100644
--- a/include/iocore/net/quic/QUICStreamAdapter.h
+++ b/include/iocore/net/quic/QUICStreamAdapter.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICStream.h"
+#include "iocore/net/quic/QUICStream.h"
class QUICStreamAdapter
{
diff --git a/include/iocore/net/quic/QUICStreamFactory.h b/include/iocore/net/quic/QUICStreamFactory.h
index 9898f5a5d3..c916ed245a 100644
--- a/include/iocore/net/quic/QUICStreamFactory.h
+++ b/include/iocore/net/quic/QUICStreamFactory.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
class QUICStream;
diff --git a/include/iocore/net/quic/QUICStreamManager.h b/include/iocore/net/quic/QUICStreamManager.h
index e7a3bfd2a8..7c2e8ed718 100644
--- a/include/iocore/net/quic/QUICStreamManager.h
+++ b/include/iocore/net/quic/QUICStreamManager.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICApplicationMap.h"
-#include "QUICContext.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICApplicationMap.h"
+#include "iocore/net/quic/QUICContext.h"
class QUICTransportParameters;
diff --git a/include/iocore/net/quic/QUICStreamManager_native.h b/include/iocore/net/quic/QUICStreamManager_native.h
index a63d26209a..eefdc40170 100644
--- a/include/iocore/net/quic/QUICStreamManager_native.h
+++ b/include/iocore/net/quic/QUICStreamManager_native.h
@@ -23,14 +23,14 @@
#pragma once
-#include "QUICStreamManager.h"
-#include "QUICBidirectionalStream.h"
-#include "QUICUnidirectionalStream.h"
-#include "QUICFrameHandler.h"
-#include "QUICFrame.h"
-#include "QUICStreamFactory.h"
-#include "QUICLossDetector.h"
-#include "QUICPathManager.h"
+#include "iocore/net/quic/QUICStreamManager.h"
+#include "iocore/net/quic/QUICBidirectionalStream.h"
+#include "iocore/net/quic/QUICUnidirectionalStream.h"
+#include "iocore/net/quic/QUICFrameHandler.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICStreamFactory.h"
+#include "iocore/net/quic/QUICLossDetector.h"
+#include "iocore/net/quic/QUICPathManager.h"
class QUICStreamManagerImpl : public QUICStreamManager, public QUICFrameHandler, public QUICFrameGenerator
{
diff --git a/include/iocore/net/quic/QUICStreamManager_quiche.h b/include/iocore/net/quic/QUICStreamManager_quiche.h
index 8cc409a634..550f1b8022 100644
--- a/include/iocore/net/quic/QUICStreamManager_quiche.h
+++ b/include/iocore/net/quic/QUICStreamManager_quiche.h
@@ -24,8 +24,8 @@
#pragma once
#include "tscore/List.h"
-#include "QUICStreamManager.h"
-#include "QUICStream_quiche.h"
+#include "iocore/net/quic/QUICStreamManager.h"
+#include "iocore/net/quic/QUICStream_quiche.h"
class QUICStreamManagerImpl : public QUICStreamManager
{
diff --git a/include/iocore/net/quic/QUICStreamState.h b/include/iocore/net/quic/QUICStreamState.h
index 235bfa384e..173c11a5c7 100644
--- a/include/iocore/net/quic/QUICStreamState.h
+++ b/include/iocore/net/quic/QUICStreamState.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICFrame.h"
-#include "QUICTransferProgressProvider.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICTransferProgressProvider.h"
enum class QUICSendStreamState {
Init,
diff --git a/include/iocore/net/quic/QUICStreamVCAdapter.h b/include/iocore/net/quic/QUICStreamVCAdapter.h
index 59eb6b4372..5b38002e44 100644
--- a/include/iocore/net/quic/QUICStreamVCAdapter.h
+++ b/include/iocore/net/quic/QUICStreamVCAdapter.h
@@ -22,8 +22,8 @@
*/
#pragma once
-#include "QUICStreamAdapter.h"
-#include "IOBuffer.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
+#include "iocore/eventsystem/IOBuffer.h"
class QUICStreamVCAdapter : public VConnection, public QUICStreamAdapter
{
diff --git a/include/iocore/net/quic/QUICStream_native.h b/include/iocore/net/quic/QUICStream_native.h
index 354d727c5b..2fc3e01b13 100644
--- a/include/iocore/net/quic/QUICStream_native.h
+++ b/include/iocore/net/quic/QUICStream_native.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICStream.h"
+#include "iocore/net/quic/QUICStream.h"
class QUICStreamBase : public QUICStream, public QUICFrameGenerator, public QUICFrameRetransmitter
{
diff --git a/include/iocore/net/quic/QUICStream_quiche.h b/include/iocore/net/quic/QUICStream_quiche.h
index c24282b9b8..dd7e632dd6 100644
--- a/include/iocore/net/quic/QUICStream_quiche.h
+++ b/include/iocore/net/quic/QUICStream_quiche.h
@@ -23,7 +23,7 @@
#pragma once
-#include "QUICStream.h"
+#include "iocore/net/quic/QUICStream.h"
#include <quiche.h>
class QUICStreamImpl : public QUICStream
diff --git a/include/iocore/net/quic/QUICTLS.h b/include/iocore/net/quic/QUICTLS.h
index 881b895cc6..95bd0a170a 100644
--- a/include/iocore/net/quic/QUICTLS.h
+++ b/include/iocore/net/quic/QUICTLS.h
@@ -32,9 +32,9 @@
#include <openssl/evp.h>
#endif
-#include "EventSystem.h"
-#include "NetVConnection.h"
-#include "QUICHandshakeProtocol.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/quic/QUICHandshakeProtocol.h"
// TODO: fix size
static constexpr int MAX_HANDSHAKE_MSG_LEN = 65527;
diff --git a/include/iocore/net/quic/QUICTokenCreator.h b/include/iocore/net/quic/QUICTokenCreator.h
index 5675937f3a..00d6549e5c 100644
--- a/include/iocore/net/quic/QUICTokenCreator.h
+++ b/include/iocore/net/quic/QUICTokenCreator.h
@@ -22,8 +22,8 @@
*/
#pragma once
-#include "QUICFrameGenerator.h"
-#include "QUICContext.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICContext.h"
class QUICTokenCreator final : public QUICFrameGenerator
{
diff --git a/include/iocore/net/quic/QUICTransportParameters.h b/include/iocore/net/quic/QUICTransportParameters.h
index 5493778032..30b745ae94 100644
--- a/include/iocore/net/quic/QUICTransportParameters.h
+++ b/include/iocore/net/quic/QUICTransportParameters.h
@@ -27,7 +27,7 @@
#include <tscore/ink_memory.h>
#include <openssl/ssl.h>
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
#include <cstddef>
class QUICTransportParameterId
diff --git a/include/iocore/net/quic/QUICTypes.h b/include/iocore/net/quic/QUICTypes.h
index dba14e844a..4e6970566b 100644
--- a/include/iocore/net/quic/QUICTypes.h
+++ b/include/iocore/net/quic/QUICTypes.h
@@ -28,9 +28,9 @@
#include "tscore/ink_endian.h"
#include "tscore/ink_hrtime.h"
#include "tscore/Ptr.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
-#include "NetVConnection.h"
+#include "iocore/net/NetVConnection.h"
#include <memory>
#include <random>
diff --git a/include/iocore/net/quic/QUICUnidirectionalStream.h b/include/iocore/net/quic/QUICUnidirectionalStream.h
index e94cc144cb..2ff8f88411 100644
--- a/include/iocore/net/quic/QUICUnidirectionalStream.h
+++ b/include/iocore/net/quic/QUICUnidirectionalStream.h
@@ -23,8 +23,8 @@
#pragma once
-#include "QUICStream.h"
-#include "QUICStream_native.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICStream_native.h"
class QUICSendStream : public QUICStreamBase
{
diff --git a/include/iocore/net/quic/QUICVersionNegotiator.h b/include/iocore/net/quic/QUICVersionNegotiator.h
index 392154e614..530a49343b 100644
--- a/include/iocore/net/quic/QUICVersionNegotiator.h
+++ b/include/iocore/net/quic/QUICVersionNegotiator.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICTypes.h"
-#include "QUICPacket.h"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
/**
* @brief Abstract QUIC Application Class
diff --git a/include/iocore/net/quic/qlog/QLog.h b/include/iocore/net/quic/qlog/QLog.h
index c6647e5409..aea19e9d48 100644
--- a/include/iocore/net/quic/qlog/QLog.h
+++ b/include/iocore/net/quic/qlog/QLog.h
@@ -26,7 +26,7 @@
#include <fstream>
#include <yaml-cpp/yaml.h>
-#include "QLogEvent.h"
+#include "iocore/net/quic/qlog/QLogEvent.h"
namespace QLog
{
diff --git a/include/iocore/net/quic/qlog/QLogEvent.h b/include/iocore/net/quic/qlog/QLogEvent.h
index 201cda5985..1d99546a09 100644
--- a/include/iocore/net/quic/qlog/QLogEvent.h
+++ b/include/iocore/net/quic/qlog/QLogEvent.h
@@ -26,9 +26,9 @@
#include <string>
#include <yaml-cpp/yaml.h>
-#include "QUICTypes.h"
-#include "QLogEvent.h"
-#include "QLogFrame.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/qlog/QLogEvent.h"
+#include "iocore/net/quic/qlog/QLogFrame.h"
namespace QLog
{
diff --git a/include/iocore/net/quic/qlog/QLogFrame.h b/include/iocore/net/quic/qlog/QLogFrame.h
index 6dfb035b81..1792e7a571 100644
--- a/include/iocore/net/quic/qlog/QLogFrame.h
+++ b/include/iocore/net/quic/qlog/QLogFrame.h
@@ -26,7 +26,7 @@
#include <memory>
#include <yaml-cpp/yaml.h>
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFrame.h"
namespace QLog
{
diff --git a/include/iocore/net/quic/qlog/QLogListener.h b/include/iocore/net/quic/qlog/QLogListener.h
index 6f28c2d227..d7f34de756 100644
--- a/include/iocore/net/quic/qlog/QLogListener.h
+++ b/include/iocore/net/quic/qlog/QLogListener.h
@@ -23,10 +23,10 @@
#pragma once
-#include "QLog.h"
-#include "QLogUtils.h"
-#include "QUICPacket.h"
-#include "QUICContext.h"
+#include "iocore/net/quic/qlog/QLog.h"
+#include "iocore/net/quic/qlog/QLogUtils.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICContext.h"
namespace QLog
{
diff --git a/include/iocore/net/quic/qlog/QLogUtils.h b/include/iocore/net/quic/qlog/QLogUtils.h
index d39fce8c89..ec4699c2a9 100644
--- a/include/iocore/net/quic/qlog/QLogUtils.h
+++ b/include/iocore/net/quic/qlog/QLogUtils.h
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QLog.h"
-#include "QUICPacket.h"
+#include "iocore/net/quic/qlog/QLog.h"
+#include "iocore/net/quic/QUICPacket.h"
namespace QLog
{
diff --git a/include/iocore/utils/OneWayMultiTunnel.h b/include/iocore/utils/OneWayMultiTunnel.h
index e3409203bc..3156ab19b9 100644
--- a/include/iocore/utils/OneWayMultiTunnel.h
+++ b/include/iocore/utils/OneWayMultiTunnel.h
@@ -30,7 +30,7 @@
#pragma once
-#include "OneWayTunnel.h"
+#include "iocore/utils/OneWayTunnel.h"
/** Maximum number which can be tunnelled too */
#define ONE_WAY_MULTI_TUNNEL_LIMIT 4
diff --git a/include/iocore/utils/OneWayTunnel.h b/include/iocore/utils/OneWayTunnel.h
index b772e1edae..24c3198263 100644
--- a/include/iocore/utils/OneWayTunnel.h
+++ b/include/iocore/utils/OneWayTunnel.h
@@ -30,7 +30,7 @@
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
//////////////////////////////////////////////////////////////////////////////
//
diff --git a/include/mgmt/config/FileManager.h b/include/mgmt/config/FileManager.h
index d23c8c9083..60792e7142 100644
--- a/include/mgmt/config/FileManager.h
+++ b/include/mgmt/config/FileManager.h
@@ -28,7 +28,7 @@
#include "tscore/Errata.h"
-#include <rpc/jsonrpc/JsonRPC.h>
+#include "mgmt/rpc/jsonrpc/JsonRPC.h"
#include <unordered_map>
#include <string_view>
diff --git a/include/mgmt/rpc/handlers/common/RecordsUtils.h b/include/mgmt/rpc/handlers/common/RecordsUtils.h
index 3b2abc05b4..a8b047a614 100644
--- a/include/mgmt/rpc/handlers/common/RecordsUtils.h
+++ b/include/mgmt/rpc/handlers/common/RecordsUtils.h
@@ -22,11 +22,11 @@
#include <tuple>
-#include "rpc/handlers/common/convert.h"
-#include "rpc/handlers/common/ErrorUtils.h"
+#include "mgmt/rpc/handlers/common/convert.h"
+#include "mgmt/rpc/handlers/common/ErrorUtils.h"
#include "records/RecCore.h"
-#include "records/P_RecCore.h"
+#include "../../../../../src/records/P_RecCore.h"
#include "tscore/Diags.h"
#include "tscore/Errata.h"
diff --git a/include/mgmt/rpc/handlers/common/convert.h b/include/mgmt/rpc/handlers/common/convert.h
index 1a86f8b203..14e12d588a 100644
--- a/include/mgmt/rpc/handlers/common/convert.h
+++ b/include/mgmt/rpc/handlers/common/convert.h
@@ -25,11 +25,11 @@
#include <yaml-cpp/yaml.h>
#include "records/RecCore.h"
-#include "records/P_RecCore.h"
+#include "../../../../../src/records/P_RecCore.h"
#include "shared/overridable_txn_vars.h"
-#include "RecordsUtils.h"
+#include "mgmt/rpc/handlers/common/RecordsUtils.h"
///
/// @brief Namespace to group all the names used for key access to the yaml lookup nodes.
diff --git a/include/mgmt/rpc/handlers/config/Configuration.h b/include/mgmt/rpc/handlers/config/Configuration.h
index 957d65e1eb..a79fc6d483 100644
--- a/include/mgmt/rpc/handlers/config/Configuration.h
+++ b/include/mgmt/rpc/handlers/config/Configuration.h
@@ -20,7 +20,7 @@
#pragma once
-#include "rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
namespace rpc::handlers::config
{
diff --git a/include/mgmt/rpc/handlers/plugins/Plugins.h b/include/mgmt/rpc/handlers/plugins/Plugins.h
index e82c2d082d..4f9e079e8a 100644
--- a/include/mgmt/rpc/handlers/plugins/Plugins.h
+++ b/include/mgmt/rpc/handlers/plugins/Plugins.h
@@ -20,7 +20,7 @@
#pragma once
-#include "rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
namespace rpc::handlers::plugins
{
diff --git a/include/mgmt/rpc/handlers/server/Server.h b/include/mgmt/rpc/handlers/server/Server.h
index b71d87a1fc..6b6bd26bc5 100644
--- a/include/mgmt/rpc/handlers/server/Server.h
+++ b/include/mgmt/rpc/handlers/server/Server.h
@@ -20,7 +20,7 @@
#pragma once
-#include "rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
namespace rpc::handlers::server
{
diff --git a/include/mgmt/rpc/handlers/storage/Storage.h b/include/mgmt/rpc/handlers/storage/Storage.h
index 1b9eba3076..47738e565f 100644
--- a/include/mgmt/rpc/handlers/storage/Storage.h
+++ b/include/mgmt/rpc/handlers/storage/Storage.h
@@ -20,7 +20,7 @@
#pragma once
-#include "rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
namespace rpc::handlers::storage
{
diff --git a/include/mgmt/rpc/jsonrpc/Context.h b/include/mgmt/rpc/jsonrpc/Context.h
index fb78d338ef..920d1fbd3c 100644
--- a/include/mgmt/rpc/jsonrpc/Context.h
+++ b/include/mgmt/rpc/jsonrpc/Context.h
@@ -25,7 +25,7 @@
#include "tscore/Errata.h"
#include "ts/apidefs.h"
-#include "rpc/handlers/common/ErrorUtils.h"
+#include "mgmt/rpc/handlers/common/ErrorUtils.h"
namespace rpc
{
diff --git a/include/mgmt/rpc/jsonrpc/Defs.h b/include/mgmt/rpc/jsonrpc/Defs.h
index f528ad1110..22bcf021f1 100644
--- a/include/mgmt/rpc/jsonrpc/Defs.h
+++ b/include/mgmt/rpc/jsonrpc/Defs.h
@@ -25,7 +25,7 @@
#include <yaml-cpp/yaml.h>
-#include "rpc/jsonrpc/error/RPCError.h"
+#include "mgmt/rpc/jsonrpc/error/RPCError.h"
// This file contains all the internal types used by the RPC engine to deal with all the messages
// While we use yamlcpp for parsing, internally we model the request/response on our wrappers (RPCRequest, RPCResponse)
diff --git a/include/mgmt/rpc/jsonrpc/JsonRPC.h b/include/mgmt/rpc/jsonrpc/JsonRPC.h
index c382723742..b8605fdeed 100644
--- a/include/mgmt/rpc/jsonrpc/JsonRPC.h
+++ b/include/mgmt/rpc/jsonrpc/JsonRPC.h
@@ -19,8 +19,8 @@
*/
#pragma once
-#include "JsonRPCManager.h"
-#include "rpc/handlers/common/ErrorUtils.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/handlers/common/ErrorUtils.h"
namespace rpc
{
diff --git a/include/mgmt/rpc/jsonrpc/JsonRPCManager.h b/include/mgmt/rpc/jsonrpc/JsonRPCManager.h
index c69ef619dd..58bc667ad2 100644
--- a/include/mgmt/rpc/jsonrpc/JsonRPCManager.h
+++ b/include/mgmt/rpc/jsonrpc/JsonRPCManager.h
@@ -32,8 +32,8 @@
#include "tscore/Diags.h"
#include "ts/apidefs.h"
-#include "Defs.h"
-#include "Context.h"
+#include "mgmt/rpc/jsonrpc/Defs.h"
+#include "mgmt/rpc/jsonrpc/Context.h"
namespace rpc
{
diff --git a/include/mgmt/rpc/jsonrpc/json/YAMLCodec.h b/include/mgmt/rpc/jsonrpc/json/YAMLCodec.h
index 1d7668d784..a8b3d3972a 100644
--- a/include/mgmt/rpc/jsonrpc/json/YAMLCodec.h
+++ b/include/mgmt/rpc/jsonrpc/json/YAMLCodec.h
@@ -21,8 +21,8 @@
#pragma once
#include <yaml-cpp/yaml.h>
-#include "rpc/jsonrpc/error/RPCError.h"
-#include "rpc/jsonrpc/Defs.h"
+#include "mgmt/rpc/jsonrpc/error/RPCError.h"
+#include "mgmt/rpc/jsonrpc/Defs.h"
namespace rpc::json_codecs
{
diff --git a/include/mgmt/rpc/server/CommBase.h b/include/mgmt/rpc/server/CommBase.h
index d919970391..30767d82aa 100644
--- a/include/mgmt/rpc/server/CommBase.h
+++ b/include/mgmt/rpc/server/CommBase.h
@@ -23,7 +23,7 @@
#include <tscore/Errata.h>
-#include "rpc/config/JsonRPCConfig.h"
+#include "mgmt/rpc/config/JsonRPCConfig.h"
namespace rpc::comm
{
diff --git a/include/mgmt/rpc/server/IPCSocketServer.h b/include/mgmt/rpc/server/IPCSocketServer.h
index bf9a2a1b5e..5d13f01332 100644
--- a/include/mgmt/rpc/server/IPCSocketServer.h
+++ b/include/mgmt/rpc/server/IPCSocketServer.h
@@ -31,8 +31,8 @@
#include "tscpp/util/ts_bw.h"
#include "tscore/Layout.h"
-#include "rpc/server/CommBase.h"
-#include "rpc/config/JsonRPCConfig.h"
+#include "mgmt/rpc/server/CommBase.h"
+#include "mgmt/rpc/config/JsonRPCConfig.h"
namespace rpc::comm
{
diff --git a/include/mgmt/rpc/server/RPCServer.h b/include/mgmt/rpc/server/RPCServer.h
index a94e88a1e3..f6470fb67b 100644
--- a/include/mgmt/rpc/server/RPCServer.h
+++ b/include/mgmt/rpc/server/RPCServer.h
@@ -30,8 +30,8 @@
#include "tscore/ink_apidefs.h"
#include <ts/apidefs.h>
-#include "rpc/jsonrpc/JsonRPCManager.h"
-#include "rpc/config/JsonRPCConfig.h"
+#include "mgmt/rpc/jsonrpc/JsonRPCManager.h"
+#include "mgmt/rpc/config/JsonRPCConfig.h"
namespace rpc
{
diff --git a/include/proxy/CacheControl.h b/include/proxy/CacheControl.h
index 7099b84965..ac6cb57815 100644
--- a/include/proxy/CacheControl.h
+++ b/include/proxy/CacheControl.h
@@ -30,8 +30,8 @@
#pragma once
-#include "EventSystem.h"
-#include "ControlBase.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/ControlBase.h"
#include "tscore/Result.h"
struct RequestData;
diff --git a/include/proxy/ControlMatcher.h b/include/proxy/ControlMatcher.h
index aeb9be2b86..f3536bc01c 100644
--- a/include/proxy/ControlMatcher.h
+++ b/include/proxy/ControlMatcher.h
@@ -93,9 +93,9 @@
#include "tscore/ink_apidefs.h"
#include "tscore/ink_defs.h"
-#include "HTTP.h"
+#include "proxy/hdrs/HTTP.h"
#include "tscore/Regex.h"
-#include "URL.h"
+#include "proxy/hdrs/URL.h"
#include <swoc/swoc_ip.h>
diff --git a/include/proxy/IPAllow.h b/include/proxy/IPAllow.h
index 9c14262373..85352e48ad 100644
--- a/include/proxy/IPAllow.h
+++ b/include/proxy/IPAllow.h
@@ -34,8 +34,8 @@
#include <string_view>
#include <vector>
-#include "hdrs/HTTP.h"
-#include "ConfigProcessor.h"
+#include "proxy/hdrs/HTTP.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
#include "swoc/TextView.h"
#include "swoc/swoc_file.h"
#include "swoc/swoc_ip.h"
diff --git a/include/proxy/Milestones.h b/include/proxy/Milestones.h
index cadd60f6b5..1be8024325 100644
--- a/include/proxy/Milestones.h
+++ b/include/proxy/Milestones.h
@@ -28,7 +28,7 @@
#include "tscore/ink_platform.h"
#include "tscore/ink_hrtime.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
template <class T, size_t entries> class Milestones
{
diff --git a/include/proxy/ParentConsistentHash.h b/include/proxy/ParentConsistentHash.h
index 3a8ee58278..503869327a 100644
--- a/include/proxy/ParentConsistentHash.h
+++ b/include/proxy/ParentConsistentHash.h
@@ -30,7 +30,7 @@
#pragma once
#include "tscore/HashSip.h"
-#include "ParentSelection.h"
+#include "proxy/ParentSelection.h"
//
// Implementation of round robin based upon consistent hash of the URL,
diff --git a/include/proxy/ParentRoundRobin.h b/include/proxy/ParentRoundRobin.h
index 6b31a601fe..245fc7cba2 100644
--- a/include/proxy/ParentRoundRobin.h
+++ b/include/proxy/ParentRoundRobin.h
@@ -29,7 +29,7 @@
#pragma once
-#include "ParentSelection.h"
+#include "proxy/ParentSelection.h"
class ParentRoundRobin : public ParentSelectionStrategy
{
diff --git a/include/proxy/ParentSelection.h b/include/proxy/ParentSelection.h
index 985f0934a2..5e1f660ab3 100644
--- a/include/proxy/ParentSelection.h
+++ b/include/proxy/ParentSelection.h
@@ -30,14 +30,14 @@
#pragma once
-#include "ConfigProcessor.h"
-#include "ControlBase.h"
-#include "ControlMatcher.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "proxy/ControlBase.h"
+#include "proxy/ControlMatcher.h"
#include "records/RecProcess.h"
#include "tscore/ConsistentHash.h"
#include "tscore/Tokenizer.h"
#include "tscore/ink_apidefs.h"
-#include "HostStatus.h"
+#include "proxy/HostStatus.h"
#include <algorithm>
#include <vector>
diff --git a/include/proxy/PluginVC.h b/include/proxy/PluginVC.h
index a3ae05ea04..c826a9f052 100644
--- a/include/proxy/PluginVC.h
+++ b/include/proxy/PluginVC.h
@@ -35,9 +35,9 @@
#pragma once
-#include "Plugin.h"
-#include "Net.h"
-#include "NetVConnection.h"
+#include "proxy/Plugin.h"
+#include "iocore/net/Net.h"
+#include "iocore/net/NetVConnection.h"
#include "tscore/ink_atomic.h"
class PluginVCCore;
diff --git a/include/proxy/PoolableSession.h b/include/proxy/PoolableSession.h
index b74f8e07bc..0817917769 100644
--- a/include/proxy/PoolableSession.h
+++ b/include/proxy/PoolableSession.h
@@ -23,7 +23,7 @@
#pragma once
-#include "ProxySession.h"
+#include "proxy/ProxySession.h"
class PoolableSession : public ProxySession
{
diff --git a/include/proxy/ProtocolProbeSessionAccept.h b/include/proxy/ProtocolProbeSessionAccept.h
index 13e401fcb1..c63c267f02 100644
--- a/include/proxy/ProtocolProbeSessionAccept.h
+++ b/include/proxy/ProtocolProbeSessionAccept.h
@@ -25,7 +25,7 @@
#include "swoc/swoc_ip.h"
-#include "SessionAccept.h"
+#include "iocore/net/SessionAccept.h"
struct ProtocolProbeSessionAcceptEnums {
/// Enumeration for related groups of protocols.
diff --git a/include/proxy/ProxySession.h b/include/proxy/ProxySession.h
index 6bb997a018..9ad9f644d6 100644
--- a/include/proxy/ProxySession.h
+++ b/include/proxy/ProxySession.h
@@ -29,9 +29,9 @@
#include <string_view>
#include <memory>
#include "api/InkAPIInternal.h"
-#include "http/HttpSessionAccept.h"
-#include "IPAllow.h"
-#include "private/SSLProxySession.h"
+#include "proxy/http/HttpSessionAccept.h"
+#include "proxy/IPAllow.h"
+#include "../../src/proxy/private/SSLProxySession.h"
// Emit a debug message conditional on whether this particular client session
// has debugging enabled. This should only be called from within a client session
diff --git a/include/proxy/ProxyTransaction.h b/include/proxy/ProxyTransaction.h
index 6e04ea9b89..82786e08d0 100644
--- a/include/proxy/ProxyTransaction.h
+++ b/include/proxy/ProxyTransaction.h
@@ -23,7 +23,7 @@
#pragma once
-#include "ProxySession.h"
+#include "proxy/ProxySession.h"
#include <string_view>
class HttpSM;
diff --git a/include/proxy/RegressionSM.h b/include/proxy/RegressionSM.h
index 61a1e6602b..3955ba63a4 100644
--- a/include/proxy/RegressionSM.h
+++ b/include/proxy/RegressionSM.h
@@ -23,7 +23,7 @@
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/Regression.h"
/*
diff --git a/include/proxy/ReverseProxy.h b/include/proxy/ReverseProxy.h
index 385583ab44..e2f5e1b978 100644
--- a/include/proxy/ReverseProxy.h
+++ b/include/proxy/ReverseProxy.h
@@ -35,10 +35,10 @@
#include "records/RecProcess.h"
#include "tscore/ink_defs.h"
-#include "HttpTransact.h"
-#include "RemapPluginInfo.h"
-#include "UrlRewrite.h"
-#include "UrlMapping.h"
+#include "proxy/http/HttpTransact.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
+#include "proxy/http/remap/UrlRewrite.h"
+#include "proxy/http/remap/UrlMapping.h"
#define EMPTY_PORT_MAPPING (int32_t) ~0
diff --git a/include/proxy/Show.h b/include/proxy/Show.h
index b60d044bf7..85e2357aa3 100644
--- a/include/proxy/Show.h
+++ b/include/proxy/Show.h
@@ -30,7 +30,7 @@
#pragma once
-#include "StatPages.h"
+#include "proxy/StatPages.h"
#define STREQ_PREFIX(_x, _s) (!strncasecmp(_x, _s, sizeof(_s) - 1))
diff --git a/include/proxy/StatPages.h b/include/proxy/StatPages.h
index 5d99d5c108..d5e446e478 100644
--- a/include/proxy/StatPages.h
+++ b/include/proxy/StatPages.h
@@ -29,9 +29,9 @@
****************************************************************************/
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
-#include "HTTP.h"
+#include "proxy/hdrs/HTTP.h"
// SPECIAL URLs
//
diff --git a/include/proxy/Transform.h b/include/proxy/Transform.h
index 1c664e9d4d..18975f0893 100644
--- a/include/proxy/Transform.h
+++ b/include/proxy/Transform.h
@@ -23,8 +23,8 @@
#pragma once
-#include "EventSystem.h"
-#include "HTTP.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/hdrs/HTTP.h"
#include "api/InkAPIInternal.h"
#define TRANSFORM_READ_READY (TRANSFORM_EVENTS_START + 0)
diff --git a/include/proxy/TransformInternal.h b/include/proxy/TransformInternal.h
index 02b862fb4a..6640cdc64d 100644
--- a/include/proxy/TransformInternal.h
+++ b/include/proxy/TransformInternal.h
@@ -23,7 +23,7 @@
#pragma once
-#include "HttpSM.h"
+#include "proxy/http/HttpSM.h"
class TransformVConnection;
diff --git a/include/proxy/hdrs/HTTP.h b/include/proxy/hdrs/HTTP.h
index 16270a1c09..d85ac9dc65 100644
--- a/include/proxy/hdrs/HTTP.h
+++ b/include/proxy/hdrs/HTTP.h
@@ -27,8 +27,8 @@
#include "tscore/Arena.h"
#include "tscore/CryptoHash.h"
#include "tscore/HTTPVersion.h"
-#include "MIME.h"
-#include "URL.h"
+#include "proxy/hdrs/MIME.h"
+#include "proxy/hdrs/URL.h"
#include "tscore/ink_apidefs.h"
diff --git a/include/proxy/hdrs/HdrHeap.h b/include/proxy/hdrs/HdrHeap.h
index 48d1dcca9b..d2bd2b6b0c 100644
--- a/include/proxy/hdrs/HdrHeap.h
+++ b/include/proxy/hdrs/HdrHeap.h
@@ -35,7 +35,7 @@
#include "tscore/Ptr.h"
#include "tscore/ink_assert.h"
#include "swoc/Scalar.h"
-#include "HdrToken.h"
+#include "proxy/hdrs/HdrToken.h"
// Objects in the heap must currently be aligned to 8 byte boundaries,
// so their (address & HDR_PTR_ALIGNMENT_MASK) == 0
diff --git a/include/proxy/hdrs/HdrUtils.h b/include/proxy/hdrs/HdrUtils.h
index f4d05e021b..be570aacda 100644
--- a/include/proxy/hdrs/HdrUtils.h
+++ b/include/proxy/hdrs/HdrUtils.h
@@ -35,7 +35,7 @@
#include "swoc/TextView.h"
#include "tscore/ParseRules.h"
-#include "MIME.h"
+#include "proxy/hdrs/MIME.h"
/** Accessor class to iterate over values in a multi-valued field.
*
diff --git a/include/proxy/hdrs/HttpCompat.h b/include/proxy/hdrs/HttpCompat.h
index 47ca8befd8..f09890ed30 100644
--- a/include/proxy/hdrs/HttpCompat.h
+++ b/include/proxy/hdrs/HttpCompat.h
@@ -24,7 +24,7 @@
#pragma once
#include "tscore/ink_string++.h"
-#include "MIME.h"
+#include "proxy/hdrs/MIME.h"
#include "tscore/Diags.h"
class HttpCompat
diff --git a/include/proxy/hdrs/MIME.h b/include/proxy/hdrs/MIME.h
index d215772c27..674905f60e 100644
--- a/include/proxy/hdrs/MIME.h
+++ b/include/proxy/hdrs/MIME.h
@@ -31,8 +31,8 @@
#include "tscore/ink_apidefs.h"
#include "tscore/ink_string++.h"
#include "tscore/ParseRules.h"
-#include "HdrHeap.h"
-#include "HdrToken.h"
+#include "proxy/hdrs/HdrHeap.h"
+#include "proxy/hdrs/HdrToken.h"
#include "swoc/TextView.h"
diff --git a/include/proxy/hdrs/URL.h b/include/proxy/hdrs/URL.h
index 294837cfe6..24627bce05 100644
--- a/include/proxy/hdrs/URL.h
+++ b/include/proxy/hdrs/URL.h
@@ -24,10 +24,10 @@
#pragma once
#include "tscore/Arena.h"
-#include "HdrToken.h"
-#include "HdrHeap.h"
+#include "proxy/hdrs/HdrToken.h"
+#include "proxy/hdrs/HdrHeap.h"
#include "tscore/CryptoHash.h"
-#include "MIME.h"
+#include "proxy/hdrs/MIME.h"
#include <string_view>
#include "tscore/ink_apidefs.h"
diff --git a/include/proxy/http/ConnectingEntry.h b/include/proxy/http/ConnectingEntry.h
index f58c85f330..1bc95ad0a4 100644
--- a/include/proxy/http/ConnectingEntry.h
+++ b/include/proxy/http/ConnectingEntry.h
@@ -22,7 +22,7 @@
*/
-#include "PoolableSession.h"
+#include "proxy/PoolableSession.h"
#include <set>
#include <string>
diff --git a/include/proxy/http/Http1ClientSession.h b/include/proxy/http/Http1ClientSession.h
index 531b7ab802..3811434cfe 100644
--- a/include/proxy/http/Http1ClientSession.h
+++ b/include/proxy/http/Http1ClientSession.h
@@ -32,11 +32,11 @@
#pragma once
#include "api/InkAPIInternal.h"
-#include "HTTP.h"
-#include "HttpConfig.h"
-#include "IPAllow.h"
-#include "ProxySession.h"
-#include "Http1ClientTransaction.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/http/HttpConfig.h"
+#include "proxy/IPAllow.h"
+#include "proxy/ProxySession.h"
+#include "proxy/http/Http1ClientTransaction.h"
#ifdef USE_HTTP_DEBUG_LISTS
extern ink_mutex debug_cs_list_mutex;
diff --git a/include/proxy/http/Http1ClientTransaction.h b/include/proxy/http/Http1ClientTransaction.h
index 8dd5f340ea..3fd9db4410 100644
--- a/include/proxy/http/Http1ClientTransaction.h
+++ b/include/proxy/http/Http1ClientTransaction.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Http1Transaction.h"
+#include "proxy/http/Http1Transaction.h"
class Http1ClientTransaction : public Http1Transaction
{
diff --git a/include/proxy/http/Http1ServerSession.h b/include/proxy/http/Http1ServerSession.h
index 8a7b43f69e..346a5e5b6e 100644
--- a/include/proxy/http/Http1ServerSession.h
+++ b/include/proxy/http/Http1ServerSession.h
@@ -32,10 +32,10 @@
#pragma once
-#include "HttpConnectionCount.h"
-#include "HttpProxyAPIEnums.h"
-#include "PoolableSession.h"
-#include "Http1ServerTransaction.h"
+#include "proxy/http/HttpConnectionCount.h"
+#include "proxy/http/HttpProxyAPIEnums.h"
+#include "proxy/PoolableSession.h"
+#include "proxy/http/Http1ServerTransaction.h"
class HttpSM;
class MIOBuffer;
diff --git a/include/proxy/http/Http1ServerTransaction.h b/include/proxy/http/Http1ServerTransaction.h
index c5ee40f287..7d3226d124 100644
--- a/include/proxy/http/Http1ServerTransaction.h
+++ b/include/proxy/http/Http1ServerTransaction.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Http1Transaction.h"
+#include "proxy/http/Http1Transaction.h"
class Http1ServerTransaction : public Http1Transaction
{
diff --git a/include/proxy/http/Http1Transaction.h b/include/proxy/http/Http1Transaction.h
index aeb1d3a0c4..983451ed0d 100644
--- a/include/proxy/http/Http1Transaction.h
+++ b/include/proxy/http/Http1Transaction.h
@@ -23,7 +23,7 @@
#pragma once
-#include "../ProxyTransaction.h"
+#include "proxy/ProxyTransaction.h"
class Continuation;
diff --git a/include/proxy/http/HttpBodyFactory.h b/include/proxy/http/HttpBodyFactory.h
index 08eae3d612..f5821d859d 100644
--- a/include/proxy/http/HttpBodyFactory.h
+++ b/include/proxy/http/HttpBodyFactory.h
@@ -57,10 +57,10 @@
#include <strings.h>
#include <sys/types.h>
#include "tscore/ink_platform.h"
-#include "HTTP.h"
-#include "HttpConfig.h"
-#include "HttpCompat.h"
-#include "HttpTransact.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/http/HttpConfig.h"
+#include "proxy/hdrs/HttpCompat.h"
+#include "proxy/http/HttpTransact.h"
#include "tscore/ink_sprintf.h"
#include <memory>
diff --git a/include/proxy/http/HttpCacheSM.h b/include/proxy/http/HttpCacheSM.h
index dae2bcbc72..897ac8fe10 100644
--- a/include/proxy/http/HttpCacheSM.h
+++ b/include/proxy/http/HttpCacheSM.h
@@ -32,11 +32,11 @@
#pragma once
-#include "Cache.h"
-#include "ConfigProcessor.h"
-#include "URL.h"
-#include "HTTP.h"
-#include "HttpConfig.h"
+#include "iocore/cache/Cache.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "proxy/hdrs/URL.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/http/HttpConfig.h"
class HttpSM;
class HttpCacheSM;
diff --git a/include/proxy/http/HttpConfig.h b/include/proxy/http/HttpConfig.h
index 9c85c12d42..7e628dc4d5 100644
--- a/include/proxy/http/HttpConfig.h
+++ b/include/proxy/http/HttpConfig.h
@@ -48,10 +48,10 @@
#include "tscore/ink_resolver.h"
#include "tscore/Regex.h"
#include "tscpp/util/ts_bw.h"
-#include "HttpProxyAPIEnums.h"
-#include "ConfigProcessor.h"
+#include "proxy/http/HttpProxyAPIEnums.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
#include "records/RecProcess.h"
-#include "HttpConnectionCount.h"
+#include "proxy/http/HttpConnectionCount.h"
#include "tscpp/util/ts_ip.h"
#include "api/Metrics.h"
diff --git a/include/proxy/http/HttpConnectionCount.h b/include/proxy/http/HttpConnectionCount.h
index 43f29e1216..25f24b1a05 100644
--- a/include/proxy/http/HttpConnectionCount.h
+++ b/include/proxy/http/HttpConnectionCount.h
@@ -40,8 +40,8 @@
#include "swoc/bwf_fwd.h"
#include "swoc/TextView.h"
#include <tscore/MgmtDefs.h>
-#include "HttpProxyAPIEnums.h"
-#include "Show.h"
+#include "proxy/http/HttpProxyAPIEnums.h"
+#include "proxy/Show.h"
/**
* Singleton class to keep track of the number of outbound connections.
diff --git a/include/proxy/http/HttpDebugNames.h b/include/proxy/http/HttpDebugNames.h
index b35ef236e7..88bb24f365 100644
--- a/include/proxy/http/HttpDebugNames.h
+++ b/include/proxy/http/HttpDebugNames.h
@@ -23,7 +23,7 @@
#pragma once
-#include "HttpTransact.h"
+#include "proxy/http/HttpTransact.h"
#include "tscpp/util/ts_bw.h"
class HttpDebugNames
diff --git a/include/proxy/http/HttpPages.h b/include/proxy/http/HttpPages.h
index b0f246e7f1..65d052a364 100644
--- a/include/proxy/http/HttpPages.h
+++ b/include/proxy/http/HttpPages.h
@@ -34,10 +34,10 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
-#include "HTTP.h"
-#include "StatPages.h"
-#include "HttpSM.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/StatPages.h"
+#include "proxy/http/HttpSM.h"
class HttpSM;
diff --git a/include/proxy/http/HttpSM.h b/include/proxy/http/HttpSM.h
index e5e2c794a3..237048c2a5 100644
--- a/include/proxy/http/HttpSM.h
+++ b/include/proxy/http/HttpSM.h
@@ -35,20 +35,20 @@
#include <optional>
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
-#include "HttpCacheSM.h"
-#include "HttpTransact.h"
-#include "HttpUserAgent.h"
-#include "HttpVCTable.h"
-#include "UrlRewrite.h"
-#include "HttpTunnel.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/http/HttpCacheSM.h"
+#include "proxy/http/HttpTransact.h"
+#include "proxy/http/HttpUserAgent.h"
+#include "proxy/http/HttpVCTable.h"
+#include "proxy/http/remap/UrlRewrite.h"
+#include "proxy/http/HttpTunnel.h"
#include "api/InkAPIInternal.h"
-#include "../ProxyTransaction.h"
-#include "HdrUtils.h"
+#include "proxy/ProxyTransaction.h"
+#include "proxy/hdrs/HdrUtils.h"
// inknet
-#include "PreWarmManager.h"
-#include "TLSTunnelSupport.h"
+#include "proxy/http/PreWarmManager.h"
+#include "iocore/net/TLSTunnelSupport.h"
#include "tscore/History.h"
#include "tscore/PendingAction.h"
diff --git a/include/proxy/http/HttpSessionAccept.h b/include/proxy/http/HttpSessionAccept.h
index 4eebd4b8f4..23a73e2afb 100644
--- a/include/proxy/http/HttpSessionAccept.h
+++ b/include/proxy/http/HttpSessionAccept.h
@@ -25,12 +25,11 @@
#include "tscore/ink_platform.h"
#include "records/RecHttp.h"
-#include "EventSystem.h"
-#include "HttpConfig.h"
-#include "HTTP.h"
-#include "Net.h"
-#include "SessionAccept.h"
-#include <records/RecHttp.h>
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/http/HttpConfig.h"
+#include "proxy/hdrs/HTTP.h"
+#include "iocore/net/Net.h"
+#include "iocore/net/SessionAccept.h"
namespace detail
{
diff --git a/include/proxy/http/HttpSessionManager.h b/include/proxy/http/HttpSessionManager.h
index 1b15f1d0ed..4a0a2d321b 100644
--- a/include/proxy/http/HttpSessionManager.h
+++ b/include/proxy/http/HttpSessionManager.h
@@ -32,8 +32,8 @@
#pragma once
-#include "EventSystem.h"
-#include "PoolableSession.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/PoolableSession.h"
#include "swoc/IntrusiveHashMap.h"
class ProxyTransaction;
diff --git a/include/proxy/http/HttpTransact.h b/include/proxy/http/HttpTransact.h
index 295069575f..243ba4b612 100644
--- a/include/proxy/http/HttpTransact.h
+++ b/include/proxy/http/HttpTransact.h
@@ -27,22 +27,22 @@
#include "tscore/ink_assert.h"
#include "tscore/ink_platform.h"
-#include "HostDB.h"
-#include "HttpConfig.h"
-#include "HTTP.h"
-#include "HttpTransactCache.h"
-#include "ControlMatcher.h"
-#include "CacheControl.h"
-#include "ParentSelection.h"
-#include "ConfigProcessor.h"
-#include "Transform.h"
-#include "Milestones.h"
+#include "iocore/hostdb/HostDB.h"
+#include "proxy/http/HttpConfig.h"
+#include "proxy/hdrs/HTTP.h"
+#include "iocore/cache/HttpTransactCache.h"
+#include "proxy/ControlMatcher.h"
+#include "proxy/CacheControl.h"
+#include "proxy/ParentSelection.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "proxy/Transform.h"
+#include "proxy/Milestones.h"
#include "ts/remap.h"
#include "ts/parentselectdefs.h"
-#include "RemapPluginInfo.h"
-#include "UrlMapping.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
+#include "proxy/http/remap/UrlMapping.h"
#include "records/RecHttp.h"
-#include "ProxySession.h"
+#include "proxy/ProxySession.h"
#include "tscore/MgmtDefs.h"
#define HTTP_OUR_VIA_MAX_LENGTH 1024 // 512-bytes for hostname+via string, 512-bytes for the debug info
@@ -77,7 +77,7 @@ struct HttpConfigParams;
class HttpSM;
#include "tscore/InkErrno.h"
-#include "HttpConnectionCount.h"
+#include "proxy/http/HttpConnectionCount.h"
#define UNKNOWN_INTERNAL_ERROR (INK_START_ERRNO - 1)
diff --git a/include/proxy/http/HttpTunnel.h b/include/proxy/http/HttpTunnel.h
index c4371cc901..dbd732ad0c 100644
--- a/include/proxy/http/HttpTunnel.h
+++ b/include/proxy/http/HttpTunnel.h
@@ -33,7 +33,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
// Get rid of any previous definition first... /leif
#ifdef MAX_PRODUCERS
diff --git a/include/proxy/http/HttpUserAgent.h b/include/proxy/http/HttpUserAgent.h
index f3b8b52621..3ebed3d642 100644
--- a/include/proxy/http/HttpUserAgent.h
+++ b/include/proxy/http/HttpUserAgent.h
@@ -23,15 +23,15 @@
#pragma once
-#include "HttpVCTable.h"
-#include "Milestones.h"
+#include "proxy/http/HttpVCTable.h"
+#include "proxy/Milestones.h"
-#include "IOBuffer.h"
-#include "TLSALPNSupport.h"
-#include "ProxyTransaction.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/net/TLSALPNSupport.h"
+#include "proxy/ProxyTransaction.h"
#include "records/RecHttp.h"
-#include "TLSBasicSupport.h"
-#include "TLSSessionResumptionSupport.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
struct ClientTransactionInfo {
int id{-1};
diff --git a/include/proxy/http/HttpVCTable.h b/include/proxy/http/HttpVCTable.h
index f07102d80f..a3271a86a5 100644
--- a/include/proxy/http/HttpVCTable.h
+++ b/include/proxy/http/HttpVCTable.h
@@ -23,9 +23,9 @@
#pragma once
-#include "IOBuffer.h"
-#include "VConnection.h"
-#include "VIO.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "iocore/eventsystem/VIO.h"
class HttpSM;
using HttpSMHandler = int (HttpSM::*)(int, void *);
diff --git a/include/proxy/http/PreWarmConfig.h b/include/proxy/http/PreWarmConfig.h
index b4ae24029d..7a62187c7d 100644
--- a/include/proxy/http/PreWarmConfig.h
+++ b/include/proxy/http/PreWarmConfig.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "HttpConfig.h"
+#include "proxy/http/HttpConfig.h"
struct PreWarmConfigParams : public ConfigInfo {
PreWarmConfigParams();
diff --git a/include/proxy/http/PreWarmManager.h b/include/proxy/http/PreWarmManager.h
index e9a1da1b0a..469da3d915 100644
--- a/include/proxy/http/PreWarmManager.h
+++ b/include/proxy/http/PreWarmManager.h
@@ -23,19 +23,19 @@
#pragma once
-#include "PreWarmAlgorithm.h"
+#include "proxy/http/PreWarmAlgorithm.h"
-#include "EventSystem.h"
-#include "NetVConnection.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/NetVConnection.h"
// inknet
-#include "PreWarm.h"
-#include "SSLSNIConfig.h"
-#include "YamlSNIConfig.h"
+#include "iocore/net/PreWarm.h"
+#include "iocore/net/SSLSNIConfig.h"
+#include "iocore/net/YamlSNIConfig.h"
-#include "HostDB.h"
-#include "NetTimeout.h"
-#include "Milestones.h"
+#include "iocore/hostdb/HostDB.h"
+#include "iocore/net/NetTimeout.h"
+#include "proxy/Milestones.h"
#include "api/Metrics.h"
diff --git a/include/proxy/http/remap/NextHopConsistentHash.h b/include/proxy/http/remap/NextHopConsistentHash.h
index 6fe6dfd6da..48798e98d6 100644
--- a/include/proxy/http/remap/NextHopConsistentHash.h
+++ b/include/proxy/http/remap/NextHopConsistentHash.h
@@ -26,7 +26,7 @@
#include <map>
#include <vector>
#include "tscore/HashSip.h"
-#include "NextHopSelectionStrategy.h"
+#include "proxy/http/remap/NextHopSelectionStrategy.h"
enum NHHashKeyType {
NH_URL_HASH_KEY = 0,
diff --git a/include/proxy/http/remap/NextHopRoundRobin.h b/include/proxy/http/remap/NextHopRoundRobin.h
index a5d08c7df6..8982e7278a 100644
--- a/include/proxy/http/remap/NextHopRoundRobin.h
+++ b/include/proxy/http/remap/NextHopRoundRobin.h
@@ -24,7 +24,7 @@
#pragma once
#include <mutex>
-#include "NextHopSelectionStrategy.h"
+#include "proxy/http/remap/NextHopSelectionStrategy.h"
class NextHopRoundRobin : public NextHopSelectionStrategy
{
diff --git a/include/proxy/http/remap/NextHopSelectionStrategy.h b/include/proxy/http/remap/NextHopSelectionStrategy.h
index 9cf6efcd34..52b6822315 100644
--- a/include/proxy/http/remap/NextHopSelectionStrategy.h
+++ b/include/proxy/http/remap/NextHopSelectionStrategy.h
@@ -27,8 +27,8 @@
#include <utility>
#include "ts/parentselectdefs.h"
-#include "ParentSelection.h"
-#include "HttpTransact.h"
+#include "proxy/ParentSelection.h"
+#include "proxy/http/HttpTransact.h"
#ifndef _NH_UNIT_TESTS_
#define NH_Debug(tag, ...) Debug(tag, __VA_ARGS__)
@@ -37,7 +37,7 @@
#define NH_Warn(...) DiagsError(DL_Warning, __VA_ARGS__)
#define NH_GetConfig(v, n) REC_ReadConfigInteger(v, n)
#else
-#include "unit-tests/nexthop_test_stubs.h"
+#include "../../../../src/proxy/http/remap/unit-tests/nexthop_test_stubs.h"
#endif /* _NH_UNIT_TESTS_ */
constexpr const char *NH_DEBUG_TAG = "next_hop";
diff --git a/include/proxy/http/remap/NextHopStrategyFactory.h b/include/proxy/http/remap/NextHopStrategyFactory.h
index 25adca8b40..7c82a9a19c 100644
--- a/include/proxy/http/remap/NextHopStrategyFactory.h
+++ b/include/proxy/http/remap/NextHopStrategyFactory.h
@@ -29,7 +29,7 @@
#include <unordered_set>
#include "tscore/Diags.h"
-#include "NextHopSelectionStrategy.h"
+#include "proxy/http/remap/NextHopSelectionStrategy.h"
namespace ts
{
diff --git a/include/proxy/http/remap/PluginFactory.h b/include/proxy/http/remap/PluginFactory.h
index e0109d6f70..7234d4141e 100644
--- a/include/proxy/http/remap/PluginFactory.h
+++ b/include/proxy/http/remap/PluginFactory.h
@@ -28,8 +28,8 @@
#include "swoc/IntrusiveDList.h"
#include "tscore/Ptr.h"
-#include "PluginDso.h"
-#include "RemapPluginInfo.h"
+#include "proxy/http/remap/PluginDso.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
#include "tscore/Ptr.h"
diff --git a/include/proxy/http/remap/RemapConfig.h b/include/proxy/http/remap/RemapConfig.h
index 50f77c4caf..2cca432f8a 100644
--- a/include/proxy/http/remap/RemapConfig.h
+++ b/include/proxy/http/remap/RemapConfig.h
@@ -23,7 +23,7 @@
#pragma once
-#include "AclFiltering.h"
+#include "proxy/http/remap/AclFiltering.h"
class UrlRewrite;
diff --git a/include/proxy/http/remap/RemapHitCount.h b/include/proxy/http/remap/RemapHitCount.h
index 20407e6366..24948868c8 100644
--- a/include/proxy/http/remap/RemapHitCount.h
+++ b/include/proxy/http/remap/RemapHitCount.h
@@ -23,8 +23,8 @@
#pragma once
-#include "HTTP.h"
-#include "EventSystem.h"
-#include "Show.h"
+#include "proxy/hdrs/HTTP.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/Show.h"
Action *register_ShowRemapHitCount(Continuation *, HTTPHdr *);
diff --git a/include/proxy/http/remap/RemapPluginInfo.h b/include/proxy/http/remap/RemapPluginInfo.h
index 16156dc749..dda7695ce6 100644
--- a/include/proxy/http/remap/RemapPluginInfo.h
+++ b/include/proxy/http/remap/RemapPluginInfo.h
@@ -30,7 +30,7 @@
#include "tscore/ink_platform.h"
#include "ts/apidefs.h"
#include "ts/remap.h"
-#include "PluginDso.h"
+#include "proxy/http/remap/PluginDso.h"
class url_mapping;
diff --git a/include/proxy/http/remap/RemapPlugins.h b/include/proxy/http/remap/RemapPlugins.h
index 6af3405224..6051db26ee 100644
--- a/include/proxy/http/remap/RemapPlugins.h
+++ b/include/proxy/http/remap/RemapPlugins.h
@@ -25,11 +25,11 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
-#include "RemapProcessor.h"
-#include "RemapPluginInfo.h"
-#include "HttpTransact.h"
-#include "ReverseProxy.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/http/remap/RemapProcessor.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
+#include "proxy/http/HttpTransact.h"
+#include "proxy/ReverseProxy.h"
/**
* A class that represents a queue of plugins to run
diff --git a/include/proxy/http/remap/RemapProcessor.h b/include/proxy/http/remap/RemapProcessor.h
index 6abf716248..5ea5707c77 100644
--- a/include/proxy/http/remap/RemapProcessor.h
+++ b/include/proxy/http/remap/RemapProcessor.h
@@ -26,10 +26,10 @@
**/
#pragma once
-#include "EventSystem.h"
-#include "RemapPlugins.h"
-#include "RemapPluginInfo.h"
-#include "ReverseProxy.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "proxy/http/remap/RemapPlugins.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
+#include "proxy/ReverseProxy.h"
#define EVENT_REMAP_START (REMAP_EVENT_EVENTS_START + 0)
#define EVENT_REMAP_ERROR (REMAP_EVENT_EVENTS_START + 1)
diff --git a/include/proxy/http/remap/UrlMapping.h b/include/proxy/http/remap/UrlMapping.h
index b864cae9b1..2de926286b 100644
--- a/include/proxy/http/remap/UrlMapping.h
+++ b/include/proxy/http/remap/UrlMapping.h
@@ -27,11 +27,11 @@
#include <vector>
#include "tscore/ink_config.h"
-#include "AclFiltering.h"
-#include "URL.h"
-#include "RemapHitCount.h"
-#include "RemapPluginInfo.h"
-#include "PluginFactory.h"
+#include "proxy/http/remap/AclFiltering.h"
+#include "proxy/hdrs/URL.h"
+#include "proxy/http/remap/RemapHitCount.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
+#include "proxy/http/remap/PluginFactory.h"
#include "tscore/Regex.h"
#include "tscore/List.h"
diff --git a/include/proxy/http/remap/UrlMappingPathIndex.h b/include/proxy/http/remap/UrlMappingPathIndex.h
index 0e3465420e..1eb4d6aac5 100644
--- a/include/proxy/http/remap/UrlMappingPathIndex.h
+++ b/include/proxy/http/remap/UrlMappingPathIndex.h
@@ -26,8 +26,8 @@
#include <map>
-#include "URL.h"
-#include "UrlMapping.h"
+#include "proxy/hdrs/URL.h"
+#include "proxy/http/remap/UrlMapping.h"
#include "tscore/Trie.h"
class UrlMappingPathIndex
diff --git a/include/proxy/http/remap/UrlRewrite.h b/include/proxy/http/remap/UrlRewrite.h
index da02ea8753..f59b4b769c 100644
--- a/include/proxy/http/remap/UrlRewrite.h
+++ b/include/proxy/http/remap/UrlRewrite.h
@@ -25,12 +25,12 @@
#pragma once
#include "tscore/ink_config.h"
-#include "UrlMapping.h"
-#include "UrlMappingPathIndex.h"
-#include "HttpTransact.h"
+#include "proxy/http/remap/UrlMapping.h"
+#include "proxy/http/remap/UrlMappingPathIndex.h"
+#include "proxy/http/HttpTransact.h"
#include "tscore/Regex.h"
-#include "PluginFactory.h"
-#include "NextHopStrategyFactory.h"
+#include "proxy/http/remap/PluginFactory.h"
+#include "proxy/http/remap/NextHopStrategyFactory.h"
#include <memory>
diff --git a/include/proxy/http2/HPACK.h b/include/proxy/http2/HPACK.h
index 79385ab177..b3d7440e60 100644
--- a/include/proxy/http2/HPACK.h
+++ b/include/proxy/http2/HPACK.h
@@ -25,8 +25,8 @@
#include "tscore/ink_platform.h"
#include "tscore/Diags.h"
-#include "HTTP.h"
-#include "../hdrs/XPACK.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/XPACK.h"
#include <deque>
#include <string_view>
diff --git a/include/proxy/http2/HTTP2.h b/include/proxy/http2/HTTP2.h
index d79d118bdb..a424981f22 100644
--- a/include/proxy/http2/HTTP2.h
+++ b/include/proxy/http2/HTTP2.h
@@ -25,8 +25,8 @@
#include "tscore/ink_defs.h"
#include "tscore/ink_memory.h"
-#include "HPACK.h"
-#include "MIME.h"
+#include "proxy/http2/HPACK.h"
+#include "proxy/hdrs/MIME.h"
#include "records/RecDefs.h"
#include "api/Metrics.h"
diff --git a/include/proxy/http2/Http2ClientSession.h b/include/proxy/http2/Http2ClientSession.h
index 893feb753a..8a550c02f4 100644
--- a/include/proxy/http2/Http2ClientSession.h
+++ b/include/proxy/http2/Http2ClientSession.h
@@ -23,12 +23,12 @@
#pragma once
-#include "Plugin.h"
-#include "Http2CommonSession.h"
+#include "proxy/Plugin.h"
+#include "proxy/http2/Http2CommonSession.h"
#include <string_view>
#include "tscore/ink_inet.h"
#include "tscore/History.h"
-#include "Milestones.h"
+#include "proxy/Milestones.h"
class Http2ClientSession : public ProxySession, public Http2CommonSession
{
diff --git a/include/proxy/http2/Http2CommonSession.h b/include/proxy/http2/Http2CommonSession.h
index 8209cf00ba..60e19be543 100644
--- a/include/proxy/http2/Http2CommonSession.h
+++ b/include/proxy/http2/Http2CommonSession.h
@@ -25,10 +25,10 @@
#include <unordered_set>
-#include "HTTP2.h"
-#include "ProxySession.h"
-#include "Http2ConnectionState.h"
-#include "Http2Frame.h"
+#include "proxy/http2/HTTP2.h"
+#include "proxy/ProxySession.h"
+#include "proxy/http2/Http2ConnectionState.h"
+#include "proxy/http2/Http2Frame.h"
// Name Edata Description
// HTTP2_SESSION_EVENT_INIT Http2CommonSession * HTTP/2 session is born
diff --git a/include/proxy/http2/Http2CommonSessionInternal.h b/include/proxy/http2/Http2CommonSessionInternal.h
index ffbc9fc6ca..1ec20a0d4e 100644
--- a/include/proxy/http2/Http2CommonSessionInternal.h
+++ b/include/proxy/http2/Http2CommonSessionInternal.h
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "Http2CommonSession.h"
+#include "proxy/http2/Http2CommonSession.h"
#define REMEMBER(e, r) \
{ \
diff --git a/include/proxy/http2/Http2ConnectionState.h b/include/proxy/http2/Http2ConnectionState.h
index 863adb9275..fc999b1447 100644
--- a/include/proxy/http2/Http2ConnectionState.h
+++ b/include/proxy/http2/Http2ConnectionState.h
@@ -26,13 +26,13 @@
#include <atomic>
#include <queue>
-#include "NetTimeout.h"
+#include "iocore/net/NetTimeout.h"
-#include "HTTP2.h"
-#include "HPACK.h"
-#include "Http2Stream.h"
-#include "Http2DependencyTree.h"
-#include "Http2FrequencyCounter.h"
+#include "proxy/http2/HTTP2.h"
+#include "proxy/http2/HPACK.h"
+#include "proxy/http2/Http2Stream.h"
+#include "proxy/http2/Http2DependencyTree.h"
+#include "proxy/http2/Http2FrequencyCounter.h"
class Http2CommonSession;
class Http2Frame;
diff --git a/include/proxy/http2/Http2DependencyTree.h b/include/proxy/http2/Http2DependencyTree.h
index 7201447000..6516c7fa31 100644
--- a/include/proxy/http2/Http2DependencyTree.h
+++ b/include/proxy/http2/Http2DependencyTree.h
@@ -30,7 +30,7 @@
#include "tscore/Diags.h"
#include "tscore/PriorityQueue.h"
-#include "HTTP2.h"
+#include "proxy/http2/HTTP2.h"
// TODO: K is a constant, 256 is temporal value.
const static uint32_t K = 256;
diff --git a/include/proxy/http2/Http2Frame.h b/include/proxy/http2/Http2Frame.h
index 2bd8108027..3a836e1ee2 100644
--- a/include/proxy/http2/Http2Frame.h
+++ b/include/proxy/http2/Http2Frame.h
@@ -23,9 +23,9 @@
#pragma once
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
-#include "HTTP2.h"
+#include "proxy/http2/HTTP2.h"
/**
Incoming HTTP/2 Frame
diff --git a/include/proxy/http2/Http2FrequencyCounter.h b/include/proxy/http2/Http2FrequencyCounter.h
index f28cb644bf..425e0e1b3d 100644
--- a/include/proxy/http2/Http2FrequencyCounter.h
+++ b/include/proxy/http2/Http2FrequencyCounter.h
@@ -24,7 +24,7 @@
#pragma once
#include <cstdint>
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
class Http2FrequencyCounter
{
diff --git a/include/proxy/http2/Http2ServerSession.h b/include/proxy/http2/Http2ServerSession.h
index 30f3a074b7..7599f3d4d4 100644
--- a/include/proxy/http2/Http2ServerSession.h
+++ b/include/proxy/http2/Http2ServerSession.h
@@ -23,13 +23,13 @@
#pragma once
-#include "Plugin.h"
-#include "Http2CommonSession.h"
+#include "proxy/Plugin.h"
+#include "proxy/http2/Http2CommonSession.h"
#include <string_view>
#include "tscore/ink_inet.h"
#include "tscore/History.h"
-#include "Milestones.h"
-#include "PoolableSession.h"
+#include "proxy/Milestones.h"
+#include "proxy/PoolableSession.h"
class Http2ServerSession : public PoolableSession, public Http2CommonSession
{
diff --git a/include/proxy/http2/Http2SessionAccept.h b/include/proxy/http2/Http2SessionAccept.h
index 1571109890..4634fb16af 100644
--- a/include/proxy/http2/Http2SessionAccept.h
+++ b/include/proxy/http2/Http2SessionAccept.h
@@ -24,11 +24,11 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Net.h"
+#include "iocore/net/Net.h"
// XXX HttpSessionAccept::Options needs to be refactored and separated from HttpSessionAccept so that
// it can generically apply to all protocol implementations.
-#include "http/HttpSessionAccept.h"
+#include "proxy/http/HttpSessionAccept.h"
// HTTP/2 Session Accept.
//
diff --git a/include/proxy/http2/Http2Stream.h b/include/proxy/http2/Http2Stream.h
index 3751e8ec96..ffb811cd71 100644
--- a/include/proxy/http2/Http2Stream.h
+++ b/include/proxy/http2/Http2Stream.h
@@ -23,14 +23,14 @@
#pragma once
-#include "NetTimeout.h"
+#include "iocore/net/NetTimeout.h"
-#include "HTTP2.h"
-#include "ProxyTransaction.h"
-#include "Http2DebugNames.h"
-#include "Http2DependencyTree.h"
+#include "proxy/http2/HTTP2.h"
+#include "proxy/ProxyTransaction.h"
+#include "proxy/http2/Http2DebugNames.h"
+#include "proxy/http2/Http2DependencyTree.h"
#include "tscore/History.h"
-#include "Milestones.h"
+#include "proxy/Milestones.h"
class Http2Stream;
class Http2ConnectionState;
diff --git a/include/proxy/http3/Http09App.h b/include/proxy/http3/Http09App.h
index 5490f4fdaa..9221d48b05 100644
--- a/include/proxy/http3/Http09App.h
+++ b/include/proxy/http3/Http09App.h
@@ -23,12 +23,12 @@
#pragma once
-#include "IPAllow.h"
+#include "proxy/IPAllow.h"
-#include "HttpSessionAccept.h"
+#include "proxy/http/HttpSessionAccept.h"
-#include "QUICApplication.h"
-#include "QUICStreamVCAdapter.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
class Http09Session;
diff --git a/include/proxy/http3/Http3App.h b/include/proxy/http3/Http3App.h
index 369d9eb9e1..b4d056f68f 100644
--- a/include/proxy/http3/Http3App.h
+++ b/include/proxy/http3/Http3App.h
@@ -25,18 +25,18 @@
#include <map>
-#include "IPAllow.h"
+#include "proxy/IPAllow.h"
-#include "QUICApplication.h"
-#include "QUICStreamVCAdapter.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
-#include "HttpSessionAccept.h"
+#include "proxy/http/HttpSessionAccept.h"
-#include "Http3Types.h"
-#include "Http3FrameDispatcher.h"
-#include "Http3FrameCollector.h"
-#include "Http3FrameGenerator.h"
-#include "Http3FrameHandler.h"
+#include "proxy/http3/Http3Types.h"
+#include "proxy/http3/Http3FrameDispatcher.h"
+#include "proxy/http3/Http3FrameCollector.h"
+#include "proxy/http3/Http3FrameGenerator.h"
+#include "proxy/http3/Http3FrameHandler.h"
class Http3Session;
diff --git a/include/proxy/http3/Http3Config.h b/include/proxy/http3/Http3Config.h
index 92a69e7b8a..6adac7f5e6 100644
--- a/include/proxy/http3/Http3Config.h
+++ b/include/proxy/http3/Http3Config.h
@@ -23,7 +23,7 @@
#pragma once
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
namespace ts
{
diff --git a/include/proxy/http3/Http3DataFramer.h b/include/proxy/http3/Http3DataFramer.h
index 0db8715a15..69a1b8331a 100644
--- a/include/proxy/http3/Http3DataFramer.h
+++ b/include/proxy/http3/Http3DataFramer.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Http3FrameGenerator.h"
-#include "Http3Frame.h"
+#include "proxy/http3/Http3FrameGenerator.h"
+#include "proxy/http3/Http3Frame.h"
class Http3Transaction;
class VIO;
diff --git a/include/proxy/http3/Http3DebugNames.h b/include/proxy/http3/Http3DebugNames.h
index c8f34da693..5f2d74873a 100644
--- a/include/proxy/http3/Http3DebugNames.h
+++ b/include/proxy/http3/Http3DebugNames.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Http3Types.h"
+#include "proxy/http3/Http3Types.h"
class Http3DebugNames
{
diff --git a/include/proxy/http3/Http3Frame.h b/include/proxy/http3/Http3Frame.h
index 9c49539aed..e11192cf07 100644
--- a/include/proxy/http3/Http3Frame.h
+++ b/include/proxy/http3/Http3Frame.h
@@ -26,8 +26,8 @@
#include "tscore/Allocator.h"
#include "tscore/ink_memory.h"
#include "tscore/ink_assert.h"
-#include "QUICApplication.h"
-#include "Http3Types.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "proxy/http3/Http3Types.h"
class Http3Frame
{
diff --git a/include/proxy/http3/Http3FrameCollector.h b/include/proxy/http3/Http3FrameCollector.h
index 3faaf5d423..0845cbc57c 100644
--- a/include/proxy/http3/Http3FrameCollector.h
+++ b/include/proxy/http3/Http3FrameCollector.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICApplication.h"
-#include "Http3Frame.h"
-#include "Http3FrameGenerator.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "proxy/http3/Http3Frame.h"
+#include "proxy/http3/Http3FrameGenerator.h"
#include <vector>
class QUICStreamVCAdapter;
diff --git a/include/proxy/http3/Http3FrameDispatcher.h b/include/proxy/http3/Http3FrameDispatcher.h
index d3f2118adb..6bf02abc26 100644
--- a/include/proxy/http3/Http3FrameDispatcher.h
+++ b/include/proxy/http3/Http3FrameDispatcher.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QUICApplication.h"
-#include "Http3Frame.h"
-#include "Http3FrameHandler.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "proxy/http3/Http3Frame.h"
+#include "proxy/http3/Http3FrameHandler.h"
#include <vector>
class QUICStreamVCAdapter;
diff --git a/include/proxy/http3/Http3FrameGenerator.h b/include/proxy/http3/Http3FrameGenerator.h
index de5a4a1410..819d520f0d 100644
--- a/include/proxy/http3/Http3FrameGenerator.h
+++ b/include/proxy/http3/Http3FrameGenerator.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Http3Frame.h"
+#include "proxy/http3/Http3Frame.h"
class Http3FrameGenerator
{
diff --git a/include/proxy/http3/Http3FrameHandler.h b/include/proxy/http3/Http3FrameHandler.h
index 79b1bd5fa9..93fcb3f5a9 100644
--- a/include/proxy/http3/Http3FrameHandler.h
+++ b/include/proxy/http3/Http3FrameHandler.h
@@ -24,8 +24,8 @@
#pragma once
#include <vector>
-#include <Http3Types.h>
-#include <Http3Frame.h>
+#include "proxy/http3/Http3Types.h"
+#include "proxy/http3/Http3Frame.h"
class Http3FrameHandler
{
diff --git a/include/proxy/http3/Http3HeaderFramer.h b/include/proxy/http3/Http3HeaderFramer.h
index 7a36905475..2295d696b1 100644
--- a/include/proxy/http3/Http3HeaderFramer.h
+++ b/include/proxy/http3/Http3HeaderFramer.h
@@ -23,13 +23,13 @@
#pragma once
-#include "hdrs/HTTP.h"
-#include "hdrs/VersionConverter.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/VersionConverter.h"
-#include "QPACK.h"
+#include "proxy/http3/QPACK.h"
-#include "Http3FrameGenerator.h"
-#include "Http3Frame.h"
+#include "proxy/http3/Http3FrameGenerator.h"
+#include "proxy/http3/Http3Frame.h"
class Http3Transaction;
class VIO;
diff --git a/include/proxy/http3/Http3HeaderVIOAdaptor.h b/include/proxy/http3/Http3HeaderVIOAdaptor.h
index f3a4de481d..6931e32b20 100644
--- a/include/proxy/http3/Http3HeaderVIOAdaptor.h
+++ b/include/proxy/http3/Http3HeaderVIOAdaptor.h
@@ -23,9 +23,9 @@
#pragma once
-#include "QPACK.h"
-#include "hdrs/VersionConverter.h"
-#include "Http3FrameHandler.h"
+#include "proxy/http3/QPACK.h"
+#include "proxy/hdrs/VersionConverter.h"
+#include "proxy/http3/Http3FrameHandler.h"
class Http3HeaderVIOAdaptor : public Continuation, public Http3FrameHandler
{
diff --git a/include/proxy/http3/Http3ProtocolEnforcer.h b/include/proxy/http3/Http3ProtocolEnforcer.h
index a62d239c2f..948a083ceb 100644
--- a/include/proxy/http3/Http3ProtocolEnforcer.h
+++ b/include/proxy/http3/Http3ProtocolEnforcer.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Http3Types.h"
-#include "Http3FrameHandler.h"
+#include "proxy/http3/Http3Types.h"
+#include "proxy/http3/Http3FrameHandler.h"
class Http3ProtocolEnforcer : public Http3FrameHandler
{
diff --git a/include/proxy/http3/Http3Session.h b/include/proxy/http3/Http3Session.h
index 2245366046..5bbb4ed795 100644
--- a/include/proxy/http3/Http3Session.h
+++ b/include/proxy/http3/Http3Session.h
@@ -23,9 +23,9 @@
#pragma once
-#include "ProxySession.h"
-#include "Http3Transaction.h"
-#include "QPACK.h"
+#include "proxy/ProxySession.h"
+#include "proxy/http3/Http3Transaction.h"
+#include "proxy/http3/QPACK.h"
class HQSession : public ProxySession
{
diff --git a/include/proxy/http3/Http3SessionAccept.h b/include/proxy/http3/Http3SessionAccept.h
index 5292facbf7..9a57671bb2 100644
--- a/include/proxy/http3/Http3SessionAccept.h
+++ b/include/proxy/http3/Http3SessionAccept.h
@@ -24,11 +24,11 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Net.h"
+#include "iocore/net/Net.h"
// XXX HttpSessionAccept::Options needs to be refactored and separated from HttpSessionAccept so that
// it can generically apply to all protocol implementations.
-#include "http/HttpSessionAccept.h"
+#include "proxy/http/HttpSessionAccept.h"
// HTTP/QUIC Session Accept.
//
diff --git a/include/proxy/http3/Http3SettingsHandler.h b/include/proxy/http3/Http3SettingsHandler.h
index 97a512fbe5..27d6f9f07d 100644
--- a/include/proxy/http3/Http3SettingsHandler.h
+++ b/include/proxy/http3/Http3SettingsHandler.h
@@ -23,8 +23,8 @@
#pragma once
-#include "Http3FrameHandler.h"
-#include "Http3Session.h"
+#include "proxy/http3/Http3FrameHandler.h"
+#include "proxy/http3/Http3Session.h"
class Http3SettingsHandler : public Http3FrameHandler
{
diff --git a/include/proxy/http3/Http3StreamDataVIOAdaptor.h b/include/proxy/http3/Http3StreamDataVIOAdaptor.h
index c14218b83c..6085bba8d8 100644
--- a/include/proxy/http3/Http3StreamDataVIOAdaptor.h
+++ b/include/proxy/http3/Http3StreamDataVIOAdaptor.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Http3FrameHandler.h"
+#include "proxy/http3/Http3FrameHandler.h"
class VIO;
diff --git a/include/proxy/http3/Http3Transaction.h b/include/proxy/http3/Http3Transaction.h
index 85e6a95f49..833fc39ae8 100644
--- a/include/proxy/http3/Http3Transaction.h
+++ b/include/proxy/http3/Http3Transaction.h
@@ -23,11 +23,11 @@
#pragma once
-#include "VConnection.h"
-#include "ProxyTransaction.h"
-#include "quic/QUICStreamVCAdapter.h"
-#include "Http3FrameDispatcher.h"
-#include "Http3FrameCollector.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "proxy/ProxyTransaction.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
+#include "proxy/http3/Http3FrameDispatcher.h"
+#include "proxy/http3/Http3FrameCollector.h"
class QUICStreamIO;
class HQSession;
diff --git a/include/proxy/http3/QPACK.h b/include/proxy/http3/QPACK.h
index 3909913303..5dbc0f5013 100644
--- a/include/proxy/http3/QPACK.h
+++ b/include/proxy/http3/QPACK.h
@@ -27,15 +27,15 @@
#include "swoc/IntrusiveDList.h"
-#include "EventSystem.h"
-#include "Event.h"
-#include "IOBuffer.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/IOBuffer.h"
#include "tscore/Arena.h"
-#include "MIME.h"
-#include "HTTP.h"
-#include "QUICApplication.h"
-#include "QUICStreamVCAdapter.h"
-#include "QUICConnection.h"
+#include "proxy/hdrs/MIME.h"
+#include "proxy/hdrs/HTTP.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
+#include "iocore/net/quic/QUICConnection.h"
class HTTPHdr;
diff --git a/include/proxy/logging/Log.h b/include/proxy/logging/Log.h
index 0fb0787b9e..40491e4793 100644
--- a/include/proxy/logging/Log.h
+++ b/include/proxy/logging/Log.h
@@ -56,8 +56,8 @@
#include "tscore/EventNotify.h"
#include "tscore/Regression.h"
#include "records/RecProcess.h"
-#include "LogFile.h"
-#include "LogBuffer.h"
+#include "proxy/logging/LogFile.h"
+#include "proxy/logging/LogBuffer.h"
#include <unordered_map>
diff --git a/include/proxy/logging/LogAccess.h b/include/proxy/logging/LogAccess.h
index 08bfb8f395..316f2340d6 100644
--- a/include/proxy/logging/LogAccess.h
+++ b/include/proxy/logging/LogAccess.h
@@ -25,7 +25,7 @@
#pragma once
#include "tscore/ink_align.h"
-#include "LogField.h"
+#include "proxy/logging/LogField.h"
class HTTPHdr;
class HttpSM;
diff --git a/include/proxy/logging/LogBuffer.h b/include/proxy/logging/LogBuffer.h
index 8a67c7e057..88b62bc6f1 100644
--- a/include/proxy/logging/LogBuffer.h
+++ b/include/proxy/logging/LogBuffer.h
@@ -26,9 +26,9 @@
#include "tscore/ink_platform.h"
#include "tscore/ink_atomic.h"
#include "tscore/Diags.h"
-#include "LogFormat.h"
-#include "LogLimits.h"
-#include "LogAccess.h"
+#include "proxy/logging/LogFormat.h"
+#include "proxy/logging/LogLimits.h"
+#include "proxy/logging/LogAccess.h"
class LogObject;
class LogConfig;
diff --git a/include/proxy/logging/LogBufferSink.h b/include/proxy/logging/LogBufferSink.h
index f7f0d3d513..e0f233222e 100644
--- a/include/proxy/logging/LogBufferSink.h
+++ b/include/proxy/logging/LogBufferSink.h
@@ -23,7 +23,7 @@
#pragma once
-#include "LogBuffer.h"
+#include "proxy/logging/LogBuffer.h"
/**********************************************************************
The LogBufferSink class in an abstract class that provides an interface
diff --git a/include/proxy/logging/LogConfig.h b/include/proxy/logging/LogConfig.h
index 376c8ca267..45d9436bfc 100644
--- a/include/proxy/logging/LogConfig.h
+++ b/include/proxy/logging/LogConfig.h
@@ -28,9 +28,9 @@
#include "tscore/ink_platform.h"
#include "records/RecProcess.h"
-#include "ConfigProcessor.h"
-#include "LogObject.h"
-#include "RolledLogDeleter.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "proxy/logging/LogObject.h"
+#include "proxy/logging/RolledLogDeleter.h"
#include "swoc/MemSpan.h"
#include "api/Metrics.h"
diff --git a/include/proxy/logging/LogField.h b/include/proxy/logging/LogField.h
index 2345b90811..0498b3f972 100644
--- a/include/proxy/logging/LogField.h
+++ b/include/proxy/logging/LogField.h
@@ -29,8 +29,8 @@
#include "tscore/ink_platform.h"
#include "tscore/List.h"
-#include "LogFieldAliasMap.h"
-#include "Milestones.h"
+#include "proxy/logging/LogFieldAliasMap.h"
+#include "proxy/Milestones.h"
enum LogEscapeType { LOG_ESCAPE_NONE, LOG_ESCAPE_JSON };
diff --git a/include/proxy/logging/LogFieldAliasMap.h b/include/proxy/logging/LogFieldAliasMap.h
index fabb5b1cb0..23bc039941 100644
--- a/include/proxy/logging/LogFieldAliasMap.h
+++ b/include/proxy/logging/LogFieldAliasMap.h
@@ -33,7 +33,7 @@
#include "tscore/ink_platform.h"
#include "tscore/Ptr.h"
-#include "LogUtils.h"
+#include "proxy/logging/LogUtils.h"
#include "tscore/ink_string.h"
/*****************************************************************************
diff --git a/include/proxy/logging/LogFile.h b/include/proxy/logging/LogFile.h
index f192da10a6..0326d3498a 100644
--- a/include/proxy/logging/LogFile.h
+++ b/include/proxy/logging/LogFile.h
@@ -27,7 +27,7 @@
#include <cstdio>
#include "tscore/ink_platform.h"
-#include "LogBufferSink.h"
+#include "proxy/logging/LogBufferSink.h"
class LogBuffer;
struct LogBufferHeader;
diff --git a/include/proxy/logging/LogFilter.h b/include/proxy/logging/LogFilter.h
index 8fe5e83b57..2a1c0cc692 100644
--- a/include/proxy/logging/LogFilter.h
+++ b/include/proxy/logging/LogFilter.h
@@ -27,9 +27,9 @@
#include "tscore/ink_platform.h"
#include "tscore/Ptr.h"
-#include "LogAccess.h"
-#include "LogField.h"
-#include "LogFormat.h"
+#include "proxy/logging/LogAccess.h"
+#include "proxy/logging/LogField.h"
+#include "proxy/logging/LogFormat.h"
/*-------------------------------------------------------------------------
LogFilter
diff --git a/include/proxy/logging/LogFormat.h b/include/proxy/logging/LogFormat.h
index 602853eb69..860a30bbc7 100644
--- a/include/proxy/logging/LogFormat.h
+++ b/include/proxy/logging/LogFormat.h
@@ -26,7 +26,7 @@
#define LOG_FIELD_MARKER '\377'
#include "tscore/ink_platform.h"
-#include "LogField.h"
+#include "proxy/logging/LogField.h"
enum LogFormatType {
// We start the numbering at 4 to compatibility with Traffic Server 4.x, which used
diff --git a/include/proxy/logging/LogObject.h b/include/proxy/logging/LogObject.h
index 81db5e6f2b..9250693b0f 100644
--- a/include/proxy/logging/LogObject.h
+++ b/include/proxy/logging/LogObject.h
@@ -24,13 +24,13 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Log.h"
-#include "LogFile.h"
-#include "LogFormat.h"
-#include "LogFilter.h"
-#include "LogBuffer.h"
-#include "LogAccess.h"
-#include "LogFilter.h"
+#include "proxy/logging/Log.h"
+#include "proxy/logging/LogFile.h"
+#include "proxy/logging/LogFormat.h"
+#include "proxy/logging/LogFilter.h"
+#include "proxy/logging/LogBuffer.h"
+#include "proxy/logging/LogAccess.h"
+#include "proxy/logging/LogFilter.h"
#include <vector>
/*-------------------------------------------------------------------------
diff --git a/include/records/RecCore.h b/include/records/RecCore.h
index bb8ac304ed..f938e1c61e 100644
--- a/include/records/RecCore.h
+++ b/include/records/RecCore.h
@@ -27,7 +27,7 @@
#include "tscore/Diags.h"
-#include "RecDefs.h"
+#include "records/RecDefs.h"
#include "swoc/MemSpan.h"
struct RecRecord;
diff --git a/include/records/RecDefs.h b/include/records/RecDefs.h
index aad110ff13..44405af4e6 100644
--- a/include/records/RecDefs.h
+++ b/include/records/RecDefs.h
@@ -25,7 +25,7 @@
#include "tscore/ink_mutex.h"
#include "tscore/ink_rwlock.h"
-#include "RecMutex.h"
+#include "records/RecMutex.h"
//-------------------------------------------------------------------------
// Error Values
diff --git a/include/records/RecLocal.h b/include/records/RecLocal.h
index 183c87b294..42a31fbc35 100644
--- a/include/records/RecLocal.h
+++ b/include/records/RecLocal.h
@@ -23,7 +23,7 @@
#pragma once
-#include "RecCore.h"
+#include "records/RecCore.h"
class FileManager;
diff --git a/include/records/RecProcess.h b/include/records/RecProcess.h
index a69d58815d..4f7b707dea 100644
--- a/include/records/RecProcess.h
+++ b/include/records/RecProcess.h
@@ -23,7 +23,7 @@
#pragma once
-#include "RecCore.h"
+#include "records/RecCore.h"
#include "iocore/eventsystem/EventSystem.h"
//-------------------------------------------------------------------------
diff --git a/include/records/RecordsConfig.h b/include/records/RecordsConfig.h
index 2b16f7c030..a51198847d 100644
--- a/include/records/RecordsConfig.h
+++ b/include/records/RecordsConfig.h
@@ -23,7 +23,7 @@
#pragma once
-#include "records/P_RecCore.h"
+#include "../../src/records/P_RecCore.h"
// This is to manage the librecords table sizes. Not awesome, but better than the earlier recompiling of ATS requirement...
extern int max_records_entries;
diff --git a/include/shared/overridable_txn_vars.h b/include/shared/overridable_txn_vars.h
index 4b9111cf36..9f82691456 100644
--- a/include/shared/overridable_txn_vars.h
+++ b/include/shared/overridable_txn_vars.h
@@ -24,8 +24,8 @@
#pragma once
#include <unordered_map>
-#include "HTTP.h"
-#include "HttpConnectionCount.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/http/HttpConnectionCount.h"
namespace ts
{
diff --git a/include/shared/rpc/RPCClient.h b/include/shared/rpc/RPCClient.h
index 885ed96a1d..0408550e6f 100644
--- a/include/shared/rpc/RPCClient.h
+++ b/include/shared/rpc/RPCClient.h
@@ -28,8 +28,8 @@
#include <tscore/Layout.h>
#include <swoc/BufferWriter.h>
-#include "IPCSocketClient.h"
-#include "yaml_codecs.h"
+#include "shared/rpc/IPCSocketClient.h"
+#include "shared/rpc/yaml_codecs.h"
namespace shared::rpc
{
diff --git a/include/shared/rpc/yaml_codecs.h b/include/shared/rpc/yaml_codecs.h
index db230ee4ad..1e61742a51 100644
--- a/include/shared/rpc/yaml_codecs.h
+++ b/include/shared/rpc/yaml_codecs.h
@@ -22,7 +22,7 @@
#include <string_view>
#include <yaml-cpp/yaml.h>
-#include "RPCRequests.h"
+#include "shared/rpc/RPCRequests.h"
/// JSONRPC 2.0 Client API request/response codecs only. If you need to define your own specific codecs they should then be defined
/// in a different file, unless they are strongly related to the ones defined here.
diff --git a/include/ts/InkAPIPrivateIOCore.h b/include/ts/InkAPIPrivateIOCore.h
index 1e4fb98513..e89e24e337 100644
--- a/include/ts/InkAPIPrivateIOCore.h
+++ b/include/ts/InkAPIPrivateIOCore.h
@@ -23,11 +23,11 @@
#pragma once
#if !defined(__GNUC__)
-#include "EventSystem.h"
-#include "Net.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Net.h"
#else
-#include "P_EventSystem.h"
-#include "P_Net.h"
+#include "../../src/iocore/eventsystem/P_EventSystem.h"
+#include "../../src/iocore/net/P_Net.h"
#endif
namespace tsapi
diff --git a/include/tscore/BaseLogFile.h b/include/tscore/BaseLogFile.h
index eca920a1fd..121659a856 100644
--- a/include/tscore/BaseLogFile.h
+++ b/include/tscore/BaseLogFile.h
@@ -32,12 +32,12 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "ink_memory.h"
-#include "ink_string.h"
-#include "ink_file.h"
-#include "ink_cap.h"
-#include "ink_time.h"
-#include "SimpleTokenizer.h"
+#include "tscore/ink_memory.h"
+#include "tscore/ink_string.h"
+#include "tscore/ink_file.h"
+#include "tscore/ink_cap.h"
+#include "tscore/ink_time.h"
+#include "tscore/SimpleTokenizer.h"
#define LOGFILE_ROLLED_EXTENSION ".old"
#define LOGFILE_SEPARATOR_STRING "_"
diff --git a/include/tscore/ConsistentHash.h b/include/tscore/ConsistentHash.h
index 22b2e8f88c..26ce339a04 100644
--- a/include/tscore/ConsistentHash.h
+++ b/include/tscore/ConsistentHash.h
@@ -22,7 +22,7 @@
#pragma once
#include <atomic>
-#include "Hash.h"
+#include "tscore/Hash.h"
#include <cstdint>
#include <iostream>
#include <map>
diff --git a/include/tscore/ContFlags.h b/include/tscore/ContFlags.h
index 33b7b5a23c..b75128c060 100644
--- a/include/tscore/ContFlags.h
+++ b/include/tscore/ContFlags.h
@@ -34,7 +34,7 @@
#pragma once
-#include "ink_thread.h"
+#include "tscore/ink_thread.h"
class ContFlags
{
diff --git a/include/tscore/CryptoHash.h b/include/tscore/CryptoHash.h
index 8cb5c32914..cf46bfa7ae 100644
--- a/include/tscore/CryptoHash.h
+++ b/include/tscore/CryptoHash.h
@@ -23,7 +23,7 @@
#pragma once
#include "tscpp/util/ts_bw_format.h"
-#include "ink_memory.h"
+#include "tscore/ink_memory.h"
#include <openssl/evp.h>
#include <string_view>
diff --git a/include/tscore/Diags.h b/include/tscore/Diags.h
index c3037a7c89..13b722d5fa 100644
--- a/include/tscore/Diags.h
+++ b/include/tscore/Diags.h
@@ -34,9 +34,9 @@
#pragma once
#include <ts/DbgCtl.h>
-#include "DiagsTypes.h"
-#include "SourceLocation.h"
-#include "LogMessage.h"
+#include "tscore/DiagsTypes.h"
+#include "tscore/SourceLocation.h"
+#include "tscore/LogMessage.h"
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/include/tscore/DiagsTypes.h b/include/tscore/DiagsTypes.h
index e7db4b6821..73a4760adf 100644
--- a/include/tscore/DiagsTypes.h
+++ b/include/tscore/DiagsTypes.h
@@ -34,13 +34,13 @@
#include <cstdarg>
#include <string>
#include <string_view>
-#include "BaseLogFile.h"
-#include "ContFlags.h"
-#include "ink_apidefs.h"
-#include "ink_inet.h"
-#include "ink_mutex.h"
-#include "Regex.h"
-#include "SourceLocation.h"
+#include "tscore/BaseLogFile.h"
+#include "tscore/ContFlags.h"
+#include "tscore/ink_apidefs.h"
+#include "tscore/ink_inet.h"
+#include "tscore/ink_mutex.h"
+#include "tscore/Regex.h"
+#include "tscore/SourceLocation.h"
#include "tscpp/util/ts_diag_levels.h"
diff --git a/include/tscore/Errata.h b/include/tscore/Errata.h
index 88734f790b..3db677d429 100644
--- a/include/tscore/Errata.h
+++ b/include/tscore/Errata.h
@@ -69,8 +69,8 @@
#include <sstream>
#include <deque>
#include <system_error>
-#include "NumericType.h"
-#include "IntrusivePtr.h"
+#include "tscore/NumericType.h"
+#include "tscore/IntrusivePtr.h"
namespace ts
{
diff --git a/include/tscore/LogMessage.h b/include/tscore/LogMessage.h
index 4877258944..59c4f3416d 100644
--- a/include/tscore/LogMessage.h
+++ b/include/tscore/LogMessage.h
@@ -23,9 +23,9 @@
#pragma once
-#include "DiagsTypes.h"
-#include "SourceLocation.h"
-#include "Throttler.h"
+#include "tscore/DiagsTypes.h"
+#include "tscore/SourceLocation.h"
+#include "tscore/Throttler.h"
#include <atomic>
#include <chrono>
diff --git a/include/tscore/Result.h b/include/tscore/Result.h
index 5436e42541..7f594c628c 100644
--- a/include/tscore/Result.h
+++ b/include/tscore/Result.h
@@ -23,7 +23,7 @@
#pragma once
-#include "TextBuffer.h"
+#include "tscore/TextBuffer.h"
#include <utility>
diff --git a/include/tscore/ink_platform.h b/include/tscore/ink_platform.h
index 97ade74d7f..9a91e7051f 100644
--- a/include/tscore/ink_platform.h
+++ b/include/tscore/ink_platform.h
@@ -137,7 +137,7 @@ struct ifafilt;
#include <stropts.h>
#endif
-#include "ink_endian.h"
+#include "tscore/ink_endian.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
diff --git a/include/tscpp/util/Bravo.h b/include/tscpp/util/Bravo.h
index a9155d3492..846ddd269c 100644
--- a/include/tscpp/util/Bravo.h
+++ b/include/tscpp/util/Bravo.h
@@ -37,7 +37,7 @@
#pragma once
-#include "DenseThreadId.h"
+#include "tscpp/util/DenseThreadId.h"
#include "tscore/Diags.h"
#include "tscore/ink_assert.h"
diff --git a/plugins/escalate/CMakeLists.txt b/plugins/escalate/CMakeLists.txt
index b0b4ada69f..986006477e 100644
--- a/plugins/escalate/CMakeLists.txt
+++ b/plugins/escalate/CMakeLists.txt
@@ -16,5 +16,3 @@
#######################
add_atsplugin(escalate escalate.cc)
-
-target_include_directories(escalate PRIVATE "${CMAKE_SOURCE_DIR}/include/ts")
diff --git a/plugins/experimental/access_control/unit_tests/CMakeLists.txt b/plugins/experimental/access_control/unit_tests/CMakeLists.txt
index 85602d973d..0e199a95f5 100644
--- a/plugins/experimental/access_control/unit_tests/CMakeLists.txt
+++ b/plugins/experimental/access_control/unit_tests/CMakeLists.txt
@@ -20,8 +20,6 @@ add_executable(
${PROJECT_SOURCE_DIR}/common.cc ${PROJECT_SOURCE_DIR}/utils.cc
)
-target_include_directories(test_access_control PRIVATE ${PROJECT_SOURCE_DIR})
-
target_link_libraries(test_access_control PRIVATE ts::tscore OpenSSL::SSL OpenSSL::Crypto catch2::catch2)
target_compile_definitions(test_access_control PRIVATE ACCESS_CONTROL_UNIT_TEST)
diff --git a/plugins/experimental/cookie_remap/CMakeLists.txt b/plugins/experimental/cookie_remap/CMakeLists.txt
index c6815a25df..117f444c2a 100644
--- a/plugins/experimental/cookie_remap/CMakeLists.txt
+++ b/plugins/experimental/cookie_remap/CMakeLists.txt
@@ -24,8 +24,6 @@ target_link_libraries(cookie_remap PRIVATE PCRE::PCRE yaml-cpp::yaml-cpp)
if(BUILD_TESTING)
add_executable(test_cookiejar test_cookiejar.cc strip.cc cookiejar.cc)
- target_include_directories(test_cookiejar PRIVATE "${PROJECT_SOURCE_DIR}")
-
target_link_libraries(test_cookiejar PRIVATE catch2::catch2)
add_test(NAME test_cookiejar COMMAND test_cookiejar)
diff --git a/plugins/experimental/fastcgi/src/ats_fastcgi.cc b/plugins/experimental/fastcgi/src/ats_fastcgi.cc
index a4050426fc..508bcb6f8f 100644
--- a/plugins/experimental/fastcgi/src/ats_fastcgi.cc
+++ b/plugins/experimental/fastcgi/src/ats_fastcgi.cc
@@ -28,7 +28,7 @@
#include "ts/ink_defs.h"
#include "ts/ts.h"
-#include "utils_internal.h"
+#include "../../../../src/tscpp/api/utils_internal.h"
#include "fcgi_config.h"
#include "server_intercept.h"
diff --git a/plugins/experimental/fastcgi/src/ats_fcgi_client.cc b/plugins/experimental/fastcgi/src/ats_fcgi_client.cc
index 23b02e7b0a..b5629e08d1 100644
--- a/plugins/experimental/fastcgi/src/ats_fcgi_client.cc
+++ b/plugins/experimental/fastcgi/src/ats_fcgi_client.cc
@@ -27,7 +27,7 @@
#include <ts/ts.h>
#include <map>
#include <iterator>
-#include "utils_internal.h"
+#include "../../../../src/tscpp/api/utils_internal.h"
#include <atscppapi/Headers.h>
#include <atscppapi/utils.h>
diff --git a/plugins/experimental/fastcgi/src/server_intercept.cc b/plugins/experimental/fastcgi/src/server_intercept.cc
index 4fa84ae34c..8ef6d58013 100644
--- a/plugins/experimental/fastcgi/src/server_intercept.cc
+++ b/plugins/experimental/fastcgi/src/server_intercept.cc
@@ -28,7 +28,7 @@
#include "atscppapi/HttpMethod.h"
#include "atscppapi/Transaction.h"
#include "atscppapi/TransactionPlugin.h"
-#include "utils_internal.h"
+#include "../../../../src/tscpp/api/utils_internal.h"
#include <atscppapi/Headers.h>
#include <atscppapi/utils.h>
diff --git a/plugins/experimental/fastcgi/src/server_intercept.h b/plugins/experimental/fastcgi/src/server_intercept.h
index d594e14e4d..c7767f7911 100644
--- a/plugins/experimental/fastcgi/src/server_intercept.h
+++ b/plugins/experimental/fastcgi/src/server_intercept.h
@@ -24,7 +24,7 @@
#include "atscppapi/TransactionPlugin.h"
#include "ts/ink_defs.h"
#include "ts/ts.h"
-#include "utils_internal.h"
+#include "../../../../src/tscpp/api/utils_internal.h"
#include <atscppapi/Headers.h>
#include <atscppapi/InterceptPlugin.h>
#include <atscppapi/utils.h>
diff --git a/plugins/experimental/memcache/tsmemcache.cc b/plugins/experimental/memcache/tsmemcache.cc
index 509d48ad45..c90e6f5078 100644
--- a/plugins/experimental/memcache/tsmemcache.cc
+++ b/plugins/experimental/memcache/tsmemcache.cc
@@ -22,8 +22,8 @@
*/
#include "tsmemcache.h"
-#include "NetVConnection.h"
-#include "NetProcessor.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/NetProcessor.h"
#include "tscore/ink_atomic.h"
/*
diff --git a/plugins/experimental/memcache/tsmemcache.h b/plugins/experimental/memcache/tsmemcache.h
index ee44570bb2..f6fa018c8e 100644
--- a/plugins/experimental/memcache/tsmemcache.h
+++ b/plugins/experimental/memcache/tsmemcache.h
@@ -23,9 +23,9 @@
#include <atomic>
-#include "EventSystem.h"
-#include "Net.h"
-#include "Cache.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Net.h"
+#include "iocore/cache/Cache.h"
#include "tscore/Version.h"
#include "ts/ts.h" // plugin header
diff --git a/plugins/libloader/CMakeLists.txt b/plugins/libloader/CMakeLists.txt
index 7bbe4c1092..fb657684f1 100644
--- a/plugins/libloader/CMakeLists.txt
+++ b/plugins/libloader/CMakeLists.txt
@@ -16,5 +16,3 @@
#######################
add_atsplugin(libloader libloader.cc)
-
-target_include_directories(libloader PRIVATE "${CMAKE_SOURCE_DIR}/include/ts")
diff --git a/plugins/lua/CMakeLists.txt b/plugins/lua/CMakeLists.txt
index 2f75ebb193..c1dc31aa8a 100644
--- a/plugins/lua/CMakeLists.txt
+++ b/plugins/lua/CMakeLists.txt
@@ -49,6 +49,4 @@ add_atsplugin(
ts_lua_constant.cc
)
-target_include_directories(tslua PRIVATE "${PROJECT_SOURCE_DIR}/include")
-
target_link_libraries(tslua PRIVATE LuaJIT::LuaJIT OpenSSL::Crypto)
diff --git a/plugins/multiplexer/CMakeLists.txt b/plugins/multiplexer/CMakeLists.txt
index 127498d61f..d8bf5f9921 100644
--- a/plugins/multiplexer/CMakeLists.txt
+++ b/plugins/multiplexer/CMakeLists.txt
@@ -26,6 +26,4 @@ add_atsplugin(
ts.cc
)
-target_include_directories(multiplexer PRIVATE "${CMAKE_SOURCE_DIR}/include/ts")
-
target_compile_definitions(multiplexer PRIVATE PLUGIN_TAG="multiplexer")
diff --git a/plugins/regex_revalidate/CMakeLists.txt b/plugins/regex_revalidate/CMakeLists.txt
index 67ae24b76f..122a35aad2 100644
--- a/plugins/regex_revalidate/CMakeLists.txt
+++ b/plugins/regex_revalidate/CMakeLists.txt
@@ -17,6 +17,4 @@
add_atsplugin(regex_revalidate regex_revalidate.cc)
-target_include_directories(regex_revalidate PRIVATE "${PROJECT_SOURCE_DIR}/include")
-
target_link_libraries(regex_revalidate PRIVATE PCRE::PCRE)
diff --git a/plugins/remap_purge/CMakeLists.txt b/plugins/remap_purge/CMakeLists.txt
index ae1fac4d8d..a864cd0eb4 100644
--- a/plugins/remap_purge/CMakeLists.txt
+++ b/plugins/remap_purge/CMakeLists.txt
@@ -16,5 +16,3 @@
#######################
add_atsplugin(remap_purge remap_purge.cc)
-
-target_include_directories(remap_purge PRIVATE "${PROJECT_SOURCE_DIR}/include")
diff --git a/plugins/server_push_preload/CMakeLists.txt b/plugins/server_push_preload/CMakeLists.txt
index 5bdf68437e..50c0271044 100644
--- a/plugins/server_push_preload/CMakeLists.txt
+++ b/plugins/server_push_preload/CMakeLists.txt
@@ -17,6 +17,4 @@
add_atsplugin(server_push_preload server_push_preload.cc)
-target_include_directories(server_push_preload PRIVATE "${PROJECT_SOURCE_DIR}/include")
-
target_link_libraries(server_push_preload PRIVATE ts::tscppapi)
diff --git a/plugins/slice/unit-tests/CMakeLists.txt b/plugins/slice/unit-tests/CMakeLists.txt
index dd1cfc3feb..280df9d299 100644
--- a/plugins/slice/unit-tests/CMakeLists.txt
+++ b/plugins/slice/unit-tests/CMakeLists.txt
@@ -17,18 +17,15 @@
add_executable(test_content_range test_content_range.cc ${PROJECT_SOURCE_DIR}/ContentRange.cc)
target_compile_definitions(test_content_range PRIVATE UNITTEST)
-target_include_directories(test_content_range PRIVATE ${PROJECT_SOURCE_DIR})
target_link_libraries(test_content_range PRIVATE catch2::catch2)
add_test(NAME test_content_range COMMAND test_content_range)
add_executable(test_range test_range.cc ${PROJECT_SOURCE_DIR}/Range.cc)
target_compile_definitions(test_range PRIVATE UNITTEST)
-target_include_directories(test_range PRIVATE ${PROJECT_SOURCE_DIR})
target_link_libraries(test_range PRIVATE catch2::catch2)
add_test(NAME test_range COMMAND test_range)
add_executable(test_config test_config.cc ${PROJECT_SOURCE_DIR}/Config.cc)
target_compile_definitions(test_config PRIVATE UNITTEST)
-target_include_directories(test_config PRIVATE ${PROJECT_SOURCE_DIR})
target_link_libraries(test_config PRIVATE PCRE::PCRE catch2::catch2)
add_test(NAME test_config COMMAND test_config)
diff --git a/plugins/stats_over_http/CMakeLists.txt b/plugins/stats_over_http/CMakeLists.txt
index 5f2be95054..ed4722db3b 100644
--- a/plugins/stats_over_http/CMakeLists.txt
+++ b/plugins/stats_over_http/CMakeLists.txt
@@ -17,8 +17,6 @@
add_atsplugin(stats_over_http stats_over_http.cc)
-target_include_directories(stats_over_http PRIVATE "${PROJECT_SOURCE_DIR}/include/")
-
target_link_libraries(stats_over_http PRIVATE libswoc)
if(HAVE_BROTLI_ENCODE_H)
diff --git a/plugins/tcpinfo/CMakeLists.txt b/plugins/tcpinfo/CMakeLists.txt
index 1bac388f1f..60a883b004 100644
--- a/plugins/tcpinfo/CMakeLists.txt
+++ b/plugins/tcpinfo/CMakeLists.txt
@@ -16,5 +16,3 @@
#######################
add_atsplugin(tcpinfo tcpinfo.cc)
-
-target_include_directories(tcpinfo PRIVATE "${PROJECT_SOURCE_DIR}/include")
diff --git a/src/api/APIHook.cc b/src/api/APIHook.cc
index acd0db0383..dcdb14e0aa 100644
--- a/src/api/APIHook.cc
+++ b/src/api/APIHook.cc
@@ -29,8 +29,8 @@
#include "tscore/ink_atomic.h"
// inkevent
-#include "Event.h"
-#include "Lock.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/Lock.h"
APIHook *
APIHook::next() const
diff --git a/src/api/APIHooks.cc b/src/api/APIHooks.cc
index a36729f4f7..9d08a6932d 100644
--- a/src/api/APIHooks.cc
+++ b/src/api/APIHooks.cc
@@ -26,8 +26,8 @@
#include "tscore/Allocator.h"
// inkevent
-#include "ProxyAllocator.h"
-#include "Thread.h"
+#include "iocore/eventsystem/ProxyAllocator.h"
+#include "iocore/eventsystem/Thread.h"
static ClassAllocator<APIHook> apiHookAllocator("apiHookAllocator");
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index c0814e2942..eb9daae79c 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -17,28 +17,16 @@
add_library(tsapi SHARED InkAPI.cc InkIOCoreAPI.cc)
add_library(ts::tsapi ALIAS tsapi)
-target_include_directories(
- tsapi
- PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>
- PRIVATE # private headers
- ${CMAKE_SOURCE_DIR}/src/iocore/eventsystem
- ${CMAKE_SOURCE_DIR}/src/iocore/net
- ${CMAKE_SOURCE_DIR}/src/iocore/dns
- ${CMAKE_SOURCE_DIR}/src/iocore/hostdb
- ${CMAKE_SOURCE_DIR}/src/iocore/cache
- ${CMAKE_SOURCE_DIR}/src/iocore/aio
- ${CMAKE_SOURCE_DIR}/src/proxy/
-)
set(TSAPI_PUBLIC_HEADERS
- ${PROJECT_SOURCE_DIR}/include/ts/ts.h
- ${PROJECT_SOURCE_DIR}/include/ts/remap.h
- ${PROJECT_SOURCE_DIR}/include/ts/DbgCtl.h
- ${PROJECT_SOURCE_DIR}/include/ts/TsException.h
- ${PROJECT_SOURCE_DIR}/include/ts/parentselectdefs.h
- ${PROJECT_SOURCE_DIR}/include/ts/parentselectdefs.h
- ${PROJECT_BINARY_DIR}/include/ts/apidefs.h
- ${PROJECT_SOURCE_DIR}/include/ts/experimental.h
+ ${PROJECT_SOURCE_DIR}/include/ts/ts.h
+ ${PROJECT_SOURCE_DIR}/include/ts/remap.h
+ ${PROJECT_SOURCE_DIR}/include/ts/DbgCtl.h
+ ${PROJECT_SOURCE_DIR}/include/ts/TsException.h
+ ${PROJECT_SOURCE_DIR}/include/ts/parentselectdefs.h
+ ${PROJECT_SOURCE_DIR}/include/ts/parentselectdefs.h
+ ${PROJECT_BINARY_DIR}/include/ts/apidefs.h
+ ${PROJECT_SOURCE_DIR}/include/ts/experimental.h
)
target_link_libraries(tsapi PRIVATE ts::tscore)
@@ -57,17 +45,9 @@ add_library(
DbgCtl.cc
)
add_library(ts::tsapicore ALIAS tsapicore)
-target_include_directories(
- tsapicore
- PRIVATE # private headers
- ${CMAKE_SOURCE_DIR}/src/iocore/eventsystem ${CMAKE_SOURCE_DIR}/src/iocore/net
- ${CMAKE_SOURCE_DIR}/src/iocore/dns ${CMAKE_SOURCE_DIR}/src/proxy/
-)
target_link_libraries(tsapicore PRIVATE ts::tscore)
set_target_properties(tsapicore PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-include_directories(${IOCORE_INCLUDE_DIRS} ${PROXY_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include/mgmt)
-
install(TARGETS tsapi PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ts)
if(APPLE)
@@ -78,7 +58,6 @@ if(BUILD_TESTING)
add_executable(test_Metrics test_Metrics.cc)
target_link_libraries(test_Metrics PRIVATE tsapicore tscore catch2::catch2)
- target_include_directories(test_Metrics PRIVATE ${CMAKE_SOURCE_DIR}/include)
add_test(NAME test_Metrics COMMAND $<TARGET_FILE:test_Metrics>)
endif()
diff --git a/src/api/FetchSM.cc b/src/api/FetchSM.cc
index 281e93c182..a34910a528 100644
--- a/src/api/FetchSM.cc
+++ b/src/api/FetchSM.cc
@@ -24,8 +24,8 @@
#include "tscore/ink_config.h"
#include "api/FetchSM.h"
#include <cstdio>
-#include "HTTP.h"
-#include "PluginVC.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/PluginVC.h"
#include "ts/ts.h" // Ugly, but we need a bunch of the public APIs here ... :-/
#define DEBUG_TAG "FetchSM"
diff --git a/src/api/InkAPI.cc b/src/api/InkAPI.cc
index 5172a82bab..aa6c9c6183 100644
--- a/src/api/InkAPI.cc
+++ b/src/api/InkAPI.cc
@@ -37,53 +37,53 @@
#include "api/Metrics.h"
#include "api/InkAPIInternal.h"
-#include "Log.h"
-#include "URL.h"
-#include "MIME.h"
-#include "HTTP.h"
-#include "ProxySession.h"
-#include "Http2ClientSession.h"
-#include "PoolableSession.h"
-#include "HttpAPIHooks.h"
-#include "HttpSM.h"
-#include "HttpConfig.h"
-#include "P_Net.h"
-#include "P_SSLNextProtocolAccept.h"
-#include "P_SSLNetVConnection.h"
-#include "P_UDPNet.h"
-#include "P_HostDB.h"
-#include "P_Cache.h"
+#include "proxy/logging/Log.h"
+#include "proxy/hdrs/URL.h"
+#include "proxy/hdrs/MIME.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/ProxySession.h"
+#include "proxy/http2/Http2ClientSession.h"
+#include "proxy/PoolableSession.h"
+#include "proxy/HttpAPIHooks.h"
+#include "proxy/http/HttpSM.h"
+#include "proxy/http/HttpConfig.h"
+#include "../iocore/net/P_Net.h"
+#include "../iocore/net/P_SSLNextProtocolAccept.h"
+#include "../iocore/net/P_SSLNetVConnection.h"
+#include "../iocore/net/P_UDPNet.h"
+#include "../iocore/hostdb/P_HostDB.h"
+#include "../iocore/cache/P_Cache.h"
#include "records/RecCore.h"
-#include "P_SSLConfig.h"
-#include "P_SSLClientUtils.h"
-#include "SSLAPIHooks.h"
-#include "SSLDiags.h"
-#include "SSLInternal.h"
-#include "TLSBasicSupport.h"
-#include "ConfigProcessor.h"
-#include "Plugin.h"
-#include "LogObject.h"
-#include "LogConfig.h"
-#include "PluginVC.h"
-#include "HttpSessionAccept.h"
-#include "PluginVC.h"
+#include "../iocore/net/P_SSLConfig.h"
+#include "../iocore/net/P_SSLClientUtils.h"
+#include "iocore/net/SSLAPIHooks.h"
+#include "iocore/net/SSLDiags.h"
+#include "iocore/net/SSLInternal.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
+#include "proxy/Plugin.h"
+#include "proxy/logging/LogObject.h"
+#include "proxy/logging/LogConfig.h"
+#include "proxy/PluginVC.h"
+#include "proxy/http/HttpSessionAccept.h"
+#include "proxy/PluginVC.h"
#include "api/FetchSM.h"
#include "api/LifecycleAPIHooks.h"
-#include "HttpDebugNames.h"
-#include "AIO.h"
-#include "Tasks.h"
+#include "proxy/http/HttpDebugNames.h"
+#include "iocore/aio/AIO.h"
+#include "iocore/eventsystem/Tasks.h"
-#include "P_OCSPStapling.h"
+#include "../iocore/net/P_OCSPStapling.h"
#include "records/RecordsConfig.h"
#include "records/RecDefs.h"
#include "records/RecCore.h"
#include "records/RecYAMLDecoder.h"
-#include "Machine.h"
-#include "HttpProxyServerMain.h"
+#include "iocore/utils/Machine.h"
+#include "proxy/http/HttpProxyServerMain.h"
#include "shared/overridable_txn_vars.h"
-#include "config/FileManager.h"
+#include "mgmt/config/FileManager.h"
-#include "rpc/jsonrpc/JsonRPC.h"
+#include "mgmt/rpc/jsonrpc/JsonRPC.h"
#include <swoc/bwf_base.h>
#include "ts/ts.h"
diff --git a/src/api/InkAPITest.cc b/src/api/InkAPITest.cc
index b99c428259..3ce15e8ca4 100644
--- a/src/api/InkAPITest.cc
+++ b/src/api/InkAPITest.cc
@@ -46,10 +46,10 @@
#include "ts/experimental.h"
#include "records/RecCore.h"
-#include "P_Net.h"
+#include "../iocore/net/P_Net.h"
#include "records/RecHttp.h"
-#include "http/HttpSM.h"
+#include "proxy/http/HttpSM.h"
#include "tscore/TestBox.h"
// This used to be in InkAPITestTool.cc, which we'd just #include here... But that seemed silly.
diff --git a/src/api/InkContInternal.cc b/src/api/InkContInternal.cc
index 760ab14e5a..09db6b86d8 100644
--- a/src/api/InkContInternal.cc
+++ b/src/api/InkContInternal.cc
@@ -30,15 +30,15 @@
#include "tscore/ink_atomic.h"
// http_remap
-#include "RemapPluginInfo.h"
+#include "proxy/http/remap/RemapPluginInfo.h"
// inkevent
-#include "Continuation.h"
-#include "EThread.h"
-#include "Event.h"
-#include "Lock.h"
-#include "ProxyAllocator.h"
-#include "VConnection.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/Lock.h"
+#include "iocore/eventsystem/ProxyAllocator.h"
+#include "iocore/eventsystem/VConnection.h"
ClassAllocator<INKContInternal> INKContAllocator("INKContAllocator");
diff --git a/src/api/InkIOCoreAPI.cc b/src/api/InkIOCoreAPI.cc
index 1cb70c09e8..7d918b3511 100644
--- a/src/api/InkIOCoreAPI.cc
+++ b/src/api/InkIOCoreAPI.cc
@@ -30,11 +30,11 @@
#include "tscore/ink_platform.h"
#include "ts/ts.h"
#include "ts/InkAPIPrivateIOCore.h"
-#include "EventSystem.h"
-#include "Net.h"
-#include "Cache.h"
-#include "HostDB.h"
-#include "P_UnixUDPConnection.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Net.h"
+#include "iocore/cache/Cache.h"
+#include "iocore/hostdb/HostDB.h"
+#include "../iocore/net/P_UnixUDPConnection.h"
// This assert is for internal API use only.
#if TS_USE_FAST_SDK
diff --git a/src/cripts/CMakeLists.txt b/src/cripts/CMakeLists.txt
index 648080e09d..52fd650a6e 100644
--- a/src/cripts/CMakeLists.txt
+++ b/src/cripts/CMakeLists.txt
@@ -29,10 +29,6 @@ add_library(cripts SHARED ${CPP_FILES})
add_library(ts::cripts ALIAS cripts)
target_link_libraries(cripts libswoc fmt::fmt PkgConfig::PCRE2)
-target_include_directories(
- cripts PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/proxy ${PROJECT_SOURCE_DIR}/iocore
- ${PROJECT_SOURCE_DIR}/iocore/eventsystem
-)
set_target_properties(
cripts
diff --git a/src/iocore/CMakeLists.txt b/src/iocore/CMakeLists.txt
index 09a53e2e84..f79a284815 100644
--- a/src/iocore/CMakeLists.txt
+++ b/src/iocore/CMakeLists.txt
@@ -25,15 +25,3 @@ add_subdirectory(dns)
add_subdirectory(hostdb)
add_subdirectory(utils)
add_subdirectory(cache)
-
-set(IOCORE_INCLUDE_DIRS
- ${CMAKE_SOURCE_DIR}/include/iocore/eventsystem
- ${CMAKE_SOURCE_DIR}/include/iocore/dns
- ${CMAKE_SOURCE_DIR}/include/iocore/io_uring
- ${CMAKE_SOURCE_DIR}/include/iocore/aio
- ${CMAKE_SOURCE_DIR}/include/iocore/net
- ${CMAKE_SOURCE_DIR}/include/iocore/cache
- ${CMAKE_SOURCE_DIR}/include/iocore/hostdb
- ${CMAKE_SOURCE_DIR}/include/iocore/utils
- PARENT_SCOPE
-)
diff --git a/src/iocore/aio/AIO.cc b/src/iocore/aio/AIO.cc
index 356e17cca8..2b517f7d7a 100644
--- a/src/iocore/aio/AIO.cc
+++ b/src/iocore/aio/AIO.cc
@@ -33,7 +33,7 @@
#include "P_AIO.h"
#ifdef AIO_FAULT_INJECTION
-#include "AIO_fault_injection.h"
+#include "iocore/aio/AIO_fault_injection.h"
#endif
#define MAX_DISKS_POSSIBLE 100
@@ -473,7 +473,7 @@ AIOThreadInfo::aio_thread_main(AIOThreadInfo *thr_info)
}
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
namespace
{
diff --git a/src/iocore/aio/AIO_fault_injection.cc b/src/iocore/aio/AIO_fault_injection.cc
index e6b3556a89..582df58cfc 100644
--- a/src/iocore/aio/AIO_fault_injection.cc
+++ b/src/iocore/aio/AIO_fault_injection.cc
@@ -21,8 +21,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "AIO_fault_injection.h"
-#include "Lock.h"
+#include "iocore/aio/AIO_fault_injection.h"
+#include "iocore/eventsystem/Lock.h"
#include <mutex>
AIOFaultInjection aioFaultInjection;
diff --git a/src/iocore/aio/CMakeLists.txt b/src/iocore/aio/CMakeLists.txt
index 5922b22822..fbcdeadd0d 100644
--- a/src/iocore/aio/CMakeLists.txt
+++ b/src/iocore/aio/CMakeLists.txt
@@ -20,12 +20,6 @@ add_library(ts::aio ALIAS aio)
target_sources(aio PRIVATE AIO.cc Inline.cc AIO_fault_injection.cc)
-target_include_directories(
- aio
- PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/aio
- PRIVATE ${CMAKE_SOURCE_DIR}/include/iocore/io_uring ${CMAKE_SOURCE_DIR}/include/iocore/eventsystem
-)
-
target_link_libraries(aio PUBLIC ts::inkevent ts::tscore)
if(TS_USE_LINUX_IO_URING)
target_link_libraries(aio PUBLIC ts::inkuring)
diff --git a/src/iocore/aio/P_AIO.h b/src/iocore/aio/P_AIO.h
index da403e6761..22336a85a5 100644
--- a/src/iocore/aio/P_AIO.h
+++ b/src/iocore/aio/P_AIO.h
@@ -30,11 +30,11 @@
****************************************************************************/
#pragma once
-#include "P_EventSystem.h"
-#include "AIO.h"
+#include "../eventsystem/P_EventSystem.h"
+#include "iocore/aio/AIO.h"
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#endif
#include "api/Metrics.h"
diff --git a/src/iocore/aio/test_AIO.cc b/src/iocore/aio/test_AIO.cc
index 0f1f9a4864..cc2dac542a 100644
--- a/src/iocore/aio/test_AIO.cc
+++ b/src/iocore/aio/test_AIO.cc
@@ -33,7 +33,7 @@
using std::cout;
using std::endl;
-#include "diags.i"
+#include "iocore/utils/diags.i"
#define MAX_DISK_THREADS 200
#ifdef DISK_ALIGN
diff --git a/src/iocore/cache/CMakeLists.txt b/src/iocore/cache/CMakeLists.txt
index a51803fa8e..362d870434 100644
--- a/src/iocore/cache/CMakeLists.txt
+++ b/src/iocore/cache/CMakeLists.txt
@@ -42,24 +42,7 @@ if(BUILD_REGRESSION_TESTING)
target_link_libraries(inkcache PRIVATE ts::proxy)
endif()
-target_include_directories(
- inkcache
- PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/cache
- PRIVATE ${CMAKE_SOURCE_DIR}/include/iocore/io_uring
- ${CMAKE_SOURCE_DIR}/include/iocore/dns
- ${CMAKE_SOURCE_DIR}/include/iocore/net
- ${CMAKE_SOURCE_DIR}/include/iocore/hostdb
- ${CMAKE_SOURCE_DIR}/include/proxy/http
- ${CMAKE_SOURCE_DIR}/include/proxy/http/remap
- ${CMAKE_SOURCE_DIR}/include/proxy/hdrs
- ${CMAKE_SOURCE_DIR}/lib
- # private headers
- ${CMAKE_SOURCE_DIR}/src/iocore/cache
- ${CMAKE_SOURCE_DIR}/src/iocore/aio
- ${CMAKE_SOURCE_DIR}/src/iocore/net
- ${CMAKE_SOURCE_DIR}/src/iocore/dns
- ${CMAKE_SOURCE_DIR}/src/proxy
-)
+target_include_directories(inkcache PRIVATE ${CMAKE_SOURCE_DIR}/lib)
target_link_libraries(
inkcache
diff --git a/src/iocore/cache/Cache.cc b/src/iocore/cache/Cache.cc
index a413eb1c2e..d55150f858 100644
--- a/src/iocore/cache/Cache.cc
+++ b/src/iocore/cache/Cache.cc
@@ -21,18 +21,18 @@
limitations under the License.
*/
-#include "Cache.h"
+#include "iocore/cache/Cache.h"
// Cache Inspector and State Pages
#include "P_CacheTest.h"
-#include "StatPages.h"
+#include "proxy/StatPages.h"
#include "tscore/Filenames.h"
-#include "records/P_RecProcess.h"
+#include "../../records/P_RecProcess.h"
#ifdef AIO_FAULT_INJECTION
-#include "AIO_fault_injection.h"
+#include "iocore/aio/AIO_fault_injection.h"
#endif
#include <atomic>
diff --git a/src/iocore/cache/CacheEvacuateDocVC.cc b/src/iocore/cache/CacheEvacuateDocVC.cc
index 3289c81f98..dfc7b1e6c7 100644
--- a/src/iocore/cache/CacheEvacuateDocVC.cc
+++ b/src/iocore/cache/CacheEvacuateDocVC.cc
@@ -25,18 +25,18 @@
#include "P_Cache.h"
// inkcache
-#include "CacheEvacuateDocVC.h"
-#include "CacheDefs.h"
+#include "iocore/cache/CacheEvacuateDocVC.h"
+#include "iocore/cache/CacheDefs.h"
#include "P_CacheDir.h"
#include "P_CacheHttp.h"
#include "P_CacheInternal.h"
#include "P_CacheVol.h"
// aio
-#include "AIO.h"
+#include "iocore/aio/AIO.h"
// inkevent
-#include "EThread.h"
+#include "iocore/eventsystem/EThread.h"
// tscore
#include "tscore/Diags.h"
diff --git a/src/iocore/cache/CachePages.cc b/src/iocore/cache/CachePages.cc
index 5f84a92839..10e1367167 100644
--- a/src/iocore/cache/CachePages.cc
+++ b/src/iocore/cache/CachePages.cc
@@ -23,9 +23,9 @@
#include "P_Cache.h"
-#include "Show.h"
-#include "Tasks.h"
-#include "CacheControl.h"
+#include "proxy/Show.h"
+#include "iocore/eventsystem/Tasks.h"
+#include "proxy/CacheControl.h"
namespace
{
diff --git a/src/iocore/cache/CachePagesInternal.cc b/src/iocore/cache/CachePagesInternal.cc
index 5907ac70cf..63d6a8b7b8 100644
--- a/src/iocore/cache/CachePagesInternal.cc
+++ b/src/iocore/cache/CachePagesInternal.cc
@@ -23,8 +23,8 @@
#include "P_Cache.h"
-#include "Show.h"
-#include "Tasks.h"
+#include "proxy/Show.h"
+#include "iocore/eventsystem/Tasks.h"
struct ShowCacheInternal : public ShowCont {
int vol_index = 0;
diff --git a/src/iocore/cache/CacheRead.cc b/src/iocore/cache/CacheRead.cc
index 2201ecb39e..2d29891d07 100644
--- a/src/iocore/cache/CacheRead.cc
+++ b/src/iocore/cache/CacheRead.cc
@@ -23,7 +23,7 @@
#include "P_Cache.h"
-#include "HttpCacheSM.h" //Added to get the scope of HttpCacheSM object.
+#include "proxy/http/HttpCacheSM.h" //Added to get the scope of HttpCacheSM object.
namespace
{
diff --git a/src/iocore/cache/CacheVC.cc b/src/iocore/cache/CacheVC.cc
index 4552389a7c..36d609038b 100644
--- a/src/iocore/cache/CacheVC.cc
+++ b/src/iocore/cache/CacheVC.cc
@@ -21,22 +21,22 @@
limitations under the License.
*/
-#include "Cache.h"
-#include "CacheDefs.h"
+#include "iocore/cache/Cache.h"
+#include "iocore/cache/CacheDefs.h"
#include "P_CacheDisk.h"
#include "P_CacheHttp.h"
#include "P_CacheInternal.h"
#include "P_CacheVol.h"
// must be included after the others
-#include "CacheVC.h"
+#include "iocore/cache/CacheVC.h"
// hdrs
-#include "HTTP.h"
-#include "MIME.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/MIME.h"
// aio
-#include "AIO.h"
+#include "iocore/aio/AIO.h"
// tsapi
#if DEBUG
@@ -44,12 +44,12 @@
#endif
// inkevent
-#include "Continuation.h"
-#include "EThread.h"
-#include "Event.h"
-#include "IOBuffer.h"
-#include "Lock.h"
-#include "VIO.h"
+#include "iocore/eventsystem/Continuation.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/eventsystem/Event.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/eventsystem/Lock.h"
+#include "iocore/eventsystem/VIO.h"
// tscppapi
#include "tscpp/api/HttpStatus.h"
diff --git a/src/iocore/cache/CacheWrite.cc b/src/iocore/cache/CacheWrite.cc
index 683fc3a1cb..7ce268bbf4 100644
--- a/src/iocore/cache/CacheWrite.cc
+++ b/src/iocore/cache/CacheWrite.cc
@@ -22,7 +22,7 @@
*/
#include "P_Cache.h"
-#include "CacheEvacuateDocVC.h"
+#include "iocore/cache/CacheEvacuateDocVC.h"
#define UINT_WRAP_LTE(_x, _y) (((_y) - (_x)) < INT_MAX) // exploit overflow
#define UINT_WRAP_GTE(_x, _y) (((_x) - (_y)) < INT_MAX) // exploit overflow
diff --git a/src/iocore/cache/HttpTransactCache.cc b/src/iocore/cache/HttpTransactCache.cc
index 4ceb7490f4..dce3c1b8b1 100644
--- a/src/iocore/cache/HttpTransactCache.cc
+++ b/src/iocore/cache/HttpTransactCache.cc
@@ -25,12 +25,12 @@
#include "tscore/ink_platform.h"
-#include "HttpTransact.h"
-#include "HttpTransactHeaders.h"
-#include "HttpTransactCache.h"
+#include "proxy/http/HttpTransact.h"
+#include "proxy/http/HttpTransactHeaders.h"
+#include "iocore/cache/HttpTransactCache.h"
#include <ctime>
-#include "HTTP.h"
-#include "HttpCompat.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/HttpCompat.h"
#include "tscore/InkErrno.h"
diff --git a/src/iocore/cache/P_Cache.h b/src/iocore/cache/P_Cache.h
index eda81ba69e..8a64009a96 100644
--- a/src/iocore/cache/P_Cache.h
+++ b/src/iocore/cache/P_Cache.h
@@ -24,14 +24,14 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "P_EventSystem.h"
-#include "P_AIO.h"
+#include "../eventsystem/P_EventSystem.h"
+#include "../aio/P_AIO.h"
-#include "HTTP.h"
-#include "MIME.h"
-#include "HttpTransactCache.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/MIME.h"
+#include "iocore/cache/HttpTransactCache.h"
-#include "Cache.h"
+#include "iocore/cache/Cache.h"
#include "P_CacheStats.h"
#include "P_CacheDisk.h"
#include "P_CacheDir.h"
diff --git a/src/iocore/cache/P_CacheDir.h b/src/iocore/cache/P_CacheDir.h
index 27b5068728..d1e07e72cb 100644
--- a/src/iocore/cache/P_CacheDir.h
+++ b/src/iocore/cache/P_CacheDir.h
@@ -23,13 +23,13 @@
#pragma once
-#include "CacheDefs.h"
+#include "iocore/cache/CacheDefs.h"
#include "P_CacheHttp.h"
-#include "EventSystem.h"
-#include "Continuation.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/eventsystem/Continuation.h"
// aio
-#include "AIO.h"
+#include "iocore/aio/AIO.h"
struct Vol;
struct InterimCacheVol;
diff --git a/src/iocore/cache/P_CacheDisk.h b/src/iocore/cache/P_CacheDisk.h
index ad809f058f..3545849e99 100644
--- a/src/iocore/cache/P_CacheDisk.h
+++ b/src/iocore/cache/P_CacheDisk.h
@@ -23,9 +23,9 @@
#pragma once
-#include "Cache.h"
+#include "iocore/cache/Cache.h"
-#include "P_AIO.h"
+#include "../aio/P_AIO.h"
extern int cache_config_max_disk_errors;
diff --git a/src/iocore/cache/P_CacheHttp.h b/src/iocore/cache/P_CacheHttp.h
index 55234ec06e..d9ac143630 100644
--- a/src/iocore/cache/P_CacheHttp.h
+++ b/src/iocore/cache/P_CacheHttp.h
@@ -24,8 +24,8 @@
#pragma once
#include "P_CacheArray.h"
-#include "HTTP.h"
-#include "URL.h"
+#include "proxy/hdrs/HTTP.h"
+#include "proxy/hdrs/URL.h"
using CacheURL = URL;
using CacheHTTPHdr = HTTPHdr;
diff --git a/src/iocore/cache/P_CacheInternal.h b/src/iocore/cache/P_CacheInternal.h
index 5378b71739..109e9a31d7 100644
--- a/src/iocore/cache/P_CacheInternal.h
+++ b/src/iocore/cache/P_CacheInternal.h
@@ -26,13 +26,13 @@
#include "tscore/ink_platform.h"
#include "tscore/InkErrno.h"
-#include "HTTP.h"
+#include "proxy/hdrs/HTTP.h"
#include "P_CacheHttp.h"
#include "P_CacheHosting.h"
#include "api/Metrics.h"
-#include "CacheVC.h"
-#include "CacheEvacuateDocVC.h"
+#include "iocore/cache/CacheVC.h"
+#include "iocore/cache/CacheEvacuateDocVC.h"
using ts::Metrics;
diff --git a/src/iocore/cache/P_CacheTest.h b/src/iocore/cache/P_CacheTest.h
index da73dfda00..07759b2817 100644
--- a/src/iocore/cache/P_CacheTest.h
+++ b/src/iocore/cache/P_CacheTest.h
@@ -24,7 +24,7 @@
#pragma once
#include "P_Cache.h"
-#include "RegressionSM.h"
+#include "proxy/RegressionSM.h"
#define MAX_HOSTS_POSSIBLE 256
#define PINNED_DOC_TABLE_SIZE 16
diff --git a/src/iocore/cache/P_RamCache.h b/src/iocore/cache/P_RamCache.h
index 02ead95f88..d3b28b1886 100644
--- a/src/iocore/cache/P_RamCache.h
+++ b/src/iocore/cache/P_RamCache.h
@@ -23,7 +23,7 @@
#pragma once
-#include "Cache.h"
+#include "iocore/cache/Cache.h"
// Generic Ram Cache interface
diff --git a/src/iocore/cache/RamCacheCLFUS.cc b/src/iocore/cache/RamCacheCLFUS.cc
index 6d76a2ca7d..b737cbbefb 100644
--- a/src/iocore/cache/RamCacheCLFUS.cc
+++ b/src/iocore/cache/RamCacheCLFUS.cc
@@ -25,7 +25,7 @@
// See https://cwiki.apache.org/confluence/display/TS/RamCache
#include "P_Cache.h"
-#include "Tasks.h"
+#include "iocore/eventsystem/Tasks.h"
#include "fastlz/fastlz.h"
#include <zlib.h>
#ifdef HAVE_LZMA_H
diff --git a/src/iocore/cache/Vol.cc b/src/iocore/cache/Vol.cc
index 3292e95d8b..a9be4b2323 100644
--- a/src/iocore/cache/Vol.cc
+++ b/src/iocore/cache/Vol.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Cache.h"
+#include "iocore/cache/Cache.h"
#include "P_CacheDisk.h"
#include "P_CacheInternal.h"
#include "P_CacheVol.h"
diff --git a/src/iocore/cache/unit_tests/CacheTestHandler.cc b/src/iocore/cache/unit_tests/CacheTestHandler.cc
index 06e4a388bf..f3b9b1470f 100644
--- a/src/iocore/cache/unit_tests/CacheTestHandler.cc
+++ b/src/iocore/cache/unit_tests/CacheTestHandler.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "CacheDefs.h"
+#include "iocore/cache/CacheDefs.h"
#include "main.h"
#include "CacheTestHandler.h"
diff --git a/src/iocore/cache/unit_tests/main.cc b/src/iocore/cache/unit_tests/main.cc
index 740fb53e13..6b8cf62fa1 100644
--- a/src/iocore/cache/unit_tests/main.cc
+++ b/src/iocore/cache/unit_tests/main.cc
@@ -23,8 +23,8 @@
#include "tscore/ink_config.h"
#include <string_view>
-#include "HttpAPIHooks.h"
-#include "SSLAPIHooks.h"
+#include "proxy/HttpAPIHooks.h"
+#include "iocore/net/SSLAPIHooks.h"
#define CATCH_CONFIG_MAIN
#include "main.h"
diff --git a/src/iocore/cache/unit_tests/main.h b/src/iocore/cache/unit_tests/main.h
index 104f092b9e..4ff70ccd5a 100644
--- a/src/iocore/cache/unit_tests/main.h
+++ b/src/iocore/cache/unit_tests/main.h
@@ -33,11 +33,11 @@
#include "records/RecordsConfig.h"
#include "records/RecProcess.h"
-#include "P_AIO.h"
-#include "P_CacheDisk.h"
-#include "P_Net.h"
+#include "../../aio/P_AIO.h"
+#include "../P_CacheDisk.h"
+#include "../../net/P_Net.h"
#include "CacheTestHandler.h"
-#include "P_Cache.h"
+#include "../P_Cache.h"
#include <queue>
diff --git a/src/iocore/cache/unit_tests/stub.cc b/src/iocore/cache/unit_tests/stub.cc
index 35d5ac1507..57a95f9313 100644
--- a/src/iocore/cache/unit_tests/stub.cc
+++ b/src/iocore/cache/unit_tests/stub.cc
@@ -21,11 +21,11 @@
limitations under the License.
*/
-#include "SSLAPIHooks.h"
+#include "iocore/net/SSLAPIHooks.h"
#include "api/InkAPIInternal.h"
-#include "HttpAPIHooks.h"
+#include "proxy/HttpAPIHooks.h"
#include "tscore/Version.h"
diff --git a/src/iocore/cache/unit_tests/test_CacheDir.cc b/src/iocore/cache/unit_tests/test_CacheDir.cc
index aa3660ab15..7ecf682dcd 100644
--- a/src/iocore/cache/unit_tests/test_CacheDir.cc
+++ b/src/iocore/cache/unit_tests/test_CacheDir.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "Event.h"
+#include "iocore/eventsystem/Event.h"
#include "main.h"
-#include "P_CacheDir.h"
+#include "../P_CacheDir.h"
#include "tscore/Random.h"
diff --git a/src/iocore/cache/unit_tests/test_CacheVol.cc b/src/iocore/cache/unit_tests/test_CacheVol.cc
index b85cdd081f..e07339c679 100644
--- a/src/iocore/cache/unit_tests/test_CacheVol.cc
+++ b/src/iocore/cache/unit_tests/test_CacheVol.cc
@@ -23,8 +23,8 @@
#include "main.h"
-#include "P_Cache.h"
-#include "P_CacheHosting.h"
+#include "../P_Cache.h"
+#include "../P_CacheHosting.h"
#include "tscore/Diags.h"
#include "tscpp/util/PostScript.h"
diff --git a/src/iocore/cache/unit_tests/test_Disk_Failure.cc b/src/iocore/cache/unit_tests/test_Disk_Failure.cc
index 94a2f92d63..a8c99b12f6 100644
--- a/src/iocore/cache/unit_tests/test_Disk_Failure.cc
+++ b/src/iocore/cache/unit_tests/test_Disk_Failure.cc
@@ -29,7 +29,7 @@
#ifndef AIO_FAULT_INJECTION
#error Must define AIO_FAULT_INJECTION!
#endif
-#include "AIO_fault_injection.h"
+#include "iocore/aio/AIO_fault_injection.h"
int cache_vols = 1;
bool reuse_existing_cache = false;
diff --git a/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc b/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc
index f10b73f617..31c3120d1d 100644
--- a/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc
+++ b/src/iocore/cache/unit_tests/test_Disk_Init_Failure.cc
@@ -29,7 +29,7 @@
#ifndef AIO_FAULT_INJECTION
#error Must define AIO_FAULT_INJECTION!
#endif
-#include "AIO_fault_injection.h"
+#include "iocore/aio/AIO_fault_injection.h"
int cache_vols = 2;
bool reuse_existing_cache = false;
diff --git a/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc b/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
index 3cea4c92b8..03bd3938f8 100644
--- a/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
+++ b/src/iocore/cache/unit_tests/test_Populated_Cache_Disk_Failure.cc
@@ -31,7 +31,7 @@ bool reuse_existing_cache = true;
#ifndef AIO_FAULT_INJECTION
#error Must define AIO_FAULT_INJECTION!
#endif
-#include "AIO_fault_injection.h"
+#include "iocore/aio/AIO_fault_injection.h"
class CacheCommInit : public CacheInit
{
diff --git a/src/iocore/dns/CMakeLists.txt b/src/iocore/dns/CMakeLists.txt
index 58401f8a8f..5f51b23a48 100644
--- a/src/iocore/dns/CMakeLists.txt
+++ b/src/iocore/dns/CMakeLists.txt
@@ -18,17 +18,4 @@
add_library(inkdns STATIC DNS.cc DNSConnection.cc DNSEventIO.cc Inline.cc SplitDNS.cc)
add_library(ts::inkdns ALIAS inkdns)
-target_include_directories(
- inkdns
- PRIVATE ${CMAKE_SOURCE_DIR}/include/iocore/dns
- ${CMAKE_SOURCE_DIR}/include/iocore/io_uring
- ${CMAKE_SOURCE_DIR}/include/iocore/net
- ${CMAKE_SOURCE_DIR}/include/iocore/eventsystem
- ${CMAKE_SOURCE_DIR}/include/proxy/http
- ${CMAKE_SOURCE_DIR}/include/proxy/hdrs
- # iocore/net private header
- ${CMAKE_SOURCE_DIR}/src/iocore/net
- ${CMAKE_SOURCE_DIR}/src/iocore/dns
-)
-
target_link_libraries(inkdns PUBLIC ts::inkevent ts::inkhostdb ts::proxy ts::tscore)
diff --git a/src/iocore/dns/DNS.cc b/src/iocore/dns/DNS.cc
index ac3b49053c..b1bf81d0ac 100644
--- a/src/iocore/dns/DNS.cc
+++ b/src/iocore/dns/DNS.cc
@@ -24,7 +24,7 @@
#include "P_DNS.h"
#include "tscore/ink_inet.h"
-#include "SplitDNS.h"
+#include "iocore/dns/SplitDNS.h"
#define SRV_COST (RRFIXEDSZ + 0)
#define SRV_WEIGHT (RRFIXEDSZ + 2)
diff --git a/src/iocore/dns/DNSEventIO.cc b/src/iocore/dns/DNSEventIO.cc
index 479aa83992..d0debe8f78 100644
--- a/src/iocore/dns/DNSEventIO.cc
+++ b/src/iocore/dns/DNSEventIO.cc
@@ -18,7 +18,7 @@
limitations under the License.
*/
-#include "DNSEventIO.h"
+#include "iocore/dns/DNSEventIO.h"
#include "P_DNSConnection.h"
int
diff --git a/src/iocore/dns/P_DNS.h b/src/iocore/dns/P_DNS.h
index fb58fe4a4e..0826f63815 100644
--- a/src/iocore/dns/P_DNS.h
+++ b/src/iocore/dns/P_DNS.h
@@ -30,9 +30,9 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "DNS.h"
-#include "P_EventSystem.h"
-#include "P_Net.h"
+#include "iocore/dns/DNS.h"
+#include "../eventsystem/P_EventSystem.h"
+#include "../net/P_Net.h"
#include "P_DNSConnection.h"
#include "P_DNSProcessor.h"
-#include "SRV.h"
+#include "iocore/dns/SRV.h"
diff --git a/src/iocore/dns/P_DNSConnection.h b/src/iocore/dns/P_DNSConnection.h
index 8c2b2825ea..800711883b 100644
--- a/src/iocore/dns/P_DNSConnection.h
+++ b/src/iocore/dns/P_DNSConnection.h
@@ -30,8 +30,8 @@
#pragma once
-#include "DNSEventIO.h"
-#include "DNSProcessor.h"
+#include "iocore/dns/DNSEventIO.h"
+#include "iocore/dns/DNSProcessor.h"
//
// Connection
diff --git a/src/iocore/dns/P_DNSProcessor.h b/src/iocore/dns/P_DNSProcessor.h
index a895134086..0427f83f04 100644
--- a/src/iocore/dns/P_DNSProcessor.h
+++ b/src/iocore/dns/P_DNSProcessor.h
@@ -23,7 +23,7 @@
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/PendingAction.h"
#include "api/Metrics.h"
diff --git a/src/iocore/dns/P_SplitDNS.h b/src/iocore/dns/P_SplitDNS.h
index a9c6ee6e6a..1fed5f2981 100644
--- a/src/iocore/dns/P_SplitDNS.h
+++ b/src/iocore/dns/P_SplitDNS.h
@@ -31,10 +31,10 @@
#pragma once
#include "P_DNS.h"
-#include "SplitDNS.h"
-#include "Lock.h"
-#include "ControlBase.h"
-#include "ControlMatcher.h"
+#include "iocore/dns/SplitDNS.h"
+#include "iocore/eventsystem/Lock.h"
+#include "proxy/ControlBase.h"
+#include "proxy/ControlMatcher.h"
#include "P_SplitDNSProcessor.h"
static constexpr ts::ModuleVersion SPLITDNS_MODULE_INTERNAL_VERSION{SPLITDNS_MODULE_PUBLIC_VERSION, ts::ModuleVersion::PRIVATE};
diff --git a/src/iocore/dns/P_SplitDNSProcessor.h b/src/iocore/dns/P_SplitDNSProcessor.h
index f8832e963e..5a3888a900 100644
--- a/src/iocore/dns/P_SplitDNSProcessor.h
+++ b/src/iocore/dns/P_SplitDNSProcessor.h
@@ -30,9 +30,9 @@
#pragma once
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
-#include "ControlMatcher.h"
+#include "proxy/ControlMatcher.h"
#include "tscore/HostLookup.h"
/* ---------------------------
diff --git a/src/iocore/dns/test_I_DNS.cc b/src/iocore/dns/test_I_DNS.cc
index 9ff1648ef5..4b3712b76e 100644
--- a/src/iocore/dns/test_I_DNS.cc
+++ b/src/iocore/dns/test_I_DNS.cc
@@ -22,9 +22,9 @@
*/
#include <stdio.h>
-#include "DNS.h"
+#include "iocore/dns/DNS.h"
-#include "diags.i"
+#include "iocore/utils/diags.i"
int
main()
diff --git a/src/iocore/eventsystem/CMakeLists.txt b/src/iocore/eventsystem/CMakeLists.txt
index 380530f37c..25a7d870d6 100644
--- a/src/iocore/eventsystem/CMakeLists.txt
+++ b/src/iocore/eventsystem/CMakeLists.txt
@@ -38,10 +38,6 @@ add_library(
)
add_library(ts::inkevent ALIAS inkevent)
-target_include_directories(
- inkevent PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/include/iocore/eventsystem"
-)
-
target_link_libraries(
inkevent
PUBLIC ts::records ts::tscore
diff --git a/src/iocore/eventsystem/ConfigProcessor.cc b/src/iocore/eventsystem/ConfigProcessor.cc
index 4bf072c949..d33cf36b8d 100644
--- a/src/iocore/eventsystem/ConfigProcessor.cc
+++ b/src/iocore/eventsystem/ConfigProcessor.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
#include "P_EventSystem.h"
#if TS_HAS_TESTS
#include "tscore/TestBox.h"
diff --git a/src/iocore/eventsystem/MIOBufferWriter.cc b/src/iocore/eventsystem/MIOBufferWriter.cc
index 4ccd7fc7f2..dce2dd4a3c 100644
--- a/src/iocore/eventsystem/MIOBufferWriter.cc
+++ b/src/iocore/eventsystem/MIOBufferWriter.cc
@@ -26,7 +26,7 @@
**************************************************************************/
-#include "MIOBufferWriter.h"
+#include "iocore/eventsystem/MIOBufferWriter.h"
//
// MIOBufferWriter
diff --git a/src/iocore/eventsystem/P_EventSystem.h b/src/iocore/eventsystem/P_EventSystem.h
index 2a0007af2e..d1bb98f228 100644
--- a/src/iocore/eventsystem/P_EventSystem.h
+++ b/src/iocore/eventsystem/P_EventSystem.h
@@ -33,7 +33,7 @@
#include "tscore/ink_platform.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "P_Thread.h"
#include "P_VIO.h"
diff --git a/src/iocore/eventsystem/P_Freer.h b/src/iocore/eventsystem/P_Freer.h
index 89b40cfaca..82af7ebe62 100644
--- a/src/iocore/eventsystem/P_Freer.h
+++ b/src/iocore/eventsystem/P_Freer.h
@@ -24,7 +24,7 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "Tasks.h"
+#include "iocore/eventsystem/Tasks.h"
// Note that these should not be used for memory that wishes to retain
// NUMA socket affinity. We'll potentially return these on an arbitrarily
diff --git a/src/iocore/eventsystem/P_ProtectedQueue.h b/src/iocore/eventsystem/P_ProtectedQueue.h
index 2f09629460..80c72ddb75 100644
--- a/src/iocore/eventsystem/P_ProtectedQueue.h
+++ b/src/iocore/eventsystem/P_ProtectedQueue.h
@@ -29,7 +29,7 @@
****************************************************************************/
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
TS_INLINE
ProtectedQueue::ProtectedQueue()
diff --git a/src/iocore/eventsystem/P_Thread.h b/src/iocore/eventsystem/P_Thread.h
index 40fb9e69a7..c4c1e07e71 100644
--- a/src/iocore/eventsystem/P_Thread.h
+++ b/src/iocore/eventsystem/P_Thread.h
@@ -30,7 +30,7 @@
****************************************************************************/
#pragma once
-#include "Thread.h"
+#include "iocore/eventsystem/Thread.h"
///////////////////////////////////////////////
// Common Interface impl //
diff --git a/src/iocore/eventsystem/P_UnixEThread.h b/src/iocore/eventsystem/P_UnixEThread.h
index c739105805..81568ef966 100644
--- a/src/iocore/eventsystem/P_UnixEThread.h
+++ b/src/iocore/eventsystem/P_UnixEThread.h
@@ -30,8 +30,8 @@
*****************************************************************************/
#pragma once
-#include "EThread.h"
-#include "EventProcessor.h"
+#include "iocore/eventsystem/EThread.h"
+#include "iocore/eventsystem/EventProcessor.h"
#include "tscore/ink_atomic.h"
#include <execinfo.h>
diff --git a/src/iocore/eventsystem/P_UnixEventProcessor.h b/src/iocore/eventsystem/P_UnixEventProcessor.h
index 925cdbc4a7..be194353a7 100644
--- a/src/iocore/eventsystem/P_UnixEventProcessor.h
+++ b/src/iocore/eventsystem/P_UnixEventProcessor.h
@@ -26,7 +26,7 @@
#include <tscore/TSSystemState.h>
#include "tscore/ink_align.h"
-#include "EventProcessor.h"
+#include "iocore/eventsystem/EventProcessor.h"
const int LOAD_BALANCE_INTERVAL = 1;
diff --git a/src/iocore/eventsystem/P_UnixSocketManager.h b/src/iocore/eventsystem/P_UnixSocketManager.h
index 4ef84198c6..7ed78cead4 100644
--- a/src/iocore/eventsystem/P_UnixSocketManager.h
+++ b/src/iocore/eventsystem/P_UnixSocketManager.h
@@ -33,7 +33,7 @@
#include "tscore/ink_platform.h"
#include "tscore/ink_sock.h"
-#include "SocketManager.h"
+#include "iocore/eventsystem/SocketManager.h"
//
// These limits are currently disabled
diff --git a/src/iocore/eventsystem/P_VConnection.h b/src/iocore/eventsystem/P_VConnection.h
index 4bbaeaa8dc..ad49800452 100644
--- a/src/iocore/eventsystem/P_VConnection.h
+++ b/src/iocore/eventsystem/P_VConnection.h
@@ -22,7 +22,7 @@
*/
#pragma once
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
TS_INLINE const char *
get_vc_event_name(int event)
diff --git a/src/iocore/eventsystem/P_VIO.h b/src/iocore/eventsystem/P_VIO.h
index 8843976285..de5f919e95 100644
--- a/src/iocore/eventsystem/P_VIO.h
+++ b/src/iocore/eventsystem/P_VIO.h
@@ -22,7 +22,7 @@
*/
#pragma once
-#include "VIO.h"
+#include "iocore/eventsystem/VIO.h"
TS_INLINE
VIO::VIO(int aop) : op(aop), buffer(), mutex(nullptr) {}
diff --git a/src/iocore/eventsystem/ProxyAllocator.cc b/src/iocore/eventsystem/ProxyAllocator.cc
index f421fe111a..0e6f92fcc1 100644
--- a/src/iocore/eventsystem/ProxyAllocator.cc
+++ b/src/iocore/eventsystem/ProxyAllocator.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
int thread_freelist_high_watermark = 512;
int thread_freelist_low_watermark = 32;
diff --git a/src/iocore/eventsystem/RecProcess.cc b/src/iocore/eventsystem/RecProcess.cc
index b799f934bb..b9be4aec51 100644
--- a/src/iocore/eventsystem/RecProcess.cc
+++ b/src/iocore/eventsystem/RecProcess.cc
@@ -24,14 +24,14 @@
#include "tscore/ink_platform.h"
#include "tscore/EventNotify.h"
-#include "Tasks.h"
+#include "iocore/eventsystem/Tasks.h"
#include "P_EventSystem.h"
-#include "records/P_RecCore.h"
-#include "records/P_RecProcess.h"
-#include "records/P_RecMessage.h"
-#include "records/P_RecUtils.h"
-#include "records/P_RecFile.h"
+#include "../../records/P_RecCore.h"
+#include "../../records/P_RecProcess.h"
+#include "../../records/P_RecMessage.h"
+#include "../../records/P_RecUtils.h"
+#include "../../records/P_RecFile.h"
// Marks whether the message handler has been initialized.
static bool g_started = false;
diff --git a/src/iocore/eventsystem/RecRawStatsImpl.cc b/src/iocore/eventsystem/RecRawStatsImpl.cc
index 587bce82dd..70189eb0c3 100644
--- a/src/iocore/eventsystem/RecRawStatsImpl.cc
+++ b/src/iocore/eventsystem/RecRawStatsImpl.cc
@@ -22,8 +22,8 @@ Record statistics support (EThread implementation).
*/
#include "records/RecDefs.h"
-#include "records/P_RecCore.h"
-#include "records/P_RecProcess.h"
+#include "../../records/P_RecCore.h"
+#include "../../records/P_RecProcess.h"
#include <string_view>
//-------------------------------------------------------------------------
diff --git a/src/iocore/eventsystem/Tasks.cc b/src/iocore/eventsystem/Tasks.cc
index 13ee6b9dc0..98af3cd09a 100644
--- a/src/iocore/eventsystem/Tasks.cc
+++ b/src/iocore/eventsystem/Tasks.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Tasks.h"
+#include "iocore/eventsystem/Tasks.h"
// Globals
EventType ET_TASK = ET_CALL;
diff --git a/src/iocore/eventsystem/unit_tests/test_EventSystem.cc b/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
index 3d40bea337..01986636c3 100644
--- a/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
+++ b/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
@@ -24,12 +24,12 @@
#define CATCH_CONFIG_MAIN
#include "catch.hpp"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/ink_atomic.h"
#include "tscore/Layout.h"
#include "tscore/TSSystemState.h"
-#include "diags.i"
+#include "iocore/utils/diags.i"
#define TEST_TIME_SECOND 60
#define TEST_THREADS 2
diff --git a/src/iocore/eventsystem/unit_tests/test_IOBuffer.cc b/src/iocore/eventsystem/unit_tests/test_IOBuffer.cc
index fb74278b7d..91ec7e2cc0 100644
--- a/src/iocore/eventsystem/unit_tests/test_IOBuffer.cc
+++ b/src/iocore/eventsystem/unit_tests/test_IOBuffer.cc
@@ -26,10 +26,10 @@
#include "tscore/Layout.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "records/RecordsConfig.h"
-#include "diags.i"
+#include "iocore/utils/diags.i"
#define TEST_THREADS 1
diff --git a/src/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc b/src/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
index 17b9460086..49b7abc1b6 100644
--- a/src/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
+++ b/src/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
@@ -41,7 +41,7 @@ struct MIOBuffer {
};
#define UNIT_TEST_BUFFER_WRITER
-#include "MIOBufferWriter.h"
+#include "iocore/eventsystem/MIOBufferWriter.h"
#include "MIOBufferWriter.cc"
IOBufferBlock iobb[1];
diff --git a/src/iocore/hostdb/CMakeLists.txt b/src/iocore/hostdb/CMakeLists.txt
index fd8c3e2667..d8999a78d6 100644
--- a/src/iocore/hostdb/CMakeLists.txt
+++ b/src/iocore/hostdb/CMakeLists.txt
@@ -18,19 +18,4 @@
add_library(inkhostdb STATIC HostDB.cc Inline.cc RefCountCache.cc HostFile.cc HostDBInfo.cc)
add_library(ts::inkhostdb ALIAS inkhostdb)
-target_include_directories(
- inkhostdb
- PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/hostdb
- PRIVATE ${CMAKE_SOURCE_DIR}/include/iocore/io_uring
- ${CMAKE_SOURCE_DIR}/include/iocore/dns
- ${CMAKE_SOURCE_DIR}/include/iocore/net
- ${CMAKE_SOURCE_DIR}/include/iocore/eventsystem
- ${CMAKE_SOURCE_DIR}/include/proxy/http
- ${CMAKE_SOURCE_DIR}/include/proxy/hdrs
- # private headers
- ${CMAKE_SOURCE_DIR}/src/iocore/dns
- ${CMAKE_SOURCE_DIR}/src/iocore/hostdb
- ${CMAKE_SOURCE_DIR}/src/iocore/net
-)
-
target_link_libraries(inkhostdb PUBLIC ts::inkdns ts::inkevent ts::tscore)
diff --git a/src/iocore/hostdb/HostDB.cc b/src/iocore/hostdb/HostDB.cc
index 4b57380b30..64932273cb 100644
--- a/src/iocore/hostdb/HostDB.cc
+++ b/src/iocore/hostdb/HostDB.cc
@@ -26,10 +26,10 @@
#include "P_HostDB.h"
#include "tscore/Layout.h"
-#include "Show.h"
+#include "proxy/Show.h"
#include "tscore/ink_apidefs.h"
#include "tscore/MgmtDefs.h" // MgmtInt, MgmtFloat, etc
-#include "HostFile.h"
+#include "iocore/hostdb/HostFile.h"
#include <utility>
#include <vector>
diff --git a/src/iocore/hostdb/HostDBInfo.cc b/src/iocore/hostdb/HostDBInfo.cc
index 002e10b77b..0b8bd5c492 100644
--- a/src/iocore/hostdb/HostDBInfo.cc
+++ b/src/iocore/hostdb/HostDBInfo.cc
@@ -23,7 +23,7 @@
#include <sys/socket.h>
-#include "HostDBProcessor.h"
+#include "iocore/hostdb/HostDBProcessor.h"
namespace
{
diff --git a/src/iocore/hostdb/HostFile.cc b/src/iocore/hostdb/HostFile.cc
index 1c8eebdd58..599d895e14 100644
--- a/src/iocore/hostdb/HostFile.cc
+++ b/src/iocore/hostdb/HostFile.cc
@@ -23,7 +23,7 @@
#include "swoc/swoc_file.h"
-#include "HostFile.h"
+#include "iocore/hostdb/HostFile.h"
#include "P_HostDBProcessor.h"
/* Container for temporarily holding data from the host file. For each FQDN there is a vector of IPv4
diff --git a/src/iocore/hostdb/P_HostDB.h b/src/iocore/hostdb/P_HostDB.h
index c1ec09270d..3a35a16a11 100644
--- a/src/iocore/hostdb/P_HostDB.h
+++ b/src/iocore/hostdb/P_HostDB.h
@@ -32,13 +32,13 @@
#include "tscore/ink_platform.h"
-#include "P_SplitDNS.h"
-#include "P_EventSystem.h"
+#include "../dns/P_SplitDNS.h"
+#include "../eventsystem/P_EventSystem.h"
-#include "HostDB.h"
+#include "iocore/hostdb/HostDB.h"
// HostDB files
-#include "P_DNS.h"
+#include "../dns/P_DNS.h"
#include "P_RefCountCache.h"
#include "P_HostDBProcessor.h"
diff --git a/src/iocore/hostdb/P_HostDBProcessor.h b/src/iocore/hostdb/P_HostDBProcessor.h
index 968df45627..f91f131607 100644
--- a/src/iocore/hostdb/P_HostDBProcessor.h
+++ b/src/iocore/hostdb/P_HostDBProcessor.h
@@ -32,7 +32,7 @@
#include "swoc/swoc_file.h"
#include <tscpp/util/TsSharedMutex.h>
-#include "HostDBProcessor.h"
+#include "iocore/hostdb/HostDBProcessor.h"
#include "P_RefCountCache.h"
#include "tscore/PendingAction.h"
#include "api/Metrics.h"
diff --git a/src/iocore/hostdb/P_RefCountCache.h b/src/iocore/hostdb/P_RefCountCache.h
index 9aee31e506..7adc558845 100644
--- a/src/iocore/hostdb/P_RefCountCache.h
+++ b/src/iocore/hostdb/P_RefCountCache.h
@@ -22,8 +22,8 @@
*/
#pragma once
-#include <EventSystem.h>
-#include <P_EventSystem.h> // TODO: less? just need ET_TASK
+#include "iocore/eventsystem/EventSystem.h"
+#include "../eventsystem/P_EventSystem.h" // TODO: less? just need ET_TASK
#include "swoc/IntrusiveHashMap.h"
diff --git a/src/iocore/hostdb/RefCountCache.cc b/src/iocore/hostdb/RefCountCache.cc
index af9cf0fd20..fa0ea6283e 100644
--- a/src/iocore/hostdb/RefCountCache.cc
+++ b/src/iocore/hostdb/RefCountCache.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include <P_RefCountCache.h>
+#include "P_RefCountCache.h"
// Since the hashing values are all fixed size, we can simply use a classAllocator to avoid mallocs
static ClassAllocator<RefCountCacheHashEntry> refCountCacheHashingValueAllocator("refCountCacheHashingValueAllocator");
diff --git a/src/iocore/hostdb/test_HostFile.cc b/src/iocore/hostdb/test_HostFile.cc
index 68d645af14..57e8f8548d 100644
--- a/src/iocore/hostdb/test_HostFile.cc
+++ b/src/iocore/hostdb/test_HostFile.cc
@@ -28,7 +28,7 @@
#include "swoc/bwf_base.h"
-#include "HostFile.h"
+#include "iocore/hostdb/HostFile.h"
#include "P_HostDBProcessor.h"
using namespace std::literals;
diff --git a/src/iocore/hostdb/test_I_HostDB.cc b/src/iocore/hostdb/test_I_HostDB.cc
index 018197eea2..e56fdea3cf 100644
--- a/src/iocore/hostdb/test_I_HostDB.cc
+++ b/src/iocore/hostdb/test_I_HostDB.cc
@@ -22,9 +22,9 @@
*/
#include <stdio.h>
-#include "HostDB.h"
+#include "iocore/hostdb/HostDB.h"
-#include "diags.i"
+#include "iocore/utils/diags.i"
class HostDBTest : Continuation
{
diff --git a/src/iocore/hostdb/test_RefCountCache.cc b/src/iocore/hostdb/test_RefCountCache.cc
index b6ad81e071..6c52b81344 100644
--- a/src/iocore/hostdb/test_RefCountCache.cc
+++ b/src/iocore/hostdb/test_RefCountCache.cc
@@ -23,7 +23,7 @@
#include <iostream>
#include <RefCountCache.cc>
-#include <EventSystem.h>
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/Layout.h"
#include <diags.i>
#include <set>
diff --git a/src/iocore/io_uring/CMakeLists.txt b/src/iocore/io_uring/CMakeLists.txt
index c1d59bb00f..0d72685b40 100644
--- a/src/iocore/io_uring/CMakeLists.txt
+++ b/src/iocore/io_uring/CMakeLists.txt
@@ -18,11 +18,6 @@
add_library(inkuring STATIC io_uring.cc IOUringEventIO.cc)
add_library(ts::inkuring ALIAS inkuring)
-include_directories(
- ${CMAKE_SOURCE_DIR}/iocore/dns ${CMAKE_SOURCE_DIR}/iocore/io_uring ${CMAKE_SOURCE_DIR}/iocore/net
- ${CMAKE_SOURCE_DIR}/iocore/cache
-)
-
target_link_libraries(
inkuring
PUBLIC ts::tscore uring
@@ -32,6 +27,6 @@ target_link_libraries(
add_executable(test_iouring unit_tests/test_diskIO.cc)
target_link_libraries(test_iouring PRIVATE inkuring libswoc tscpputil catch2::catch2)
-target_include_directories(test_iouring PRIVATE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR})
+target_include_directories(test_iouring PRIVATE ${CATCH_INCLUDE_DIR})
add_test(NAME test_iouring COMMAND $<TARGET_FILE:test_iouring>)
diff --git a/src/iocore/io_uring/IOUringEventIO.cc b/src/iocore/io_uring/IOUringEventIO.cc
index ec091ceb8d..d36d38873c 100644
--- a/src/iocore/io_uring/IOUringEventIO.cc
+++ b/src/iocore/io_uring/IOUringEventIO.cc
@@ -21,9 +21,9 @@
limitations under the License.
*/
-#include "IOUringEventIO.h"
+#include "iocore/io_uring/IOUringEventIO.h"
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
int
IOUringEventIO::start(EventLoop l, IOUringContext *h)
diff --git a/src/iocore/io_uring/io_uring.cc b/src/iocore/io_uring/io_uring.cc
index a6d3677b23..81ab2318c8 100644
--- a/src/iocore/io_uring/io_uring.cc
+++ b/src/iocore/io_uring/io_uring.cc
@@ -28,7 +28,7 @@ Linux io_uring helper library
#include <unistd.h>
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#include "tscore/ink_hrtime.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/io_uring/unit_tests/test_diskIO.cc b/src/iocore/io_uring/unit_tests/test_diskIO.cc
index 30fb7b573c..7f53641947 100644
--- a/src/iocore/io_uring/unit_tests/test_diskIO.cc
+++ b/src/iocore/io_uring/unit_tests/test_diskIO.cc
@@ -26,7 +26,7 @@
#include "swoc/swoc_file.h"
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#include <functional>
diff --git a/src/iocore/net/ALPNSupport.cc b/src/iocore/net/ALPNSupport.cc
index 36cba50de6..f3532641a8 100644
--- a/src/iocore/net/ALPNSupport.cc
+++ b/src/iocore/net/ALPNSupport.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "TLSALPNSupport.h"
+#include "iocore/net/TLSALPNSupport.h"
#include "P_SSLNextProtocolSet.h"
#include "records/RecHttp.h"
diff --git a/src/iocore/net/AsyncSignalEventIO.cc b/src/iocore/net/AsyncSignalEventIO.cc
index 2b11cf7c2a..cf3826027f 100644
--- a/src/iocore/net/AsyncSignalEventIO.cc
+++ b/src/iocore/net/AsyncSignalEventIO.cc
@@ -22,8 +22,8 @@
limitations under the License.
*/
-#include "AsyncSignalEventIO.h"
-#include "EThread.h"
+#include "iocore/net/AsyncSignalEventIO.h"
+#include "iocore/eventsystem/EThread.h"
int
AsyncSignalEventIO::start(EventLoop l, int fd, int events)
diff --git a/src/iocore/net/BIO_fastopen.cc b/src/iocore/net/BIO_fastopen.cc
index 0a7ea70a9c..9b68141a4a 100644
--- a/src/iocore/net/BIO_fastopen.cc
+++ b/src/iocore/net/BIO_fastopen.cc
@@ -22,10 +22,10 @@
*/
#include "P_Net.h"
-#include "SocketManager.h"
+#include "iocore/eventsystem/SocketManager.h"
#include "tscore/ink_assert.h"
-#include "BIO_fastopen.h"
+#include "iocore/net/BIO_fastopen.h"
// For BoringSSL, which for some reason doesn't have this function.
// (In BoringSSL, sock_read() and sock_write() use the internal
diff --git a/src/iocore/net/BoringSSLUtils.cc b/src/iocore/net/BoringSSLUtils.cc
index a5a63499ac..ff2cdb92d2 100644
--- a/src/iocore/net/BoringSSLUtils.cc
+++ b/src/iocore/net/BoringSSLUtils.cc
@@ -22,7 +22,7 @@
// Borrowed from Envoy
// https://github.com/envoyproxy/envoy/blob/329b2491949fc52f4dc5c4a778ea158bfe6fe979/source/extensions/transport_sockets/tls/context_impl.cc#L962
-#include "BoringSSLUtils.h"
+#include "iocore/net/BoringSSLUtils.h"
#ifdef OPENSSL_IS_BORINGSSL
namespace BoringSSLUtils
diff --git a/src/iocore/net/CMakeLists.txt b/src/iocore/net/CMakeLists.txt
index 03f42c71b2..581f402351 100644
--- a/src/iocore/net/CMakeLists.txt
+++ b/src/iocore/net/CMakeLists.txt
@@ -89,7 +89,6 @@ if(TS_USE_QUIC)
QUICPacketHandler_quiche.cc
QUICSupport.cc
)
- target_include_directories(inknet PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/net/quic)
target_link_libraries(inknet PUBLIC quiche::quiche ts::quic)
endif()
@@ -99,23 +98,6 @@ if(BUILD_REGRESSION_TESTING)
endif()
target_compile_options(inknet PUBLIC -Wno-deprecated-declarations)
-target_include_directories(
- inknet
- PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/dns
- ${CMAKE_SOURCE_DIR}/include/iocore/io_uring
- ${CMAKE_SOURCE_DIR}/include/iocore/aio
- ${CMAKE_SOURCE_DIR}/include/iocore/net
- ${CMAKE_SOURCE_DIR}/include/iocore/cache
- ${CMAKE_SOURCE_DIR}/include/iocore/hostdb
- ${CMAKE_SOURCE_DIR}/include/iocore/eventsystem
- ${CMAKE_SOURCE_DIR}/include/proxy/
- ${CMAKE_SOURCE_DIR}/include/proxy/hdrs
- ${CMAKE_SOURCE_DIR}/include/proxy/shared
- ${CMAKE_SOURCE_DIR}/include/proxy/http
- ${CMAKE_SOURCE_DIR}/include/proxy/http/remap
- ${CMAKE_SOURCE_DIR}/src/api
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/iocore/dns ${CMAKE_SOURCE_DIR}/src/proxy
-)
target_link_libraries(
inknet
diff --git a/src/iocore/net/EventIO.cc b/src/iocore/net/EventIO.cc
index 34f4d965fe..0ec7ff2078 100644
--- a/src/iocore/net/EventIO.cc
+++ b/src/iocore/net/EventIO.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "EventIO.h"
+#include "iocore/net/EventIO.h"
#include "tscore/ink_assert.h"
int
diff --git a/src/iocore/net/Net.cc b/src/iocore/net/Net.cc
index b0dbf118c4..8c5c55727c 100644
--- a/src/iocore/net/Net.cc
+++ b/src/iocore/net/Net.cc
@@ -28,7 +28,7 @@
************************************************************************/
-#include "SSLAPIHooks.h"
+#include "iocore/net/SSLAPIHooks.h"
#include "P_Net.h"
#include <utility>
diff --git a/src/iocore/net/NetAcceptEventIO.cc b/src/iocore/net/NetAcceptEventIO.cc
index 21db723745..b07f2b9a54 100644
--- a/src/iocore/net/NetAcceptEventIO.cc
+++ b/src/iocore/net/NetAcceptEventIO.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "NetAcceptEventIO.h"
+#include "iocore/net/NetAcceptEventIO.h"
#include "P_NetAccept.h"
int
diff --git a/src/iocore/net/NetHandler.cc b/src/iocore/net/NetHandler.cc
index 339c81503f..27c4b98e05 100644
--- a/src/iocore/net/NetHandler.cc
+++ b/src/iocore/net/NetHandler.cc
@@ -21,16 +21,16 @@
limitations under the License.
*/
-#include "NetHandler.h"
+#include "iocore/net/NetHandler.h"
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#endif
#include "P_Net.h"
#include "P_UnixNet.h"
#include "P_UnixNetProcessor.h"
-#include "PollCont.h"
+#include "iocore/net/PollCont.h"
using namespace std::literals;
diff --git a/src/iocore/net/NetVCOptions.cc b/src/iocore/net/NetVCOptions.cc
index d1f71bfdc7..104a3c2519 100644
--- a/src/iocore/net/NetVCOptions.cc
+++ b/src/iocore/net/NetVCOptions.cc
@@ -22,9 +22,9 @@
limitations under the License.
*/
-#include "NetVCOptions.h"
-#include "Net.h"
-#include "Socks.h"
+#include "iocore/net/NetVCOptions.h"
+#include "iocore/net/Net.h"
+#include "iocore/net/Socks.h"
void
NetVCOptions::reset()
diff --git a/src/iocore/net/OCSPStapling.cc b/src/iocore/net/OCSPStapling.cc
index f427cf8549..49743c7e67 100644
--- a/src/iocore/net/OCSPStapling.cc
+++ b/src/iocore/net/OCSPStapling.cc
@@ -33,7 +33,7 @@
#include "P_Net.h"
#include "P_SSLConfig.h"
#include "P_SSLUtils.h"
-#include "SSLStats.h"
+#include "iocore/net/SSLStats.h"
#include "api/FetchSM.h"
// Macros for ASN1 and the code in TS_OCSP_* functions were borrowed from OpenSSL 3.1.0 (a92271e03a8d0dee507b6f1e7f49512568b2c7ad),
diff --git a/src/iocore/net/P_Net.h b/src/iocore/net/P_Net.h
index 7719ab0a3a..2a141ec2c2 100644
--- a/src/iocore/net/P_Net.h
+++ b/src/iocore/net/P_Net.h
@@ -88,8 +88,8 @@ extern NetStatsBlock net_rsb;
#define SSL_HANDSHAKE_WANT_CONNECT 9
#include "tscore/ink_platform.h"
-#include "P_EventSystem.h"
-#include "Net.h"
+#include "../eventsystem/P_EventSystem.h"
+#include "iocore/net/Net.h"
#include "P_NetVConnection.h"
#include "P_UnixNet.h"
#include "P_UnixNetProcessor.h"
diff --git a/src/iocore/net/P_NetAccept.h b/src/iocore/net/P_NetAccept.h
index 70c18cca2b..efaff3709a 100644
--- a/src/iocore/net/P_NetAccept.h
+++ b/src/iocore/net/P_NetAccept.h
@@ -38,8 +38,8 @@
****************************************************************************/
#pragma once
-#include "NetProcessor.h"
-#include "NetAcceptEventIO.h"
+#include "iocore/net/NetProcessor.h"
+#include "iocore/net/NetAcceptEventIO.h"
#include <vector>
#include "tscore/ink_platform.h"
#include "P_Connection.h"
diff --git a/src/iocore/net/P_NetVConnection.h b/src/iocore/net/P_NetVConnection.h
index 696d3b2250..8ef5cabfc8 100644
--- a/src/iocore/net/P_NetVConnection.h
+++ b/src/iocore/net/P_NetVConnection.h
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "NetVConnection.h"
-#include "ProxyProtocol.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/ProxyProtocol.h"
inline sockaddr const *
NetVConnection::get_remote_addr()
diff --git a/src/iocore/net/P_QUICNet.h b/src/iocore/net/P_QUICNet.h
index 7436c123e1..9a894836ef 100644
--- a/src/iocore/net/P_QUICNet.h
+++ b/src/iocore/net/P_QUICNet.h
@@ -28,7 +28,7 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "quic/QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
#include "P_QUICNetProcessor.h"
#include "P_QUICNetVConnection.h"
diff --git a/src/iocore/net/P_QUICNetProcessor_native.h b/src/iocore/net/P_QUICNetProcessor_native.h
index e3667ee37f..2eaa53fe0c 100644
--- a/src/iocore/net/P_QUICNetProcessor_native.h
+++ b/src/iocore/net/P_QUICNetProcessor_native.h
@@ -39,7 +39,7 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
class UnixNetVConnection;
class QUICResetTokenTable;
diff --git a/src/iocore/net/P_QUICNetProcessor_quiche.h b/src/iocore/net/P_QUICNetProcessor_quiche.h
index 63705e7817..10bbff131b 100644
--- a/src/iocore/net/P_QUICNetProcessor_quiche.h
+++ b/src/iocore/net/P_QUICNetProcessor_quiche.h
@@ -39,7 +39,7 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
#include <quiche.h>
class UnixNetVConnection;
diff --git a/src/iocore/net/P_QUICNetVConnection_native.h b/src/iocore/net/P_QUICNetVConnection_native.h
index e8760a9973..ff7bc98b58 100644
--- a/src/iocore/net/P_QUICNetVConnection_native.h
+++ b/src/iocore/net/P_QUICNetVConnection_native.h
@@ -33,44 +33,44 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "P_EventSystem.h"
+#include "../eventsystem/P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
#include "P_UDPNet.h"
-#include "TLSALPNSupport.h"
-#include "TLSBasicSupport.h"
-#include "TLSSessionResumptionSupport.h"
+#include "iocore/net/TLSALPNSupport.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
#include "tscore/ink_apidefs.h"
#include "tscore/List.h"
-#include "quic/QUICConfig.h"
-#include "quic/QUICConnection.h"
-#include "quic/QUICConnectionTable.h"
-#include "quic/QUICResetTokenTable.h"
-#include "quic/QUICVersionNegotiator.h"
-#include "quic/QUICPacket.h"
-#include "quic/QUICPacketFactory.h"
-#include "quic/QUICFrame.h"
-#include "quic/QUICFrameDispatcher.h"
-#include "quic/QUICApplication.h"
-#include "quic/QUICStream.h"
-#include "quic/QUICHandshakeProtocol.h"
-#include "quic/QUICAckFrameCreator.h"
-#include "quic/QUICPinger.h"
-#include "quic/QUICPadder.h"
-#include "quic/QUICLossDetector.h"
-#include "quic/QUICStreamManager_native.h"
-#include "quic/QUICAltConnectionManager.h"
-#include "quic/QUICPathValidator.h"
-#include "quic/QUICPathManager.h"
-#include "quic/QUICApplicationMap.h"
-#include "quic/QUICPacketReceiveQueue.h"
-#include "quic/QUICPacketHeaderProtector.h"
-#include "quic/QUICAddrVerifyState.h"
-#include "quic/QUICPacketProtectionKeyInfo.h"
-#include "quic/QUICContext.h"
-#include "quic/QUICTokenCreator.h"
-#include "quic/qlog/QLogListener.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
+#include "iocore/net/quic/QUICVersionNegotiator.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICFrameDispatcher.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICHandshakeProtocol.h"
+#include "iocore/net/quic/QUICAckFrameCreator.h"
+#include "iocore/net/quic/QUICPinger.h"
+#include "iocore/net/quic/QUICPadder.h"
+#include "iocore/net/quic/QUICLossDetector.h"
+#include "iocore/net/quic/QUICStreamManager_native.h"
+#include "iocore/net/quic/QUICAltConnectionManager.h"
+#include "iocore/net/quic/QUICPathValidator.h"
+#include "iocore/net/quic/QUICPathManager.h"
+#include "iocore/net/quic/QUICApplicationMap.h"
+#include "iocore/net/quic/QUICPacketReceiveQueue.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICAddrVerifyState.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICContext.h"
+#include "iocore/net/quic/QUICTokenCreator.h"
+#include "iocore/net/quic/qlog/QLogListener.h"
// Size of connection ids for debug log : e.g. aaaaaaaa-bbbbbbbb\0
static constexpr size_t MAX_CIDS_SIZE = 8 + 1 + 8 + 1;
diff --git a/src/iocore/net/P_QUICNetVConnection_quiche.h b/src/iocore/net/P_QUICNetVConnection_quiche.h
index 10450a47c2..e4ac0b0719 100644
--- a/src/iocore/net/P_QUICNetVConnection_quiche.h
+++ b/src/iocore/net/P_QUICNetVConnection_quiche.h
@@ -33,24 +33,24 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "P_EventSystem.h"
+#include "../eventsystem/P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
#include "P_UDPNet.h"
-#include "TLSALPNSupport.h"
-#include "TLSBasicSupport.h"
-#include "TLSSessionResumptionSupport.h"
-#include "TLSSNISupport.h"
-#include "TLSCertSwitchSupport.h"
-#include "QUICSupport.h"
+#include "iocore/net/TLSALPNSupport.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
+#include "iocore/net/TLSSNISupport.h"
+#include "iocore/net/TLSCertSwitchSupport.h"
+#include "iocore/net/QUICSupport.h"
#include "tscore/ink_apidefs.h"
#include "tscore/List.h"
-#include "quic/QUICConnection.h"
-#include "quic/QUICConnectionTable.h"
-#include "quic/QUICContext.h"
-#include "quic/QUICStreamManager.h"
-#include "quic/QUICStreamManager_quiche.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICContext.h"
+#include "iocore/net/quic/QUICStreamManager.h"
+#include "iocore/net/quic/QUICStreamManager_quiche.h"
#include <netinet/in.h>
#include <quiche.h>
diff --git a/src/iocore/net/P_QUICNextProtocolAccept_native.h b/src/iocore/net/P_QUICNextProtocolAccept_native.h
index fba9f0979d..b843137ef5 100644
--- a/src/iocore/net/P_QUICNextProtocolAccept_native.h
+++ b/src/iocore/net/P_QUICNextProtocolAccept_native.h
@@ -25,7 +25,7 @@
#include "P_QUICNetVConnection.h"
#include "P_SSLNextProtocolSet.h"
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
class QUICNextProtocolAccept : public SessionAccept
{
diff --git a/src/iocore/net/P_QUICNextProtocolAccept_quiche.h b/src/iocore/net/P_QUICNextProtocolAccept_quiche.h
index 9ad0e9b952..0e609cb635 100644
--- a/src/iocore/net/P_QUICNextProtocolAccept_quiche.h
+++ b/src/iocore/net/P_QUICNextProtocolAccept_quiche.h
@@ -25,7 +25,7 @@
#include "P_QUICNetVConnection_quiche.h"
#include "P_SSLNextProtocolSet.h"
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
class QUICNextProtocolAccept : public SessionAccept
{
diff --git a/src/iocore/net/P_QUICPacketHandler_native.h b/src/iocore/net/P_QUICPacketHandler_native.h
index 9428b89a4b..fcc4e850ba 100644
--- a/src/iocore/net/P_QUICPacketHandler_native.h
+++ b/src/iocore/net/P_QUICPacketHandler_native.h
@@ -26,9 +26,9 @@
#include "tscore/ink_platform.h"
#include "P_Connection.h"
#include "P_NetAccept.h"
-#include "quic/QUICTypes.h"
-#include "quic/QUICConnectionTable.h"
-#include "quic/QUICResetTokenTable.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
class QUICClosedConCollector;
class QUICNetVConnection;
diff --git a/src/iocore/net/P_SNIActionPerformer.h b/src/iocore/net/P_SNIActionPerformer.h
index bd737f41e7..9f5fc67871 100644
--- a/src/iocore/net/P_SNIActionPerformer.h
+++ b/src/iocore/net/P_SNIActionPerformer.h
@@ -33,11 +33,11 @@
#include "swoc/TextView.h"
#include "swoc/swoc_ip.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "P_SSLNextProtocolAccept.h"
#include "P_SSLNetVConnection.h"
-#include "SNIActionPerformer.h"
-#include "SSLTypes.h"
+#include "iocore/net/SNIActionPerformer.h"
+#include "iocore/net/SSLTypes.h"
#include "tscore/ink_inet.h"
diff --git a/src/iocore/net/P_SSLCertLookup.h b/src/iocore/net/P_SSLCertLookup.h
index 23192681d8..1713219ee2 100644
--- a/src/iocore/net/P_SSLCertLookup.h
+++ b/src/iocore/net/P_SSLCertLookup.h
@@ -28,7 +28,7 @@
#include <mutex>
#include <unordered_map>
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
struct SSLConfigParams;
struct SSLContextStorage;
diff --git a/src/iocore/net/P_SSLClientCoordinator.h b/src/iocore/net/P_SSLClientCoordinator.h
index 245266b3f5..a8e730aaad 100644
--- a/src/iocore/net/P_SSLClientCoordinator.h
+++ b/src/iocore/net/P_SSLClientCoordinator.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
#include <memory>
// A class to pass the ConfigUpdateHandler, so both SSLConfig and SNIConfig get updated
diff --git a/src/iocore/net/P_SSLConfig.h b/src/iocore/net/P_SSLConfig.h
index 5a85fae99f..7295ee80bb 100644
--- a/src/iocore/net/P_SSLConfig.h
+++ b/src/iocore/net/P_SSLConfig.h
@@ -37,10 +37,10 @@
#include "swoc/swoc_ip.h"
#include "tscore/ink_inet.h"
-#include "ConfigProcessor.h"
+#include "iocore/eventsystem/ConfigProcessor.h"
-#include "SSLSessionCache.h"
-#include "YamlSNIConfig.h"
+#include "iocore/net/SSLSessionCache.h"
+#include "iocore/net/YamlSNIConfig.h"
#include "P_SSLUtils.h"
#include "P_SSLSecret.h"
diff --git a/src/iocore/net/P_SSLNetVConnection.h b/src/iocore/net/P_SSLNetVConnection.h
index 54c647a82a..ffb282681f 100644
--- a/src/iocore/net/P_SSLNetVConnection.h
+++ b/src/iocore/net/P_SSLNetVConnection.h
@@ -34,16 +34,16 @@
#include "tscore/ink_platform.h"
#include "ts/apidefs.h"
-#include "P_EventSystem.h"
+#include "../eventsystem/P_EventSystem.h"
#include "P_UnixNetVConnection.h"
#include "P_UnixNet.h"
-#include "TLSALPNSupport.h"
-#include "TLSSessionResumptionSupport.h"
-#include "TLSSNISupport.h"
-#include "TLSEarlyDataSupport.h"
-#include "TLSTunnelSupport.h"
-#include "TLSBasicSupport.h"
-#include "TLSCertSwitchSupport.h"
+#include "iocore/net/TLSALPNSupport.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
+#include "iocore/net/TLSSNISupport.h"
+#include "iocore/net/TLSEarlyDataSupport.h"
+#include "iocore/net/TLSTunnelSupport.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/net/TLSCertSwitchSupport.h"
#include "P_SSLUtils.h"
#include "P_SSLConfig.h"
diff --git a/src/iocore/net/P_SSLNextProtocolAccept.h b/src/iocore/net/P_SSLNextProtocolAccept.h
index 29586cc330..191d8b4d3c 100644
--- a/src/iocore/net/P_SSLNextProtocolAccept.h
+++ b/src/iocore/net/P_SSLNextProtocolAccept.h
@@ -24,10 +24,10 @@
#pragma once
#include "P_Net.h"
-#include "P_EventSystem.h"
+#include "../eventsystem/P_EventSystem.h"
#include "P_UnixNet.h"
#include "P_SSLNextProtocolSet.h"
-#include "IOBuffer.h"
+#include "iocore/eventsystem/IOBuffer.h"
#include "records/RecHttp.h"
class SSLNextProtocolAccept : public SessionAccept
diff --git a/src/iocore/net/P_SSLNextProtocolSet.h b/src/iocore/net/P_SSLNextProtocolSet.h
index 34eaab22ef..12d4f1a547 100644
--- a/src/iocore/net/P_SSLNextProtocolSet.h
+++ b/src/iocore/net/P_SSLNextProtocolSet.h
@@ -24,7 +24,7 @@
#pragma once
#include "tscore/List.h"
-#include "Net.h"
+#include "iocore/net/Net.h"
#include "records/RecHttp.h"
class Continuation;
diff --git a/src/iocore/net/P_Socks.h b/src/iocore/net/P_Socks.h
index 78b112efbe..d271c36333 100644
--- a/src/iocore/net/P_Socks.h
+++ b/src/iocore/net/P_Socks.h
@@ -26,11 +26,11 @@
#include "swoc/TextView.h"
#include "swoc/swoc_ip.h"
-#include "P_EventSystem.h"
-#include "Socks.h"
+#include "../eventsystem/P_EventSystem.h"
+#include "iocore/net/Socks.h"
#include "tscpp/util/ts_errata.h"
-#include "ParentSelection.h"
+#include "proxy/ParentSelection.h"
enum {
// types of events for Socks auth handlers
diff --git a/src/iocore/net/P_UDPConnection.h b/src/iocore/net/P_UDPConnection.h
index 682fca78dc..78355de320 100644
--- a/src/iocore/net/P_UDPConnection.h
+++ b/src/iocore/net/P_UDPConnection.h
@@ -31,7 +31,7 @@
#pragma once
#include "tscore/ink_atomic.h"
-#include "UDPNet.h"
+#include "iocore/net/UDPNet.h"
class UDPConnectionInternal : public UDPConnection
{
diff --git a/src/iocore/net/P_UDPNet.h b/src/iocore/net/P_UDPNet.h
index 8f1262c058..01a1a8212d 100644
--- a/src/iocore/net/P_UDPNet.h
+++ b/src/iocore/net/P_UDPNet.h
@@ -31,8 +31,8 @@
#pragma once
#include "tscore/ink_platform.h"
-#include "UDPNet.h"
-#include "PollCont.h"
+#include "iocore/net/UDPNet.h"
+#include "iocore/net/PollCont.h"
// added by YTS Team, yamsat
static inline PollCont *get_UDPPollCont(EThread *);
diff --git a/src/iocore/net/P_UnixNet.h b/src/iocore/net/P_UnixNet.h
index af37bc1ff3..e4a8b00fdd 100644
--- a/src/iocore/net/P_UnixNet.h
+++ b/src/iocore/net/P_UnixNet.h
@@ -27,16 +27,16 @@
#include "tscore/ink_platform.h"
-#include "PollCont.h"
-#include "EventIO.h"
-#include "NetHandler.h"
+#include "iocore/net/PollCont.h"
+#include "iocore/net/EventIO.h"
+#include "iocore/net/NetHandler.h"
#include "tscore/ink_platform.h"
#if TS_USE_LINUX_IO_URING
-#include "IOUringEventIO.h"
+#include "iocore/io_uring/IOUringEventIO.h"
#endif
-#include "P_DNSConnection.h"
+#include "../dns/P_DNSConnection.h"
#include "P_Net.h"
#include "P_NetAccept.h"
#include "P_UnixNetProcessor.h"
diff --git a/src/iocore/net/P_UnixNetProcessor.h b/src/iocore/net/P_UnixNetProcessor.h
index 1913e3e780..4040c5ceb3 100644
--- a/src/iocore/net/P_UnixNetProcessor.h
+++ b/src/iocore/net/P_UnixNetProcessor.h
@@ -22,9 +22,9 @@
*/
#pragma once
-#include "Net.h"
-#include "NetProcessor.h"
-#include "SessionAccept.h"
+#include "iocore/net/Net.h"
+#include "iocore/net/NetProcessor.h"
+#include "iocore/net/SessionAccept.h"
#include "P_NetAccept.h"
class UnixNetVConnection;
diff --git a/src/iocore/net/P_UnixNetState.h b/src/iocore/net/P_UnixNetState.h
index 2cc6186437..aca5d9da4e 100644
--- a/src/iocore/net/P_UnixNetState.h
+++ b/src/iocore/net/P_UnixNetState.h
@@ -37,7 +37,7 @@
#pragma once
#include "tscore/List.h"
-#include "VIO.h"
+#include "iocore/eventsystem/VIO.h"
class Event;
class NetEvent;
diff --git a/src/iocore/net/P_UnixNetVConnection.h b/src/iocore/net/P_UnixNetVConnection.h
index 86a7c672e2..1473565d37 100644
--- a/src/iocore/net/P_UnixNetVConnection.h
+++ b/src/iocore/net/P_UnixNetVConnection.h
@@ -32,11 +32,11 @@
#pragma once
#include "tscore/ink_sock.h"
-#include "NetVConnection.h"
+#include "iocore/net/NetVConnection.h"
#include "P_UnixNetState.h"
#include "P_Connection.h"
#include "P_NetAccept.h"
-#include "NetEvent.h"
+#include "iocore/net/NetEvent.h"
class UnixNetVConnection;
class NetHandler;
diff --git a/src/iocore/net/P_UnixUDPConnection.h b/src/iocore/net/P_UnixUDPConnection.h
index 27cdb2da29..55bb0746c2 100644
--- a/src/iocore/net/P_UnixUDPConnection.h
+++ b/src/iocore/net/P_UnixUDPConnection.h
@@ -31,7 +31,7 @@
#pragma once
#include "P_UDPConnection.h"
-#include "UDPEventIO.h"
+#include "iocore/net/UDPEventIO.h"
class UnixUDPConnection : public UDPConnectionInternal
{
diff --git a/src/iocore/net/PollCont.cc b/src/iocore/net/PollCont.cc
index e08109c44d..2c997dc5cd 100644
--- a/src/iocore/net/PollCont.cc
+++ b/src/iocore/net/PollCont.cc
@@ -22,7 +22,7 @@
limitations under the License.
*/
-#include "PollCont.h"
+#include "iocore/net/PollCont.h"
#include "P_Net.h"
namespace
diff --git a/src/iocore/net/ProxyProtocol.cc b/src/iocore/net/ProxyProtocol.cc
index 7fec25b4a2..7d63b44779 100644
--- a/src/iocore/net/ProxyProtocol.cc
+++ b/src/iocore/net/ProxyProtocol.cc
@@ -21,10 +21,10 @@
* limitations under the License.
*/
-#include "ProxyProtocol.h"
+#include "iocore/net/ProxyProtocol.h"
-#include "EventSystem.h"
-#include "NetVConnection.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/NetVConnection.h"
#include "tscpp/util/ts_bw.h"
#include "tscore/ink_assert.h"
diff --git a/src/iocore/net/QUICMultiCertConfigLoader.cc b/src/iocore/net/QUICMultiCertConfigLoader.cc
index 653aec4d1c..33d0dd6f31 100644
--- a/src/iocore/net/QUICMultiCertConfigLoader.cc
+++ b/src/iocore/net/QUICMultiCertConfigLoader.cc
@@ -21,16 +21,16 @@
* limitations under the License.
*/
-#include "QUICMultiCertConfigLoader.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
#include "P_SSLConfig.h"
#include "P_SSLNextProtocolSet.h"
#include "P_OCSPStapling.h"
-#include "QUICGlobals.h"
-#include "QUICConfig.h"
-#include "QUICConnection.h"
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICTypes.h"
#include "tscore/Filenames.h"
-// #include "QUICGlobals.h"
+// #include "iocore/net/quic/QUICGlobals.h"
#define QUICConfDebug(fmt, ...) Debug("quic_conf", fmt, ##__VA_ARGS__)
#define QUICGlobalQCDebug(qc, fmt, ...) Debug("quic_global", "[%s] " fmt, qc->cids().data(), ##__VA_ARGS__)
diff --git a/src/iocore/net/QUICNet.cc b/src/iocore/net/QUICNet.cc
index 4d3ac66670..3e6650f518 100644
--- a/src/iocore/net/QUICNet.cc
+++ b/src/iocore/net/QUICNet.cc
@@ -23,7 +23,7 @@
#include "P_Net.h"
#include "P_QUICNet.h"
-#include "quic/QUICEvents.h"
+#include "iocore/net/quic/QUICEvents.h"
ClassAllocator<QUICPollEvent> quicPollEventAllocator("quicPollEvent");
diff --git a/src/iocore/net/QUICNetProcessor.cc b/src/iocore/net/QUICNetProcessor.cc
index 6f1622d7f3..2c734c41be 100644
--- a/src/iocore/net/QUICNetProcessor.cc
+++ b/src/iocore/net/QUICNetProcessor.cc
@@ -28,10 +28,10 @@
#include "P_QUICNetProcessor.h"
#include "P_QUICNet.h"
#include "P_QUICPacketHandler.h"
-#include "QUICGlobals.h"
-#include "QUICConfig.h"
-#include "QUICMultiCertConfigLoader.h"
-#include "QUICResetTokenTable.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
//
// Global Data
diff --git a/src/iocore/net/QUICNetProcessor_quiche.cc b/src/iocore/net/QUICNetProcessor_quiche.cc
index 6d48b18944..ff94792663 100644
--- a/src/iocore/net/QUICNetProcessor_quiche.cc
+++ b/src/iocore/net/QUICNetProcessor_quiche.cc
@@ -29,10 +29,10 @@
#include "P_QUICNetProcessor_quiche.h"
#include "P_QUICPacketHandler_quiche.h"
#include "P_QUICNetVConnection_quiche.h"
-#include "QUICGlobals.h"
-#include "QUICTypes.h"
-#include "QUICConfig.h"
-#include "QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
#include <quiche.h>
diff --git a/src/iocore/net/QUICNetVConnection.cc b/src/iocore/net/QUICNetVConnection.cc
index f559ae6f85..ed2cefc5e7 100644
--- a/src/iocore/net/QUICNetVConnection.cc
+++ b/src/iocore/net/QUICNetVConnection.cc
@@ -33,18 +33,18 @@
#include "api/InkAPIInternal.h" // Added to include the quic_hook definitions
#include "P_SSLNextProtocolSet.h"
-#include "QUICMultiCertConfigLoader.h"
-#include "QUICTLS.h"
-
-#include "QUICNewRenoCongestionController.h"
-
-#include "QUICStats.h"
-#include "QUICGlobals.h"
-#include "QUICDebugNames.h"
-#include "QUICEvents.h"
-#include "QUICHandshake.h"
-#include "QUICConfig.h"
-#include "QUICIntUtil.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICTLS.h"
+
+#include "iocore/net/quic/QUICNewRenoCongestionController.h"
+
+#include "iocore/net/quic/QUICStats.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICHandshake.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICIntUtil.h"
using namespace std::literals;
static constexpr std::string_view QUIC_DEBUG_TAG = "quic_net"sv;
diff --git a/src/iocore/net/QUICNetVConnection_quiche.cc b/src/iocore/net/QUICNetVConnection_quiche.cc
index d1d8f60ba4..63c9107217 100644
--- a/src/iocore/net/QUICNetVConnection_quiche.cc
+++ b/src/iocore/net/QUICNetVConnection_quiche.cc
@@ -23,9 +23,9 @@
#include "P_QUICNetVConnection_quiche.h"
#include "P_QUICPacketHandler_quiche.h"
-#include "QUICMultiCertConfigLoader.h"
-#include "quic/QUICStream_quiche.h"
-#include "quic/QUICGlobals.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICStream_quiche.h"
+#include "iocore/net/quic/QUICGlobals.h"
#include <netinet/in.h>
#include <quiche.h>
diff --git a/src/iocore/net/QUICPacketHandler.cc b/src/iocore/net/QUICPacketHandler.cc
index a0c1013a62..add5216310 100644
--- a/src/iocore/net/QUICPacketHandler.cc
+++ b/src/iocore/net/QUICPacketHandler.cc
@@ -27,15 +27,15 @@
#include "P_QUICNet.h"
#include "P_QUICClosedConCollector.h"
-#include "QUICGlobals.h"
-#include "QUICConfig.h"
-#include "QUICPacket.h"
-#include "QUICDebugNames.h"
-#include "QUICEvents.h"
-#include "QUICResetTokenTable.h"
-
-#include "QUICMultiCertConfigLoader.h"
-#include "QUICTLS.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
+
+#include "iocore/net/QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICTLS.h"
namespace
{
diff --git a/src/iocore/net/QUICPacketHandler_quiche.cc b/src/iocore/net/QUICPacketHandler_quiche.cc
index c4cd2e1902..83beba1f7a 100644
--- a/src/iocore/net/QUICPacketHandler_quiche.cc
+++ b/src/iocore/net/QUICPacketHandler_quiche.cc
@@ -28,8 +28,8 @@
#include "P_QUICPacketHandler_quiche.h"
#include "P_QUICNetProcessor_quiche.h"
#include "P_QUICClosedConCollector.h"
-#include "quic/QUICConnectionTable.h"
-#include "QUICMultiCertConfigLoader.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
#include <quiche.h>
#include "swoc/BufferWriter.h"
diff --git a/src/iocore/net/QUICSupport.cc b/src/iocore/net/QUICSupport.cc
index 118359f16b..8fe7892dd3 100644
--- a/src/iocore/net/QUICSupport.cc
+++ b/src/iocore/net/QUICSupport.cc
@@ -22,7 +22,7 @@
limitations under the License.
*/
-#include "QUICSupport.h"
+#include "iocore/net/QUICSupport.h"
int QUICSupport::_ex_data_index = -1;
diff --git a/src/iocore/net/ReadWriteEventIO.cc b/src/iocore/net/ReadWriteEventIO.cc
index 0e86d69b10..f74c37beb4 100644
--- a/src/iocore/net/ReadWriteEventIO.cc
+++ b/src/iocore/net/ReadWriteEventIO.cc
@@ -22,8 +22,8 @@
limitations under the License.
*/
-#include "ReadWriteEventIO.h"
-#include "NetHandler.h"
+#include "iocore/net/ReadWriteEventIO.h"
+#include "iocore/net/NetHandler.h"
int
ReadWriteEventIO::start(EventLoop l, NetEvent *ne, NetHandler *nh, int events)
diff --git a/src/iocore/net/SSLAPIHooks.cc b/src/iocore/net/SSLAPIHooks.cc
index 0dc718b881..1411cf0733 100644
--- a/src/iocore/net/SSLAPIHooks.cc
+++ b/src/iocore/net/SSLAPIHooks.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "SSLAPIHooks.h"
+#include "iocore/net/SSLAPIHooks.h"
SSLAPIHooks *g_ssl_hooks = nullptr;
diff --git a/src/iocore/net/SSLCertLookup.cc b/src/iocore/net/SSLCertLookup.cc
index ce42236427..1db515c4e7 100644
--- a/src/iocore/net/SSLCertLookup.cc
+++ b/src/iocore/net/SSLCertLookup.cc
@@ -37,11 +37,11 @@
#include "tscpp/util/Convert.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "P_SSLUtils.h"
#include "P_SSLConfig.h"
-#include "SSLSessionTicket.h"
+#include "iocore/net/SSLSessionTicket.h"
#include <unordered_map>
#include <utility>
diff --git a/src/iocore/net/SSLClientCoordinator.cc b/src/iocore/net/SSLClientCoordinator.cc
index 1a36d811c4..c634f0c61f 100644
--- a/src/iocore/net/SSLClientCoordinator.cc
+++ b/src/iocore/net/SSLClientCoordinator.cc
@@ -23,7 +23,7 @@
#include "P_SSLClientCoordinator.h"
#include "P_SSLConfig.h"
-#include "SSLSNIConfig.h"
+#include "iocore/net/SSLSNIConfig.h"
std::unique_ptr<ConfigUpdateHandler<SSLClientCoordinator>> sslClientUpdate;
diff --git a/src/iocore/net/SSLClientUtils.cc b/src/iocore/net/SSLClientUtils.cc
index 89131a098a..a8dfd3e168 100644
--- a/src/iocore/net/SSLClientUtils.cc
+++ b/src/iocore/net/SSLClientUtils.cc
@@ -30,9 +30,9 @@
#include "P_SSLConfig.h"
#include "P_SSLNetVConnection.h"
#include "P_TLSKeyLogger.h"
-#include "YamlSNIConfig.h"
-#include "SSLDiags.h"
-#include "SSLSessionCache.h"
+#include "iocore/net/YamlSNIConfig.h"
+#include "iocore/net/SSLDiags.h"
+#include "iocore/net/SSLSessionCache.h"
#include <openssl/err.h>
#include <openssl/pem.h>
diff --git a/src/iocore/net/SSLConfig.cc b/src/iocore/net/SSLConfig.cc
index 8c048d17d2..72b552a4a8 100644
--- a/src/iocore/net/SSLConfig.cc
+++ b/src/iocore/net/SSLConfig.cc
@@ -47,10 +47,10 @@
#include "P_SSLClientUtils.h"
#include "P_SSLCertLookup.h"
#include "P_TLSKeyLogger.h"
-#include "SSLDiags.h"
-#include "SSLSessionCache.h"
-#include "SSLSessionTicket.h"
-#include "YamlSNIConfig.h"
+#include "iocore/net/SSLDiags.h"
+#include "iocore/net/SSLSessionCache.h"
+#include "iocore/net/SSLSessionTicket.h"
+#include "iocore/net/YamlSNIConfig.h"
int SSLConfig::config_index = 0;
int SSLConfig::configids[] = {0, 0};
diff --git a/src/iocore/net/SSLDiags.cc b/src/iocore/net/SSLDiags.cc
index d78ffbad2f..17b13b4eeb 100644
--- a/src/iocore/net/SSLDiags.cc
+++ b/src/iocore/net/SSLDiags.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "SSLDiags.h"
+#include "iocore/net/SSLDiags.h"
#include <openssl/err.h>
#include "P_Net.h"
-#include "SSLStats.h"
+#include "iocore/net/SSLStats.h"
#include "P_SSLNetVConnection.h"
static DbgCtl ssl_diags_dbg_ctl{"ssl-diag"};
diff --git a/src/iocore/net/SSLNetProcessor.cc b/src/iocore/net/SSLNetProcessor.cc
index 00ec6363a5..94ceddf864 100644
--- a/src/iocore/net/SSLNetProcessor.cc
+++ b/src/iocore/net/SSLNetProcessor.cc
@@ -26,7 +26,7 @@
#include "records/RecHttp.h"
#include "P_SSLUtils.h"
#include "P_OCSPStapling.h"
-#include "SSLStats.h"
+#include "iocore/net/SSLStats.h"
#include "P_SSLNetProcessor.h"
#include "P_SSLNetAccept.h"
#include "P_SSLNetVConnection.h"
diff --git a/src/iocore/net/SSLNetVConnection.cc b/src/iocore/net/SSLNetVConnection.cc
index fa5f9d34b7..78a943c9c1 100644
--- a/src/iocore/net/SSLNetVConnection.cc
+++ b/src/iocore/net/SSLNetVConnection.cc
@@ -28,8 +28,8 @@
#include "tscore/TSSystemState.h"
#include "api/InkAPIInternal.h" // Added to include the ssl_hook definitions
-#include "ProxyProtocol.h"
-#include "SSLSNIConfig.h"
+#include "iocore/net/ProxyProtocol.h"
+#include "iocore/net/SSLSNIConfig.h"
#include "P_Net.h"
#include "P_SSLUtils.h"
@@ -37,10 +37,10 @@
#include "P_SSLConfig.h"
#include "P_SSLClientUtils.h"
#include "P_SSLNetVConnection.h"
-#include "BIO_fastopen.h"
-#include "SSLAPIHooks.h"
-#include "SSLStats.h"
-#include "TLSALPNSupport.h"
+#include "iocore/net/BIO_fastopen.h"
+#include "iocore/net/SSLAPIHooks.h"
+#include "iocore/net/SSLStats.h"
+#include "iocore/net/TLSALPNSupport.h"
#include <netinet/in.h>
diff --git a/src/iocore/net/SSLSNIConfig.cc b/src/iocore/net/SSLSNIConfig.cc
index 03ce25c4d4..d17b241527 100644
--- a/src/iocore/net/SSLSNIConfig.cc
+++ b/src/iocore/net/SSLSNIConfig.cc
@@ -29,7 +29,7 @@
SNI based Configuration in ATS
****************************************************************************/
-#include "SSLSNIConfig.h"
+#include "iocore/net/SSLSNIConfig.h"
#include "P_SNIActionPerformer.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/net/SSLSessionCache.cc b/src/iocore/net/SSLSessionCache.cc
index e978ffc3d2..317b3df253 100644
--- a/src/iocore/net/SSLSessionCache.cc
+++ b/src/iocore/net/SSLSessionCache.cc
@@ -20,8 +20,8 @@
*/
#include "P_SSLConfig.h"
-#include "SSLSessionCache.h"
-#include "SSLStats.h"
+#include "iocore/net/SSLSessionCache.h"
+#include "iocore/net/SSLStats.h"
#include <cstring>
#include <memory>
diff --git a/src/iocore/net/SSLSessionTicket.cc b/src/iocore/net/SSLSessionTicket.cc
index 591e71aea0..c27dc05adb 100644
--- a/src/iocore/net/SSLSessionTicket.cc
+++ b/src/iocore/net/SSLSessionTicket.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "SSLSessionTicket.h"
+#include "iocore/net/SSLSessionTicket.h"
#if TS_HAS_TLS_SESSION_TICKET
#include "P_SSLCertLookup.h"
-#include "TLSSessionResumptionSupport.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
void
ssl_session_ticket_free(void * /*parent*/, void *ptr, CRYPTO_EX_DATA * /*ad*/, int /*idx*/, long /*argl*/, void * /*argp*/)
diff --git a/src/iocore/net/SSLStats.cc b/src/iocore/net/SSLStats.cc
index daac7be25e..2de69d56d0 100644
--- a/src/iocore/net/SSLStats.cc
+++ b/src/iocore/net/SSLStats.cc
@@ -21,13 +21,13 @@
limitations under the License.
*/
-#include "SSLStats.h"
+#include "iocore/net/SSLStats.h"
#include <openssl/err.h>
#include "P_SSLConfig.h"
#include "P_SSLUtils.h"
-#include "records/P_RecProcess.h"
+#include "../../records/P_RecProcess.h"
SSLStatsBlock ssl_rsb;
std::unordered_map<std::string, ts::Metrics::IntType *> cipher_map;
diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc
index 2e5cdd8a4e..2b9e72abf4 100644
--- a/src/iocore/net/SSLUtils.cc
+++ b/src/iocore/net/SSLUtils.cc
@@ -40,17 +40,17 @@
#include "P_OCSPStapling.h"
#include "P_SSLConfig.h"
#include "P_TLSKeyLogger.h"
-#include "BoringSSLUtils.h"
-#include "ProxyProtocol.h"
-#include "SSLAPIHooks.h"
-#include "SSLSessionCache.h"
-#include "SSLSessionTicket.h"
-#include "SSLDynlock.h"
-#include "SSLDiags.h"
-#include "SSLStats.h"
-#include "TLSSessionResumptionSupport.h"
+#include "iocore/net/BoringSSLUtils.h"
+#include "iocore/net/ProxyProtocol.h"
+#include "iocore/net/SSLAPIHooks.h"
+#include "iocore/net/SSLSessionCache.h"
+#include "iocore/net/SSLSessionTicket.h"
+#include "iocore/net/SSLDynlock.h"
+#include "iocore/net/SSLDiags.h"
+#include "iocore/net/SSLStats.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
#if TS_USE_QUIC == 1
-#include "QUICSupport.h"
+#include "iocore/net/QUICSupport.h"
#endif
#include "P_SSLNetVConnection.h"
diff --git a/src/iocore/net/TLSBasicSupport.cc b/src/iocore/net/TLSBasicSupport.cc
index 8e91d8b9f8..098859421b 100644
--- a/src/iocore/net/TLSBasicSupport.cc
+++ b/src/iocore/net/TLSBasicSupport.cc
@@ -22,8 +22,8 @@
limitations under the License.
*/
-#include "TLSBasicSupport.h"
-#include "SSLStats.h"
+#include "iocore/net/TLSBasicSupport.h"
+#include "iocore/net/SSLStats.h"
int TLSBasicSupport::_ex_data_index = -1;
diff --git a/src/iocore/net/TLSCertSwitchSupport.cc b/src/iocore/net/TLSCertSwitchSupport.cc
index 4ee68605d7..f1b363aa96 100644
--- a/src/iocore/net/TLSCertSwitchSupport.cc
+++ b/src/iocore/net/TLSCertSwitchSupport.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "TLSCertSwitchSupport.h"
+#include "iocore/net/TLSCertSwitchSupport.h"
#include "P_SSLCertLookup.h"
int TLSCertSwitchSupport::_ex_data_index = -1;
diff --git a/src/iocore/net/TLSEarlyDataSupport.cc b/src/iocore/net/TLSEarlyDataSupport.cc
index 28381836b5..adfa30a202 100644
--- a/src/iocore/net/TLSEarlyDataSupport.cc
+++ b/src/iocore/net/TLSEarlyDataSupport.cc
@@ -23,7 +23,7 @@
*/
#include <openssl/ssl.h>
-#include "TLSEarlyDataSupport.h"
+#include "iocore/net/TLSEarlyDataSupport.h"
#include "tscore/ink_config.h"
#include "tscore/ink_assert.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/net/TLSSNISupport.cc b/src/iocore/net/TLSSNISupport.cc
index e4952435e2..9cb14315db 100644
--- a/src/iocore/net/TLSSNISupport.cc
+++ b/src/iocore/net/TLSSNISupport.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
#include "P_SSLNextProtocolAccept.h"
-#include "SSLSNIConfig.h"
-#include "TLSSNISupport.h"
+#include "iocore/net/SSLSNIConfig.h"
+#include "iocore/net/TLSSNISupport.h"
#include "tscore/ink_assert.h"
#include "tscore/ink_inet.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/net/TLSSessionResumptionSupport.cc b/src/iocore/net/TLSSessionResumptionSupport.cc
index 5085a9e7b7..3616828a4b 100644
--- a/src/iocore/net/TLSSessionResumptionSupport.cc
+++ b/src/iocore/net/TLSSessionResumptionSupport.cc
@@ -24,11 +24,11 @@
// Check if the ticket_key callback #define is available, and if so, enable session tickets.
-#include "TLSSessionResumptionSupport.h"
-#include "SSLAPIHooks.h"
+#include "iocore/net/TLSSessionResumptionSupport.h"
+#include "iocore/net/SSLAPIHooks.h"
#include "P_SSLConfig.h"
-#include "SSLStats.h"
+#include "iocore/net/SSLStats.h"
#include <openssl/evp.h>
#include <openssl/hmac.h>
#ifdef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
diff --git a/src/iocore/net/TLSTunnelSupport.cc b/src/iocore/net/TLSTunnelSupport.cc
index aedfaa3987..8b806aaf36 100644
--- a/src/iocore/net/TLSTunnelSupport.cc
+++ b/src/iocore/net/TLSTunnelSupport.cc
@@ -22,9 +22,9 @@
limitations under the License.
*/
-#include "PreWarm.h"
-#include "SSLTypes.h"
-#include "TLSTunnelSupport.h"
+#include "iocore/net/PreWarm.h"
+#include "iocore/net/SSLTypes.h"
+#include "iocore/net/TLSTunnelSupport.h"
#include "tscore/ink_assert.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/net/UDPEventIO.cc b/src/iocore/net/UDPEventIO.cc
index 2c55c0125a..7d599acf87 100644
--- a/src/iocore/net/UDPEventIO.cc
+++ b/src/iocore/net/UDPEventIO.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "UDPEventIO.h"
+#include "iocore/net/UDPEventIO.h"
#include "P_UDPNet.h"
int
diff --git a/src/iocore/net/UnixNet.cc b/src/iocore/net/UnixNet.cc
index 5ea69d3f1e..3f970c6f61 100644
--- a/src/iocore/net/UnixNet.cc
+++ b/src/iocore/net/UnixNet.cc
@@ -21,13 +21,13 @@
limitations under the License.
*/
-#include "AsyncSignalEventIO.h"
+#include "iocore/net/AsyncSignalEventIO.h"
#include "P_Net.h"
#include "P_UnixNet.h"
#include "tscore/ink_hrtime.h"
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#endif
ink_hrtime last_throttle_warning;
diff --git a/src/iocore/net/UnixNetPages.cc b/src/iocore/net/UnixNetPages.cc
index f4433529fb..7c006e7fda 100644
--- a/src/iocore/net/UnixNetPages.cc
+++ b/src/iocore/net/UnixNetPages.cc
@@ -23,8 +23,8 @@
#include "tscore/ink_platform.h"
#include "P_Net.h"
-#include "Show.h"
-#include "Tasks.h"
+#include "proxy/Show.h"
+#include "iocore/eventsystem/Tasks.h"
struct ShowNet;
using ShowNetEventHandler = int (ShowNet::*)(int, Event *);
diff --git a/src/iocore/net/UnixNetProcessor.cc b/src/iocore/net/UnixNetProcessor.cc
index 11e19fc949..45e199a920 100644
--- a/src/iocore/net/UnixNetProcessor.cc
+++ b/src/iocore/net/UnixNetProcessor.cc
@@ -28,7 +28,7 @@
#include "P_SSLNextProtocolAccept.h"
// For Stat Pages
-#include "StatPages.h"
+#include "proxy/StatPages.h"
// naVecMutext protects access to naVec.
Ptr<ProxyMutex> naVecMutex;
diff --git a/src/iocore/net/UnixUDPNet.cc b/src/iocore/net/UnixUDPNet.cc
index 8a13ee16b5..117a19f4f2 100644
--- a/src/iocore/net/UnixUDPNet.cc
+++ b/src/iocore/net/UnixUDPNet.cc
@@ -34,10 +34,10 @@
#define __APPLE_USE_RFC_3542
#endif
-#include "AsyncSignalEventIO.h"
-#include "AIO.h"
+#include "iocore/net/AsyncSignalEventIO.h"
+#include "iocore/aio/AIO.h"
#if TS_USE_LINUX_IO_URING
-#include "IO_URING.h"
+#include "iocore/io_uring/IO_URING.h"
#endif
#include "P_Net.h"
#include "P_UDPNet.h"
diff --git a/src/iocore/net/YamlSNIConfig.cc b/src/iocore/net/YamlSNIConfig.cc
index 3f689391da..844e6a0562 100644
--- a/src/iocore/net/YamlSNIConfig.cc
+++ b/src/iocore/net/YamlSNIConfig.cc
@@ -19,7 +19,7 @@
limitations under the License.
*/
-#include "YamlSNIConfig.h"
+#include "iocore/net/YamlSNIConfig.h"
#include <utility>
#include <unordered_map>
diff --git a/src/iocore/net/libinknet_stub.cc b/src/iocore/net/libinknet_stub.cc
index 98fce8d5ed..9eff56e3e9 100644
--- a/src/iocore/net/libinknet_stub.cc
+++ b/src/iocore/net/libinknet_stub.cc
@@ -25,7 +25,7 @@ class EThread;
class Continuation;
#include "P_UnixNet.h"
-#include "P_DNSConnection.h"
+#include "../dns/P_DNSConnection.h"
int
DNSConnection::close()
{
@@ -39,14 +39,14 @@ DNSConnection::trigger()
ink_assert(false);
}
-#include "StatPages.h"
+#include "proxy/StatPages.h"
void
StatPagesManager::register_http(char const *, Action *(*)(Continuation *, HTTPHdr *))
{
ink_assert(false);
}
-#include "ParentSelection.h"
+#include "proxy/ParentSelection.h"
void
SocksServerConfig::startup()
{
@@ -68,7 +68,7 @@ ParentConfigParams::nextParent(HttpRequestData *, ParentResult *, unsigned int,
}
#include "api/InkAPIInternal.h"
-#include "ControlMatcher.h"
+#include "proxy/ControlMatcher.h"
char *
HttpRequestData::get_string()
{
diff --git a/src/iocore/net/quic/CMakeLists.txt b/src/iocore/net/quic/CMakeLists.txt
index 442f7058c7..a16e19e9eb 100644
--- a/src/iocore/net/quic/CMakeLists.txt
+++ b/src/iocore/net/quic/CMakeLists.txt
@@ -34,11 +34,4 @@ add_library(
)
add_library(ts::quic ALIAS quic)
-target_include_directories(
- quic
- PUBLIC ${CMAKE_SOURCE_DIR}/include/iocore/net/quic
- # private headers
- PRIVATE ${CMAKE_SOURCE_DIR}/src/iocore/net
-)
-
target_link_libraries(quic PUBLIC ts::inkevent ts::inknet ts::tscore OpenSSL::Crypto OpenSSL::SSL quiche::quiche)
diff --git a/src/iocore/net/quic/QUICAckFrameCreator.cc b/src/iocore/net/quic/QUICAckFrameCreator.cc
index 5425b7338f..adc7648ee3 100644
--- a/src/iocore/net/quic/QUICAckFrameCreator.cc
+++ b/src/iocore/net/quic/QUICAckFrameCreator.cc
@@ -21,9 +21,9 @@
* limitations under the License.
*/
-#include "EventSystem.h"
-#include "QUICAckFrameCreator.h"
-#include "QUICConfig.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/quic/QUICAckFrameCreator.h"
+#include "iocore/net/quic/QUICConfig.h"
#include <algorithm>
QUICAckFrameManager::QUICAckFrameManager()
diff --git a/src/iocore/net/quic/QUICAddrVerifyState.cc b/src/iocore/net/quic/QUICAddrVerifyState.cc
index 6db501961c..d535044343 100644
--- a/src/iocore/net/quic/QUICAddrVerifyState.cc
+++ b/src/iocore/net/quic/QUICAddrVerifyState.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "QUICAddrVerifyState.h"
+#include "iocore/net/quic/QUICAddrVerifyState.h"
void
QUICAddrVerifyState::fill(uint32_t windows)
diff --git a/src/iocore/net/quic/QUICAltConnectionManager.cc b/src/iocore/net/quic/QUICAltConnectionManager.cc
index 10f6ab54e5..633db9208e 100644
--- a/src/iocore/net/quic/QUICAltConnectionManager.cc
+++ b/src/iocore/net/quic/QUICAltConnectionManager.cc
@@ -25,9 +25,9 @@
#include "tscore/ink_assert.h"
#include "tscore/ink_defs.h"
-#include "QUICAltConnectionManager.h"
-#include "QUICConnectionTable.h"
-#include "QUICResetTokenTable.h"
+#include "iocore/net/quic/QUICAltConnectionManager.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
static constexpr char V_DEBUG_TAG[] = "v_quic_alt_con";
diff --git a/src/iocore/net/quic/QUICApplication.cc b/src/iocore/net/quic/QUICApplication.cc
index d6dc495e2f..255ff2efa6 100644
--- a/src/iocore/net/quic/QUICApplication.cc
+++ b/src/iocore/net/quic/QUICApplication.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICApplication.h"
-#include "QUICStream.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICStream.h"
//
// QUICApplication
diff --git a/src/iocore/net/quic/QUICApplicationMap.cc b/src/iocore/net/quic/QUICApplicationMap.cc
index ff95226930..668f697b15 100644
--- a/src/iocore/net/quic/QUICApplicationMap.cc
+++ b/src/iocore/net/quic/QUICApplicationMap.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include <QUICApplicationMap.h>
+#include "iocore/net/quic/QUICApplicationMap.h"
QUICApplication *
QUICApplicationMap::get(QUICStreamId id)
diff --git a/src/iocore/net/quic/QUICBidirectionalStream.cc b/src/iocore/net/quic/QUICBidirectionalStream.cc
index 18c54496cf..46afe899cb 100644
--- a/src/iocore/net/quic/QUICBidirectionalStream.cc
+++ b/src/iocore/net/quic/QUICBidirectionalStream.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICBidirectionalStream.h"
-#include "QUICStreamAdapter.h"
+#include "iocore/net/quic/QUICBidirectionalStream.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
//
// QUICBidirectionalStream
diff --git a/src/iocore/net/quic/QUICConfig.cc b/src/iocore/net/quic/QUICConfig.cc
index dbf98c0446..74c42f2fca 100644
--- a/src/iocore/net/quic/QUICConfig.cc
+++ b/src/iocore/net/quic/QUICConfig.cc
@@ -21,17 +21,17 @@
* limitations under the License.
*/
-#include "QUICConfig.h"
+#include "iocore/net/quic/QUICConfig.h"
#include <openssl/ssl.h>
-#include <records/RecHttp.h>
+#include "records/RecHttp.h"
-#include "P_SSLConfig.h"
-#include "P_TLSKeyLogger.h"
+#include "../P_SSLConfig.h"
+#include "../P_TLSKeyLogger.h"
-#include "QUICGlobals.h"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
int QUICConfig::_config_id = 0;
int QUICConfigParams::_connection_table_size = 65521;
diff --git a/src/iocore/net/quic/QUICConnectionTable.cc b/src/iocore/net/quic/QUICConnectionTable.cc
index b400beb4f0..35e14f2177 100644
--- a/src/iocore/net/quic/QUICConnectionTable.cc
+++ b/src/iocore/net/quic/QUICConnectionTable.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "QUICConnectionTable.h"
+#include "iocore/net/quic/QUICConnectionTable.h"
QUICConnectionTable::~QUICConnectionTable()
{
diff --git a/src/iocore/net/quic/QUICContext.cc b/src/iocore/net/quic/QUICContext.cc
index 18b573c9f7..5769e112e5 100644
--- a/src/iocore/net/quic/QUICContext.cc
+++ b/src/iocore/net/quic/QUICContext.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "QUICContext.h"
-#include "QUICConnection.h"
-#include "QUICLossDetector.h"
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICContext.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICLossDetector.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
class QUICCCConfigQCP : public QUICCCConfig
{
diff --git a/src/iocore/net/quic/QUICCryptoStream.cc b/src/iocore/net/quic/QUICCryptoStream.cc
index 475dbd4e50..7953f21cd3 100644
--- a/src/iocore/net/quic/QUICCryptoStream.cc
+++ b/src/iocore/net/quic/QUICCryptoStream.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICCryptoStream.h"
+#include "iocore/net/quic/QUICCryptoStream.h"
constexpr uint32_t MAX_CRYPTO_FRAME_OVERHEAD = 16;
diff --git a/src/iocore/net/quic/QUICDebugNames.cc b/src/iocore/net/quic/QUICDebugNames.cc
index a824a0215c..a7aff83cfa 100644
--- a/src/iocore/net/quic/QUICDebugNames.cc
+++ b/src/iocore/net/quic/QUICDebugNames.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICDebugNames.h"
-#include "VConnection.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/eventsystem/VConnection.h"
const char *
QUICDebugNames::packet_type(QUICPacketType type)
diff --git a/src/iocore/net/quic/QUICEchoApp.cc b/src/iocore/net/quic/QUICEchoApp.cc
index 35ea791f72..32b40c580a 100644
--- a/src/iocore/net/quic/QUICEchoApp.cc
+++ b/src/iocore/net/quic/QUICEchoApp.cc
@@ -21,11 +21,11 @@
* limitations under the License.
*/
-#include "QUICEchoApp.h"
+#include "iocore/net/quic/QUICEchoApp.h"
-#include "P_Net.h"
-#include "P_VConnection.h"
-#include "QUICDebugNames.h"
+#include "../P_Net.h"
+#include "../../eventsystem/P_VConnection.h"
+#include "iocore/net/quic/QUICDebugNames.h"
static constexpr char tag[] = "quic_echo_app";
diff --git a/src/iocore/net/quic/QUICFlowController.cc b/src/iocore/net/quic/QUICFlowController.cc
index 3d14d35b51..709bd0720e 100644
--- a/src/iocore/net/quic/QUICFlowController.cc
+++ b/src/iocore/net/quic/QUICFlowController.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICFlowController.h"
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFlowController.h"
+#include "iocore/net/quic/QUICFrame.h"
//
// QUICRateAnalyzer
diff --git a/src/iocore/net/quic/QUICFrame.cc b/src/iocore/net/quic/QUICFrame.cc
index 471524d236..651564739c 100644
--- a/src/iocore/net/quic/QUICFrame.cc
+++ b/src/iocore/net/quic/QUICFrame.cc
@@ -21,14 +21,14 @@
* limitations under the License.
*/
-#include "QUICFrame.h"
+#include "iocore/net/quic/QUICFrame.h"
#include <algorithm>
-#include "QUICStream.h"
-#include "QUICIntUtil.h"
-#include "QUICDebugNames.h"
-#include "QUICPacket.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICPacket.h"
#define LEFT_SPACE(pos) ((size_t)(buf + len - pos))
#define FRAME_SIZE(pos) (pos - buf)
diff --git a/src/iocore/net/quic/QUICFrameDispatcher.cc b/src/iocore/net/quic/QUICFrameDispatcher.cc
index ef846c9bb5..0cd09b0ba0 100644
--- a/src/iocore/net/quic/QUICFrameDispatcher.cc
+++ b/src/iocore/net/quic/QUICFrameDispatcher.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICFrameDispatcher.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICFrameDispatcher.h"
+#include "iocore/net/quic/QUICDebugNames.h"
static constexpr char tag[] = "quic_net";
static constexpr char v_tag[] = "v_quic_net";
diff --git a/src/iocore/net/quic/QUICFrameGenerator.cc b/src/iocore/net/quic/QUICFrameGenerator.cc
index 908374e67f..6e1c7fee06 100644
--- a/src/iocore/net/quic/QUICFrameGenerator.cc
+++ b/src/iocore/net/quic/QUICFrameGenerator.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
// QUICFrameGenerator
void
diff --git a/src/iocore/net/quic/QUICFrameRetransmitter.cc b/src/iocore/net/quic/QUICFrameRetransmitter.cc
index bedc6548bc..ebec143d7b 100644
--- a/src/iocore/net/quic/QUICFrameRetransmitter.cc
+++ b/src/iocore/net/quic/QUICFrameRetransmitter.cc
@@ -23,9 +23,9 @@
#include "tscore/Diags.h"
-#include "QUICFrameRetransmitter.h"
-#include "QUICFrameGenerator.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICFrameRetransmitter.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICDebugNames.h"
ClassAllocator<QUICFrameInformation> quicFrameInformationAllocator("quicFrameInformationAllocator");
diff --git a/src/iocore/net/quic/QUICGlobals.cc b/src/iocore/net/quic/QUICGlobals.cc
index baae4b232b..e39085a60f 100644
--- a/src/iocore/net/quic/QUICGlobals.cc
+++ b/src/iocore/net/quic/QUICGlobals.cc
@@ -21,18 +21,18 @@
* limitations under the License.
*/
-#include "QUICGlobals.h"
+#include "iocore/net/quic/QUICGlobals.h"
#include <cstring>
#include <fstream>
-#include "QUICMultiCertConfigLoader.h"
+#include "iocore/net/QUICMultiCertConfigLoader.h"
-#include "QUICStats.h"
-#include "QUICConfig.h"
-#include "QUICConnection.h"
+#include "iocore/net/quic/QUICStats.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICConnection.h"
-#include "QUICTLS.h"
+#include "iocore/net/quic/QUICTLS.h"
#include <openssl/ssl.h>
#define QUICGlobalDebug(fmt, ...) Debug("quic_global", fmt, ##__VA_ARGS__)
diff --git a/src/iocore/net/quic/QUICHKDF.cc b/src/iocore/net/quic/QUICHKDF.cc
index 964e47b8e4..1665dfa65f 100644
--- a/src/iocore/net/quic/QUICHKDF.cc
+++ b/src/iocore/net/quic/QUICHKDF.cc
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "QUICHKDF.h"
+#include "iocore/net/quic/QUICHKDF.h"
#include <cstdio>
#include <cstring>
diff --git a/src/iocore/net/quic/QUICHandshake.cc b/src/iocore/net/quic/QUICHandshake.cc
index 74b5e8d6a9..92945c633d 100644
--- a/src/iocore/net/quic/QUICHandshake.cc
+++ b/src/iocore/net/quic/QUICHandshake.cc
@@ -21,16 +21,16 @@
* limitations under the License.
*/
-#include "QUICHandshake.h"
+#include "iocore/net/quic/QUICHandshake.h"
#include <utility>
-#include "QUICEvents.h"
-#include "QUICGlobals.h"
-#include "QUICHandshakeProtocol.h"
-#include "QUICPacketFactory.h"
-#include "QUICVersionNegotiator.h"
-#include "QUICConfig.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICHandshakeProtocol.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICVersionNegotiator.h"
+#include "iocore/net/quic/QUICConfig.h"
#define QUICHSDebug(fmt, ...) Debug("quic_handshake", "[%s] " fmt, this->_qc->cids().data(), ##__VA_ARGS__)
diff --git a/src/iocore/net/quic/QUICIncomingFrameBuffer.cc b/src/iocore/net/quic/QUICIncomingFrameBuffer.cc
index 373d009312..e96444d001 100644
--- a/src/iocore/net/quic/QUICIncomingFrameBuffer.cc
+++ b/src/iocore/net/quic/QUICIncomingFrameBuffer.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICIncomingFrameBuffer.h"
+#include "iocore/net/quic/QUICIncomingFrameBuffer.h"
//
// QUICIncomingFrameBuffer
diff --git a/src/iocore/net/quic/QUICIntUtil.cc b/src/iocore/net/quic/QUICIntUtil.cc
index 26159d7477..80864cd26a 100644
--- a/src/iocore/net/quic/QUICIntUtil.cc
+++ b/src/iocore/net/quic/QUICIntUtil.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICIntUtil.h"
+#include "iocore/net/quic/QUICIntUtil.h"
#include "tscore/ink_endian.h"
#include <memory>
#include <cstring>
diff --git a/src/iocore/net/quic/QUICKeyGenerator.cc b/src/iocore/net/quic/QUICKeyGenerator.cc
index 50c2fa5f35..ac34926163 100644
--- a/src/iocore/net/quic/QUICKeyGenerator.cc
+++ b/src/iocore/net/quic/QUICKeyGenerator.cc
@@ -21,15 +21,15 @@
* limitations under the License.
*/
-#include "QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
#include <openssl/ssl.h>
#include "tscore/ink_assert.h"
#include "tscore/Diags.h"
-#include "QUICHKDF.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICHKDF.h"
+#include "iocore/net/quic/QUICDebugNames.h"
using namespace std::literals;
diff --git a/src/iocore/net/quic/QUICKeyGenerator_boringssl.cc b/src/iocore/net/quic/QUICKeyGenerator_boringssl.cc
index ecc9cdfa83..507fc84369 100644
--- a/src/iocore/net/quic/QUICKeyGenerator_boringssl.cc
+++ b/src/iocore/net/quic/QUICKeyGenerator_boringssl.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
#include "tscore/ink_assert.h"
-#include "QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
#include <openssl/ssl.h>
size_t
diff --git a/src/iocore/net/quic/QUICKeyGenerator_openssl.cc b/src/iocore/net/quic/QUICKeyGenerator_openssl.cc
index f85f475888..65a6e67571 100644
--- a/src/iocore/net/quic/QUICKeyGenerator_openssl.cc
+++ b/src/iocore/net/quic/QUICKeyGenerator_openssl.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
#include "tscore/ink_assert.h"
-#include "QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
#include <openssl/ssl.h>
size_t
diff --git a/src/iocore/net/quic/QUICLossDetector.cc b/src/iocore/net/quic/QUICLossDetector.cc
index 8cc69914be..b8871a8327 100644
--- a/src/iocore/net/quic/QUICLossDetector.cc
+++ b/src/iocore/net/quic/QUICLossDetector.cc
@@ -21,17 +21,17 @@
* limitations under the License.
*/
-#include "QUICLossDetector.h"
+#include "iocore/net/quic/QUICLossDetector.h"
#include "tscore/ink_assert.h"
-#include "QUICConfig.h"
-#include "QUICEvents.h"
-#include "QUICDebugNames.h"
-#include "QUICFrameGenerator.h"
-#include "QUICPinger.h"
-#include "QUICPadder.h"
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICConfig.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICFrameGenerator.h"
+#include "iocore/net/quic/QUICPinger.h"
+#include "iocore/net/quic/QUICPadder.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
#define QUICLDDebug(fmt, ...) \
Debug("quic_loss_detector", "[%s] " fmt, this->_context.connection_info()->cids().data(), ##__VA_ARGS__)
diff --git a/src/iocore/net/quic/QUICPacket.cc b/src/iocore/net/quic/QUICPacket.cc
index f5597be999..decf69610c 100644
--- a/src/iocore/net/quic/QUICPacket.cc
+++ b/src/iocore/net/quic/QUICPacket.cc
@@ -21,16 +21,16 @@
* limitations under the License.
*/
-#include "QUICPacket.h"
+#include "iocore/net/quic/QUICPacket.h"
#include <algorithm>
#include <tscore/ink_assert.h>
#include <tscore/Diags.h>
-#include "QUICIntUtil.h"
-#include "QUICDebugNames.h"
-#include "QUICRetryIntegrityTag.h"
+#include "iocore/net/quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICRetryIntegrityTag.h"
using namespace std::literals;
static constexpr uint64_t aead_tag_len = 16;
diff --git a/src/iocore/net/quic/QUICPacketFactory.cc b/src/iocore/net/quic/QUICPacketFactory.cc
index 279cf7d21e..7d69b71c9a 100644
--- a/src/iocore/net/quic/QUICPacketFactory.cc
+++ b/src/iocore/net/quic/QUICPacketFactory.cc
@@ -21,9 +21,9 @@
* limitations under the License.
*/
-#include "QUICPacketFactory.h"
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICDebugNames.h"
using namespace std::literals;
static constexpr std::string_view tag = "quic_packet"sv;
diff --git a/src/iocore/net/quic/QUICPacketHeaderProtector.cc b/src/iocore/net/quic/QUICPacketHeaderProtector.cc
index f6a71b4da6..5fc9640af0 100644
--- a/src/iocore/net/quic/QUICPacketHeaderProtector.cc
+++ b/src/iocore/net/quic/QUICPacketHeaderProtector.cc
@@ -21,10 +21,10 @@
* limitations under the License.
*/
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPacketHeaderProtector.h"
-#include "QUICDebugNames.h"
-#include "QUICPacket.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICPacket.h"
#include "tscore/Diags.h"
diff --git a/src/iocore/net/quic/QUICPacketHeaderProtector_boringssl.cc b/src/iocore/net/quic/QUICPacketHeaderProtector_boringssl.cc
index e27d2068d0..9b8283b7bf 100644
--- a/src/iocore/net/quic/QUICPacketHeaderProtector_boringssl.cc
+++ b/src/iocore/net/quic/QUICPacketHeaderProtector_boringssl.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
#include <openssl/chacha.h>
diff --git a/src/iocore/net/quic/QUICPacketHeaderProtector_openssl.cc b/src/iocore/net/quic/QUICPacketHeaderProtector_openssl.cc
index c7d65a19e1..10d316fbfb 100644
--- a/src/iocore/net/quic/QUICPacketHeaderProtector_openssl.cc
+++ b/src/iocore/net/quic/QUICPacketHeaderProtector_openssl.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
bool
QUICPacketHeaderProtector::_generate_mask(uint8_t *mask, const uint8_t *sample, const uint8_t *key, const EVP_CIPHER *cipher) const
diff --git a/src/iocore/net/quic/QUICPacketPayloadProtector.cc b/src/iocore/net/quic/QUICPacketPayloadProtector.cc
index 4b8291c8a3..7a8afe73ff 100644
--- a/src/iocore/net/quic/QUICPacketPayloadProtector.cc
+++ b/src/iocore/net/quic/QUICPacketPayloadProtector.cc
@@ -21,9 +21,9 @@
* limitations under the License.
*/
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPacketPayloadProtector.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketPayloadProtector.h"
+#include "iocore/net/quic/QUICDebugNames.h"
static constexpr char tag[] = "quic_ppp";
diff --git a/src/iocore/net/quic/QUICPacketPayloadProtector_boringssl.cc b/src/iocore/net/quic/QUICPacketPayloadProtector_boringssl.cc
index 336f458fb1..caf3e85c63 100644
--- a/src/iocore/net/quic/QUICPacketPayloadProtector_boringssl.cc
+++ b/src/iocore/net/quic/QUICPacketPayloadProtector_boringssl.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPacketPayloadProtector.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketPayloadProtector.h"
#include "tscore/Diags.h"
static constexpr char tag[] = "quic_ppp";
diff --git a/src/iocore/net/quic/QUICPacketPayloadProtector_openssl.cc b/src/iocore/net/quic/QUICPacketPayloadProtector_openssl.cc
index b62d67d386..f1283aecf5 100644
--- a/src/iocore/net/quic/QUICPacketPayloadProtector_openssl.cc
+++ b/src/iocore/net/quic/QUICPacketPayloadProtector_openssl.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPacketPayloadProtector.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketPayloadProtector.h"
#include "tscore/Diags.h"
static constexpr char tag[] = "quic_ppp";
diff --git a/src/iocore/net/quic/QUICPacketProtectionKeyInfo.cc b/src/iocore/net/quic/QUICPacketProtectionKeyInfo.cc
index 55c2e2ee5b..31fe73c426 100644
--- a/src/iocore/net/quic/QUICPacketProtectionKeyInfo.cc
+++ b/src/iocore/net/quic/QUICPacketProtectionKeyInfo.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
void
QUICPacketProtectionKeyInfo::set_context(Context ctx)
diff --git a/src/iocore/net/quic/QUICPacketReceiveQueue.cc b/src/iocore/net/quic/QUICPacketReceiveQueue.cc
index eaadac7db9..29b96852e1 100644
--- a/src/iocore/net/quic/QUICPacketReceiveQueue.cc
+++ b/src/iocore/net/quic/QUICPacketReceiveQueue.cc
@@ -21,13 +21,13 @@
* limitations under the License.
*/
-#include "QUICPacketReceiveQueue.h"
-#include "QUICPacketHeaderProtector.h"
-#include "QUICPacketFactory.h"
-#include "QUICIntUtil.h"
+#include "iocore/net/quic/QUICPacketReceiveQueue.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICIntUtil.h"
-#include "P_UDPConnection.h"
-#include "UDPPacket.h"
+#include "../P_UDPConnection.h"
+#include "iocore/net/UDPPacket.h"
static bool
is_vn(QUICVersion v)
diff --git a/src/iocore/net/quic/QUICPadder.cc b/src/iocore/net/quic/QUICPadder.cc
index 0ae913ebb9..7cf3df352d 100644
--- a/src/iocore/net/quic/QUICPadder.cc
+++ b/src/iocore/net/quic/QUICPadder.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "QUICIntUtil.h"
-#include "QUICPadder.h"
+#include "iocore/net/quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICPadder.h"
static constexpr uint32_t MINIMUM_INITIAL_PACKET_SIZE = 1200;
static constexpr uint32_t MIN_PKT_PAYLOAD_LEN = 3; ///< Minimum payload length for sampling for header protection
diff --git a/src/iocore/net/quic/QUICPathManager.cc b/src/iocore/net/quic/QUICPathManager.cc
index 582bea5af4..ba7973fe88 100644
--- a/src/iocore/net/quic/QUICPathManager.cc
+++ b/src/iocore/net/quic/QUICPathManager.cc
@@ -21,9 +21,9 @@
* limitations under the License.
*/
-#include "QUICPathManager.h"
-#include "QUICPathValidator.h"
-#include "QUICConnection.h"
+#include "iocore/net/quic/QUICPathManager.h"
+#include "iocore/net/quic/QUICPathValidator.h"
+#include "iocore/net/quic/QUICConnection.h"
#define QUICDebug(fmt, ...) Debug("quic_path", "[%s] " fmt, this->_cinfo.cids().data(), ##__VA_ARGS__)
diff --git a/src/iocore/net/quic/QUICPathValidator.cc b/src/iocore/net/quic/QUICPathValidator.cc
index 20abbb9dd9..6dfa8f8958 100644
--- a/src/iocore/net/quic/QUICPathValidator.cc
+++ b/src/iocore/net/quic/QUICPathValidator.cc
@@ -22,8 +22,8 @@
*/
#include <chrono>
-#include "QUICPathValidator.h"
-#include "QUICPacket.h"
+#include "iocore/net/quic/QUICPathValidator.h"
+#include "iocore/net/quic/QUICPacket.h"
#define QUICDebug(fmt, ...) Debug("quic_path", "[%s] " fmt, this->_cinfo.cids().data(), ##__VA_ARGS__)
diff --git a/src/iocore/net/quic/QUICPinger.cc b/src/iocore/net/quic/QUICPinger.cc
index 2514c02821..910db2fbb5 100644
--- a/src/iocore/net/quic/QUICPinger.cc
+++ b/src/iocore/net/quic/QUICPinger.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "QUICPinger.h"
+#include "iocore/net/quic/QUICPinger.h"
void
QUICPinger::request(QUICEncryptionLevel level)
diff --git a/src/iocore/net/quic/QUICResetTokenTable.cc b/src/iocore/net/quic/QUICResetTokenTable.cc
index 2980e32268..8396c99740 100644
--- a/src/iocore/net/quic/QUICResetTokenTable.cc
+++ b/src/iocore/net/quic/QUICResetTokenTable.cc
@@ -20,8 +20,8 @@
*/
#include "tscore/Diags.h"
-#include "QUICResetTokenTable.h"
-#include "QUICConnection.h"
+#include "iocore/net/quic/QUICResetTokenTable.h"
+#include "iocore/net/quic/QUICConnection.h"
void
QUICResetTokenTable::insert(const QUICStatelessResetToken token, QUICConnection *connection)
diff --git a/src/iocore/net/quic/QUICRetryIntegrityTag.cc b/src/iocore/net/quic/QUICRetryIntegrityTag.cc
index e8988bac03..6efedcee5c 100644
--- a/src/iocore/net/quic/QUICRetryIntegrityTag.cc
+++ b/src/iocore/net/quic/QUICRetryIntegrityTag.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICRetryIntegrityTag.h"
+#include "iocore/net/quic/QUICRetryIntegrityTag.h"
bool
QUICRetryIntegrityTag::compute(uint8_t *out, QUICVersion version, QUICConnectionId odcid, Ptr<IOBufferBlock> header,
diff --git a/src/iocore/net/quic/QUICStream.cc b/src/iocore/net/quic/QUICStream.cc
index 8753f9dfd2..028e620ece 100644
--- a/src/iocore/net/quic/QUICStream.cc
+++ b/src/iocore/net/quic/QUICStream.cc
@@ -21,9 +21,9 @@
* limitations under the License.
*/
-#include "QUICStream.h"
+#include "iocore/net/quic/QUICStream.h"
-#include "QUICStreamManager.h"
+#include "iocore/net/quic/QUICStreamManager.h"
constexpr uint32_t MAX_STREAM_FRAME_OVERHEAD = 24;
diff --git a/src/iocore/net/quic/QUICStreamAdapter.cc b/src/iocore/net/quic/QUICStreamAdapter.cc
index 8534781f3c..9992b8a661 100644
--- a/src/iocore/net/quic/QUICStreamAdapter.cc
+++ b/src/iocore/net/quic/QUICStreamAdapter.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICStreamAdapter.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
Ptr<IOBufferBlock>
QUICStreamAdapter::read(size_t len)
diff --git a/src/iocore/net/quic/QUICStreamBase.cc b/src/iocore/net/quic/QUICStreamBase.cc
index a2d98a249b..0d4bf43c38 100644
--- a/src/iocore/net/quic/QUICStreamBase.cc
+++ b/src/iocore/net/quic/QUICStreamBase.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICStream.h"
-#include "QUICStream_native.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICStream_native.h"
QUICOffset
QUICStreamBase::final_offset() const
diff --git a/src/iocore/net/quic/QUICStreamFactory.cc b/src/iocore/net/quic/QUICStreamFactory.cc
index 398c637723..d235e326ce 100644
--- a/src/iocore/net/quic/QUICStreamFactory.cc
+++ b/src/iocore/net/quic/QUICStreamFactory.cc
@@ -21,10 +21,10 @@
* limitations under the License.
*/
-#include "QUICStream.h"
-#include "QUICBidirectionalStream.h"
-#include "QUICUnidirectionalStream.h"
-#include "QUICStreamFactory.h"
+#include "iocore/net/quic/QUICStream.h"
+#include "iocore/net/quic/QUICBidirectionalStream.h"
+#include "iocore/net/quic/QUICUnidirectionalStream.h"
+#include "iocore/net/quic/QUICStreamFactory.h"
QUICStreamBase *
QUICStreamFactory::create(QUICStreamId sid, uint64_t local_max_stream_data, uint64_t remote_max_stream_data)
diff --git a/src/iocore/net/quic/QUICStreamManager.cc b/src/iocore/net/quic/QUICStreamManager.cc
index 35d9630aa3..b78db50d6b 100644
--- a/src/iocore/net/quic/QUICStreamManager.cc
+++ b/src/iocore/net/quic/QUICStreamManager.cc
@@ -21,10 +21,10 @@
* limitations under the License.
*/
-#include "QUICStreamManager.h"
+#include "iocore/net/quic/QUICStreamManager.h"
-#include "QUICApplication.h"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICApplication.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
QUICStreamManager::QUICStreamManager(QUICContext *context, QUICApplicationMap *app_map) : _context(context), _app_map(app_map) {}
diff --git a/src/iocore/net/quic/QUICStreamManager_native.cc b/src/iocore/net/quic/QUICStreamManager_native.cc
index cb1d2fd772..f18af932a1 100644
--- a/src/iocore/net/quic/QUICStreamManager_native.cc
+++ b/src/iocore/net/quic/QUICStreamManager_native.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICStreamManager_native.h"
+#include "iocore/net/quic/QUICStreamManager_native.h"
static constexpr char tag[] = "quic_stream_manager";
static constexpr QUICStreamId QUIC_STREAM_TYPES = 4;
diff --git a/src/iocore/net/quic/QUICStreamManager_quiche.cc b/src/iocore/net/quic/QUICStreamManager_quiche.cc
index 6321cf7914..9965cc5c4a 100644
--- a/src/iocore/net/quic/QUICStreamManager_quiche.cc
+++ b/src/iocore/net/quic/QUICStreamManager_quiche.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICStreamManager_quiche.h"
-#include "QUICStream_quiche.h"
+#include "iocore/net/quic/QUICStreamManager_quiche.h"
+#include "iocore/net/quic/QUICStream_quiche.h"
QUICStreamManagerImpl::QUICStreamManagerImpl(QUICContext *context, QUICApplicationMap *app_map)
: QUICStreamManager(context, app_map)
diff --git a/src/iocore/net/quic/QUICStreamState.cc b/src/iocore/net/quic/QUICStreamState.cc
index e5ddb6c5fa..eb58d3287b 100644
--- a/src/iocore/net/quic/QUICStreamState.cc
+++ b/src/iocore/net/quic/QUICStreamState.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QUICStreamState.h"
+#include "iocore/net/quic/QUICStreamState.h"
#include "tscore/ink_assert.h"
// ---------QUICReceiveStreamState -----------
diff --git a/src/iocore/net/quic/QUICStreamVCAdapter.cc b/src/iocore/net/quic/QUICStreamVCAdapter.cc
index 0346e24eb9..b423531cd7 100644
--- a/src/iocore/net/quic/QUICStreamVCAdapter.cc
+++ b/src/iocore/net/quic/QUICStreamVCAdapter.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "VConnection.h"
-#include "QUICStreamVCAdapter.h"
+#include "iocore/eventsystem/VConnection.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
QUICStreamVCAdapter::QUICStreamVCAdapter(QUICStream &stream) : VConnection(new_ProxyMutex()), QUICStreamAdapter(stream)
{
diff --git a/src/iocore/net/quic/QUICStream_quiche.cc b/src/iocore/net/quic/QUICStream_quiche.cc
index 33ddd02246..0c3a9e367b 100644
--- a/src/iocore/net/quic/QUICStream_quiche.cc
+++ b/src/iocore/net/quic/QUICStream_quiche.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICStream_quiche.h"
-#include "QUICStreamAdapter.h"
+#include "iocore/net/quic/QUICStream_quiche.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
QUICStreamImpl::QUICStreamImpl() {}
diff --git a/src/iocore/net/quic/QUICTLS.cc b/src/iocore/net/quic/QUICTLS.cc
index d12fe5b73e..926f042af2 100644
--- a/src/iocore/net/quic/QUICTLS.cc
+++ b/src/iocore/net/quic/QUICTLS.cc
@@ -21,14 +21,14 @@
* limitations under the License.
*/
-#include "QUICTLS.h"
+#include "iocore/net/quic/QUICTLS.h"
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/bio.h>
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICDebugNames.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICDebugNames.h"
constexpr static char tag[] = "quic_tls";
diff --git a/src/iocore/net/quic/QUICTLS_boringssl.cc b/src/iocore/net/quic/QUICTLS_boringssl.cc
index dbd808f66f..c4667ed335 100644
--- a/src/iocore/net/quic/QUICTLS_boringssl.cc
+++ b/src/iocore/net/quic/QUICTLS_boringssl.cc
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "QUICTLS.h"
+#include "iocore/net/quic/QUICTLS.h"
#include <openssl/base.h>
#include <openssl/err.h>
@@ -29,9 +29,9 @@
#include <openssl/hkdf.h>
#include <openssl/aead.h>
-#include "QUICGlobals.h"
-#include "QUICConnection.h"
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
static constexpr char tag[] = "quic_tls";
diff --git a/src/iocore/net/quic/QUICTLS_openssl.cc b/src/iocore/net/quic/QUICTLS_openssl.cc
index 23bcfcc108..ca83fc6661 100644
--- a/src/iocore/net/quic/QUICTLS_openssl.cc
+++ b/src/iocore/net/quic/QUICTLS_openssl.cc
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "QUICTLS.h"
+#include "iocore/net/quic/QUICTLS.h"
#include <openssl/err.h>
#include <openssl/ssl.h>
@@ -28,9 +28,9 @@
#include <openssl/kdf.h>
#include <openssl/evp.h>
-#include "QUICGlobals.h"
-#include "QUICConnection.h"
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
static constexpr char tag[] = "quic_tls";
diff --git a/src/iocore/net/quic/QUICTokenCreator.cc b/src/iocore/net/quic/QUICTokenCreator.cc
index b9137df8be..fc356d49d5 100644
--- a/src/iocore/net/quic/QUICTokenCreator.cc
+++ b/src/iocore/net/quic/QUICTokenCreator.cc
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "QUICTokenCreator.h"
+#include "iocore/net/quic/QUICTokenCreator.h"
bool
QUICTokenCreator::will_generate_frame(QUICEncryptionLevel level, size_t current_packet_size, bool ack_eliciting, uint32_t seq_num)
diff --git a/src/iocore/net/quic/QUICTransferProgressProvider.cc b/src/iocore/net/quic/QUICTransferProgressProvider.cc
index 1d89a5424a..533e171dd6 100644
--- a/src/iocore/net/quic/QUICTransferProgressProvider.cc
+++ b/src/iocore/net/quic/QUICTransferProgressProvider.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "IOBuffer.h"
-#include "QUICStreamAdapter.h"
+#include "iocore/eventsystem/IOBuffer.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
void
QUICTransferProgressProviderSA::set_stream_adapter(QUICStreamAdapter *adapter)
diff --git a/src/iocore/net/quic/QUICTransportParameters.cc b/src/iocore/net/quic/QUICTransportParameters.cc
index d9fc0e8010..57845ea660 100644
--- a/src/iocore/net/quic/QUICTransportParameters.cc
+++ b/src/iocore/net/quic/QUICTransportParameters.cc
@@ -23,13 +23,13 @@
#include <cstdlib>
#include "tscore/Diags.h"
-#include "QUICGlobals.h"
-#include "QUICIntUtil.h"
-#include "QUICTransportParameters.h"
-#include "QUICConnection.h"
-#include "QUICDebugNames.h"
-#include "QUICTLS.h"
-#include "QUICTypes.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
+#include "iocore/net/quic/QUICConnection.h"
+#include "iocore/net/quic/QUICDebugNames.h"
+#include "iocore/net/quic/QUICTLS.h"
+#include "iocore/net/quic/QUICTypes.h"
static constexpr char tag[] = "quic_handshake";
diff --git a/src/iocore/net/quic/QUICTypes.cc b/src/iocore/net/quic/QUICTypes.cc
index 8bf9e560ca..75fccf5c75 100644
--- a/src/iocore/net/quic/QUICTypes.cc
+++ b/src/iocore/net/quic/QUICTypes.cc
@@ -26,10 +26,10 @@
#include <iomanip>
#include <iostream>
-#include "QUICTypes.h"
-#include "QUICIntUtil.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICIntUtil.h"
#include "tscore/CryptoHash.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include <openssl/hmac.h>
uint8_t QUICConnectionId::SCID_LEN = 0;
diff --git a/src/iocore/net/quic/QUICUnidirectionalStream.cc b/src/iocore/net/quic/QUICUnidirectionalStream.cc
index 2352227b9a..eb27ea7783 100644
--- a/src/iocore/net/quic/QUICUnidirectionalStream.cc
+++ b/src/iocore/net/quic/QUICUnidirectionalStream.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICUnidirectionalStream.h"
-#include "QUICStreamAdapter.h"
+#include "iocore/net/quic/QUICUnidirectionalStream.h"
+#include "iocore/net/quic/QUICStreamAdapter.h"
//
// QUICSendStream
diff --git a/src/iocore/net/quic/QUICVersionNegotiator.cc b/src/iocore/net/quic/QUICVersionNegotiator.cc
index d26f4f8832..bf116bc660 100644
--- a/src/iocore/net/quic/QUICVersionNegotiator.cc
+++ b/src/iocore/net/quic/QUICVersionNegotiator.cc
@@ -21,8 +21,8 @@
* limitations under the License.
*/
-#include "QUICVersionNegotiator.h"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICVersionNegotiator.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
QUICVersionNegotiationStatus
QUICVersionNegotiator::status() const
diff --git a/src/iocore/net/quic/qlog/QLog.cc b/src/iocore/net/quic/qlog/QLog.cc
index 71bb5fcca6..2e868eeb0b 100644
--- a/src/iocore/net/quic/qlog/QLog.cc
+++ b/src/iocore/net/quic/qlog/QLog.cc
@@ -23,7 +23,7 @@
#include <string>
-#include "QLog.h"
+#include "iocore/net/quic/qlog/QLog.h"
namespace QLog
{
diff --git a/src/iocore/net/quic/qlog/QLogEvent.cc b/src/iocore/net/quic/qlog/QLogEvent.cc
index ce7bce35ff..24f046cbd7 100644
--- a/src/iocore/net/quic/qlog/QLogEvent.cc
+++ b/src/iocore/net/quic/qlog/QLogEvent.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QLogEvent.h"
+#include "iocore/net/quic/qlog/QLogEvent.h"
namespace QLog
{
diff --git a/src/iocore/net/quic/qlog/QLogFrame.cc b/src/iocore/net/quic/qlog/QLogFrame.cc
index bcc46fcf73..a9355dd9c7 100644
--- a/src/iocore/net/quic/qlog/QLogFrame.cc
+++ b/src/iocore/net/quic/qlog/QLogFrame.cc
@@ -21,7 +21,7 @@
* limitations under the License.
*/
-#include "QLogFrame.h"
+#include "iocore/net/quic/qlog/QLogFrame.h"
namespace QLog
{
diff --git a/src/iocore/net/quic/test/event_processor_main.cc b/src/iocore/net/quic/test/event_processor_main.cc
index 53dcdaa345..e9938c4b2e 100644
--- a/src/iocore/net/quic/test/event_processor_main.cc
+++ b/src/iocore/net/quic/test/event_processor_main.cc
@@ -29,10 +29,10 @@
#include "tscore/Layout.h"
#include "tscore/Diags.h"
-#include "EventSystem.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "records/RecordsConfig.h"
-#include "QUICConfig.h"
+#include "iocore/net/quic/QUICConfig.h"
#define TEST_THREADS 1
diff --git a/src/iocore/net/quic/test/main.cc b/src/iocore/net/quic/test/main.cc
index 9e809f8c87..492517620b 100644
--- a/src/iocore/net/quic/test/main.cc
+++ b/src/iocore/net/quic/test/main.cc
@@ -30,8 +30,8 @@
#include "tscore/Diags.h"
#include "records/RecordsConfig.h"
-#include "QUICGlobals.h"
-#include "QUICConfig.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/QUICConfig.h"
struct EventProcessorListener : Catch::TestEventListenerBase {
using TestEventListenerBase::TestEventListenerBase; // inherit constructor
diff --git a/src/iocore/net/quic/test/test_QUICAckFrameCreator.cc b/src/iocore/net/quic/test/test_QUICAckFrameCreator.cc
index 73aca13346..30b911d077 100644
--- a/src/iocore/net/quic/test/test_QUICAckFrameCreator.cc
+++ b/src/iocore/net/quic/test/test_QUICAckFrameCreator.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "quic/QUICAckFrameCreator.h"
+#include "iocore/net/quic/QUICAckFrameCreator.h"
TEST_CASE("QUICAckFrameManager", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICAddrVerifyState.cc b/src/iocore/net/quic/test/test_QUICAddrVerifyState.cc
index a90135c0bd..cfd75e7a16 100644
--- a/src/iocore/net/quic/test/test_QUICAddrVerifyState.cc
+++ b/src/iocore/net/quic/test/test_QUICAddrVerifyState.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "P_QUICNetVConnection.h"
+#include "../../P_QUICNetVConnection.h"
#include <memory>
TEST_CASE("QUICAddrVerifyState", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICAltConnectionManager.cc b/src/iocore/net/quic/test/test_QUICAltConnectionManager.cc
index 298f21b775..56a28db379 100644
--- a/src/iocore/net/quic/test/test_QUICAltConnectionManager.cc
+++ b/src/iocore/net/quic/test/test_QUICAltConnectionManager.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICAltConnectionManager.h"
-#include "quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICAltConnectionManager.h"
+#include "iocore/net/quic/QUICIntUtil.h"
#include <memory>
TEST_CASE("QUICPreferredAddress", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICFlowController.cc b/src/iocore/net/quic/test/test_QUICFlowController.cc
index ef65747607..54b82df42f 100644
--- a/src/iocore/net/quic/test/test_QUICFlowController.cc
+++ b/src/iocore/net/quic/test/test_QUICFlowController.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICFlowController.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICFlowController.h"
+#include "iocore/net/quic/Mock.h"
#include <memory>
static constexpr int DEFAULT_RTT = 1 * HRTIME_SECOND;
diff --git a/src/iocore/net/quic/test/test_QUICFrame.cc b/src/iocore/net/quic/test/test_QUICFrame.cc
index 2eb0c5ea1d..23c4b5af99 100644
--- a/src/iocore/net/quic/test/test_QUICFrame.cc
+++ b/src/iocore/net/quic/test/test_QUICFrame.cc
@@ -23,9 +23,9 @@
#include "catch.hpp"
-#include "quic/Mock.h"
-#include "quic/QUICFrame.h"
-#include "quic/QUICStream.h"
+#include "iocore/net/quic/Mock.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICStream.h"
extern const ink_freelist_ops *freelist_global_ops;
extern const ink_freelist_ops *freelist_class_ops;
diff --git a/src/iocore/net/quic/test/test_QUICFrameDispatcher.cc b/src/iocore/net/quic/test/test_QUICFrameDispatcher.cc
index 10e2d31880..1a1af33533 100644
--- a/src/iocore/net/quic/test/test_QUICFrameDispatcher.cc
+++ b/src/iocore/net/quic/test/test_QUICFrameDispatcher.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICFrameDispatcher.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICFrameDispatcher.h"
+#include "iocore/net/quic/Mock.h"
#include <memory>
TEST_CASE("QUICFrameHandler", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICFrameRetransmitter.cc b/src/iocore/net/quic/test/test_QUICFrameRetransmitter.cc
index a72ee1a267..53e6cae6b6 100644
--- a/src/iocore/net/quic/test/test_QUICFrameRetransmitter.cc
+++ b/src/iocore/net/quic/test/test_QUICFrameRetransmitter.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "QUICFrameRetransmitter.h"
+#include "iocore/net/quic/QUICFrameRetransmitter.h"
constexpr static uint8_t data[] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x01, 0x02, 0x03, 0x04, 0x05,
0x06, 0x07, 0x08, 0x09, 0x10, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10};
diff --git a/src/iocore/net/quic/test/test_QUICHandshakeProtocol.cc b/src/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
index ec84f0ee11..330d085f2e 100644
--- a/src/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
+++ b/src/iocore/net/quic/test/test_QUICHandshakeProtocol.cc
@@ -33,20 +33,20 @@
#include <openssl/ssl.h>
-#include "QUICPacketHeaderProtector.h"
-#include "QUICPacketPayloadProtector.h"
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICTLS.h"
-#include "QUICGlobals.h"
-#include "Mock.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICPacketPayloadProtector.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICTLS.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/Mock.h"
// XXX For NetVCOptions::reset
struct PollCont;
-#include "P_UDPConnection.h"
-#include "P_UnixNet.h"
-#include "P_UnixNetVConnection.h"
+#include "../../P_UDPConnection.h"
+#include "../../P_UnixNet.h"
+#include "../../P_UnixNetVConnection.h"
-#include "./server_cert.h"
+#include "server_cert.h"
static void
print_hex(const uint8_t *v, size_t len)
diff --git a/src/iocore/net/quic/test/test_QUICIncomingFrameBuffer.cc b/src/iocore/net/quic/test/test_QUICIncomingFrameBuffer.cc
index 33dcbe72ea..19206d98b0 100644
--- a/src/iocore/net/quic/test/test_QUICIncomingFrameBuffer.cc
+++ b/src/iocore/net/quic/test/test_QUICIncomingFrameBuffer.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICIncomingFrameBuffer.h"
-#include "quic/QUICBidirectionalStream.h"
+#include "iocore/net/quic/QUICIncomingFrameBuffer.h"
+#include "iocore/net/quic/QUICBidirectionalStream.h"
#include <memory>
TEST_CASE("QUICIncomingStreamFrameBuffer_fin_offset", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICInvariants.cc b/src/iocore/net/quic/test/test_QUICInvariants.cc
index e57aab1431..1d56c5f1d3 100644
--- a/src/iocore/net/quic/test/test_QUICInvariants.cc
+++ b/src/iocore/net/quic/test/test_QUICInvariants.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "quic/QUICTypes.h"
+#include "iocore/net/quic/QUICTypes.h"
TEST_CASE("Long Header - regular case", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICKeyGenerator.cc b/src/iocore/net/quic/test/test_QUICKeyGenerator.cc
index aa61a303f8..f3e53dab45 100644
--- a/src/iocore/net/quic/test/test_QUICKeyGenerator.cc
+++ b/src/iocore/net/quic/test/test_QUICKeyGenerator.cc
@@ -32,8 +32,8 @@
#include <openssl/ssl.h>
-#include "QUICKeyGenerator.h"
-#include "QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICKeyGenerator.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
// https://github.com/quicwg/base-drafts/wiki/Test-Vector-for-the-Initial-AEAD-key-derivation
TEST_CASE("draft-23~27 Test Vectors", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICLossDetector.cc b/src/iocore/net/quic/test/test_QUICLossDetector.cc
index 248e1df049..20cbab464f 100644
--- a/src/iocore/net/quic/test/test_QUICLossDetector.cc
+++ b/src/iocore/net/quic/test/test_QUICLossDetector.cc
@@ -23,13 +23,13 @@
#include "catch.hpp"
-#include "QUICLossDetector.h"
-#include "QUICPacketFactory.h"
-#include "QUICAckFrameCreator.h"
-#include "QUICEvents.h"
-#include "QUICPacketFactory.h"
-#include "QUICAckFrameCreator.h"
-#include "Mock.h"
+#include "iocore/net/quic/QUICLossDetector.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICAckFrameCreator.h"
+#include "iocore/net/quic/QUICEvents.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICAckFrameCreator.h"
+#include "iocore/net/quic/Mock.h"
#include "tscore/ink_hrtime.h"
TEST_CASE("QUICLossDetector_Loss", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICPacket.cc b/src/iocore/net/quic/test/test_QUICPacket.cc
index b9125968e1..bc442854cb 100644
--- a/src/iocore/net/quic/test/test_QUICPacket.cc
+++ b/src/iocore/net/quic/test/test_QUICPacket.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "quic/QUICPacket.h"
+#include "iocore/net/quic/QUICPacket.h"
TEST_CASE("Receiving Packet", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICPacketFactory.cc b/src/iocore/net/quic/test/test_QUICPacketFactory.cc
index 348ec348d1..9d7a52db33 100644
--- a/src/iocore/net/quic/test/test_QUICPacketFactory.cc
+++ b/src/iocore/net/quic/test/test_QUICPacketFactory.cc
@@ -23,9 +23,9 @@
#include "catch.hpp"
-#include "quic/QUICPacket.h"
-#include "quic/QUICPacketFactory.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICPacket.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/Mock.h"
TEST_CASE("QUICPacketFactory_Create_VersionNegotiationPacket", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc b/src/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc
index 2919c4184b..4b05a03bf5 100644
--- a/src/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc
+++ b/src/iocore/net/quic/test/test_QUICPacketHeaderProtector.cc
@@ -23,18 +23,18 @@
#include "catch.hpp"
-#include "QUICPacketProtectionKeyInfo.h"
-#include "QUICPacketHeaderProtector.h"
-#include "QUICTLS.h"
-#include "QUICGlobals.h"
-#include "Mock.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketHeaderProtector.h"
+#include "iocore/net/quic/QUICTLS.h"
+#include "iocore/net/quic/QUICGlobals.h"
+#include "iocore/net/quic/Mock.h"
struct PollCont;
-#include "P_UDPConnection.h"
-#include "P_UnixNet.h"
-#include "P_UnixNetVConnection.h"
+#include "../../P_UDPConnection.h"
+#include "../../P_UnixNet.h"
+#include "../../P_UnixNetVConnection.h"
-#include "./server_cert.h"
+#include "server_cert.h"
TEST_CASE("QUICPacketHeaderProtector")
{
diff --git a/src/iocore/net/quic/test/test_QUICPathValidator.cc b/src/iocore/net/quic/test/test_QUICPathValidator.cc
index 57fe773f4b..26b0e07f1b 100644
--- a/src/iocore/net/quic/test/test_QUICPathValidator.cc
+++ b/src/iocore/net/quic/test/test_QUICPathValidator.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICPathValidator.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICPathValidator.h"
+#include "iocore/net/quic/Mock.h"
#include "stdio.h"
#include "stdlib.h"
diff --git a/src/iocore/net/quic/test/test_QUICPinger.cc b/src/iocore/net/quic/test/test_QUICPinger.cc
index d6b58e228b..53dce2440c 100644
--- a/src/iocore/net/quic/test/test_QUICPinger.cc
+++ b/src/iocore/net/quic/test/test_QUICPinger.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "QUICPinger.h"
+#include "iocore/net/quic/QUICPinger.h"
static constexpr QUICEncryptionLevel level = QUICEncryptionLevel::ONE_RTT;
static uint8_t frame[1024] = {0};
diff --git a/src/iocore/net/quic/test/test_QUICStream.cc b/src/iocore/net/quic/test/test_QUICStream.cc
index 8f9019d205..d463c98b4c 100644
--- a/src/iocore/net/quic/test/test_QUICStream.cc
+++ b/src/iocore/net/quic/test/test_QUICStream.cc
@@ -23,10 +23,10 @@
#include "catch.hpp"
-#include "quic/QUICBidirectionalStream.h"
-#include "quic/QUICUnidirectionalStream.h"
-#include "quic/QUICStreamVCAdapter.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICBidirectionalStream.h"
+#include "iocore/net/quic/QUICUnidirectionalStream.h"
+#include "iocore/net/quic/QUICStreamVCAdapter.h"
+#include "iocore/net/quic/Mock.h"
TEST_CASE("QUICBidiStream", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICStreamManager.cc b/src/iocore/net/quic/test/test_QUICStreamManager.cc
index 9849af3b7e..905a78bcea 100644
--- a/src/iocore/net/quic/test/test_QUICStreamManager.cc
+++ b/src/iocore/net/quic/test/test_QUICStreamManager.cc
@@ -25,10 +25,10 @@
#include <memory>
-#include "quic/QUICStreamManager.h"
-#include "quic/QUICStreamManager_native.h"
-#include "quic/QUICFrame.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICStreamManager.h"
+#include "iocore/net/quic/QUICStreamManager_native.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/Mock.h"
MockQUICContext context;
diff --git a/src/iocore/net/quic/test/test_QUICStreamState.cc b/src/iocore/net/quic/test/test_QUICStreamState.cc
index e6f9989fbc..01f7e1d0a9 100644
--- a/src/iocore/net/quic/test/test_QUICStreamState.cc
+++ b/src/iocore/net/quic/test/test_QUICStreamState.cc
@@ -25,9 +25,9 @@
#include <memory>
-#include "quic/QUICFrame.h"
-#include "quic/QUICStreamState.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICFrame.h"
+#include "iocore/net/quic/QUICStreamState.h"
+#include "iocore/net/quic/Mock.h"
// Unidirectional (sending)
TEST_CASE("QUICSendStreamState", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICTransportParameters.cc b/src/iocore/net/quic/test/test_QUICTransportParameters.cc
index cddad460f8..b0632651c3 100644
--- a/src/iocore/net/quic/test/test_QUICTransportParameters.cc
+++ b/src/iocore/net/quic/test/test_QUICTransportParameters.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "QUICTransportParameters.h"
+#include "iocore/net/quic/QUICTransportParameters.h"
TEST_CASE("QUICTransportParametersInClientHello_read", "[quic]")
{
diff --git a/src/iocore/net/quic/test/test_QUICType.cc b/src/iocore/net/quic/test/test_QUICType.cc
index 833b0b373d..be96f84a3b 100644
--- a/src/iocore/net/quic/test/test_QUICType.cc
+++ b/src/iocore/net/quic/test/test_QUICType.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICTypes.h"
-#include "EventSystem.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/eventsystem/EventSystem.h"
#include "tscore/ink_hrtime.h"
#include <memory>
diff --git a/src/iocore/net/quic/test/test_QUICTypeUtil.cc b/src/iocore/net/quic/test/test_QUICTypeUtil.cc
index b71ce4ab6b..62b468a73e 100644
--- a/src/iocore/net/quic/test/test_QUICTypeUtil.cc
+++ b/src/iocore/net/quic/test/test_QUICTypeUtil.cc
@@ -23,8 +23,8 @@
#include "catch.hpp"
-#include "quic/QUICTypes.h"
-#include "quic/QUICIntUtil.h"
+#include "iocore/net/quic/QUICTypes.h"
+#include "iocore/net/quic/QUICIntUtil.h"
#include <memory>
TEST_CASE("QUICTypeUtil", "[quic]")
diff --git a/src/iocore/net/quic/test/test_QUICVersionNegotiator.cc b/src/iocore/net/quic/test/test_QUICVersionNegotiator.cc
index 35397459c8..6168f4c5a9 100644
--- a/src/iocore/net/quic/test/test_QUICVersionNegotiator.cc
+++ b/src/iocore/net/quic/test/test_QUICVersionNegotiator.cc
@@ -23,11 +23,11 @@
#include "catch.hpp"
-#include "quic/QUICVersionNegotiator.h"
-#include "quic/QUICPacketFactory.h"
-#include "quic/QUICPacketProtectionKeyInfo.h"
-#include "quic/QUICPacketFactory.h"
-#include "quic/Mock.h"
+#include "iocore/net/quic/QUICVersionNegotiator.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/QUICPacketProtectionKeyInfo.h"
+#include "iocore/net/quic/QUICPacketFactory.h"
+#include "iocore/net/quic/Mock.h"
TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
{
diff --git a/src/iocore/net/quic/test_MTHashTable.cc b/src/iocore/net/quic/test_MTHashTable.cc
index 38531ee5c1..c632460a02 100644
--- a/src/iocore/net/quic/test_MTHashTable.cc
+++ b/src/iocore/net/quic/test_MTHashTable.cc
@@ -24,8 +24,8 @@
#define CATCH_CONFIG_MAIN
#include <catch.hpp>
-#include "P_EventSystem.h"
-#include "MTHashTable.h"
+#include "../../eventsystem/P_EventSystem.h"
+#include "iocore/net/quic/MTHashTable.h"
// -------------
// --- TESTS ---
diff --git a/src/iocore/net/test_I_Net.cc b/src/iocore/net/test_I_Net.cc
index e5d24a96c8..18a6bdb08a 100644
--- a/src/iocore/net/test_I_Net.cc
+++ b/src/iocore/net/test_I_Net.cc
@@ -27,7 +27,7 @@
#include <netdb.h>
-#include "diags.i"
+#include "iocore/utils/diags.i"
/*
* Choose a net test application
diff --git a/src/iocore/net/test_I_UDPNet.cc b/src/iocore/net/test_I_UDPNet.cc
index 28d4c0c2b4..19e2b9973a 100644
--- a/src/iocore/net/test_I_UDPNet.cc
+++ b/src/iocore/net/test_I_UDPNet.cc
@@ -28,15 +28,15 @@
#include "tscore/Layout.h"
#include "tscore/TestBox.h"
-#include "EventSystem.h"
-#include "Net.h"
-#include "NetVConnection.h"
-#include "UDPNet.h"
-#include "UDPPacket.h"
-#include "UDPConnection.h"
+#include "iocore/eventsystem/EventSystem.h"
+#include "iocore/net/Net.h"
+#include "iocore/net/NetVConnection.h"
+#include "iocore/net/UDPNet.h"
+#include "iocore/net/UDPPacket.h"
+#include "iocore/net/UDPConnection.h"
#include "P_UDPConnection.h"
-#include "diags.i"
+#include "iocore/utils/diags.i"
static const char payload[] = "hello";
in_port_t port = 0;
diff --git a/src/iocore/net/unit_tests/test_ProxyProtocol.cc b/src/iocore/net/unit_tests/test_ProxyProtocol.cc
index 8d61e45463..27e39741ff 100644
--- a/src/iocore/net/unit_tests/test_ProxyProtocol.cc
+++ b/src/iocore/net/unit_tests/test_ProxyProtocol.cc
@@ -23,7 +23,7 @@
#include "catch.hpp"
-#include "ProxyProtocol.h"
+#include "iocore/net/ProxyProtocol.h"
using namespace std::literals;
diff --git a/src/iocore/net/unit_tests/test_SSLSNIConfig.cc b/src/iocore/net/unit_tests/test_SSLSNIConfig.cc
index beb6a78850..e09ce7006d 100644
--- a/src/iocore/net/unit_tests/test_SSLSNIConfig.cc
+++ b/src/iocore/net/unit_tests/test_SSLSNIConfig.cc
@@ -28,7 +28,7 @@
#define _STR(s) #s
#define _XSTR(s) _STR(s)
-#include "SSLSNIConfig.h"
+#include "iocore/net/SSLSNIConfig.h"
#include "catch.hpp"
diff --git a/src/iocore/net/unit_tests/test_YamlSNIConfig.cc b/src/iocore/net/unit_tests/test_YamlSNIConfig.cc
index ad1b3f217d..58932567d2 100644
--- a/src/iocore/net/unit_tests/test_YamlSNIConfig.cc
+++ b/src/iocore/net/unit_tests/test_YamlSNIConfig.cc
@@ -36,7 +36,7 @@
#include <netinet/in.h>
#include "catch.hpp"
... 4950 lines suppressed ...