From 63a84c2034fd029e278e7912edbd8023ebf9baf5 Mon Sep 17 00:00:00 2001
From: Harvey Tuch <htuch@google.com>
Date: Thu, 20 Apr 2017 15:48:48 -0400
Subject: [PATCH] build: clean up some header include misplacements in #799.

---
 include/envoy/tracing/context.h     | 3 ++-
 source/common/common/empty_string.h | 4 ++--
 source/common/common/enum_to_int.h  | 4 ++--
 source/common/http/codec_helper.h   | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/envoy/tracing/context.h b/include/envoy/tracing/context.h
index 6f5b7da251bf0..101134a44d4cd 100644
--- a/include/envoy/tracing/context.h
+++ b/include/envoy/tracing/context.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 namespace Tracing {
 
 struct TransportContext {
@@ -10,4 +12,3 @@ struct TransportContext {
 static const TransportContext EMPTY_CONTEXT = {"", ""};
 
 } // Tracing
-#include <string>
diff --git a/source/common/common/empty_string.h b/source/common/common/empty_string.h
index 49b68af3eda25..2bfd2dfb1d95d 100644
--- a/source/common/common/empty_string.h
+++ b/source/common/common/empty_string.h
@@ -1,5 +1,5 @@
 #pragma once
 
-static const std::string EMPTY_STRING = "";
-
 #include <string>
+
+static const std::string EMPTY_STRING = "";
diff --git a/source/common/common/enum_to_int.h b/source/common/common/enum_to_int.h
index 6929d364b127c..f87bce4bf4dc7 100644
--- a/source/common/common/enum_to_int.h
+++ b/source/common/common/enum_to_int.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <cstdint>
+
 /**
  * Convert an int based enum to an int.
  */
 template <typename T> uint32_t enumToInt(T val) { return static_cast<uint32_t>(val); }
-
-#include <cstdint>
diff --git a/source/common/http/codec_helper.h b/source/common/http/codec_helper.h
index 9dea7e65a3039..fa8ac1703f81a 100644
--- a/source/common/http/codec_helper.h
+++ b/source/common/http/codec_helper.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vector>
+
 namespace Http {
 
 class StreamCallbackHelper {
@@ -44,5 +46,3 @@ class StreamCallbackHelper {
 };
 
 } // Http
-
-#include <vector>