build: clean up some header include misplacements in #799.#803

mattklein123 merged 1 commit intoenvoyproxy:masterenvoyproxy/envoy:masterfrom

htuch:header-order-fixeshtuch/envoy:header-order-fixesCopy head branch name to clipboard