diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 55fe5200a6f..933d362c97b 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -32,6 +32,7 @@
 #include "MIME.h"
 #include "tscore/Regex.h"
 #include "URL.h"
+#include <cstdio>
 
 /*
  You SHOULD add to _hdrtoken_commonly_tokenized_strs, with the same ordering
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index f2227148759..51f5e01af49 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -47,6 +47,7 @@
 #include <openssl/ssl.h>
 #include <algorithm>
 #include <atomic>
+#include <algorithm>
 
 #define DEFAULT_RESPONSE_BUFFER_SIZE_INDEX 6 // 8K
 #define DEFAULT_REQUEST_BUFFER_SIZE_INDEX 6  // 8K
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 0348b65210c..6d3490bcf60 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -25,6 +25,7 @@
 
 #include <strings.h>
 #include <cmath>
+#include <strings.h>
 
 #include "HttpTransact.h"
 #include "HttpTransactHeaders.h"
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 52ddf676c5d..7f20996d361 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -40,6 +40,7 @@
 #include "UrlMapping.h"
 #include "records/I_RecHttp.h"
 #include "ProxyClientSession.h"
+#include "UrlMapping.h"
 
 #define HTTP_RELEASE_ASSERT(X) ink_release_assert(X)
 
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index b28d13432a2..0ebb5566dff 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -19,6 +19,7 @@
 import os
 Test.Summary = '''
 Test a basic remap of a http/2 connection
+
 '''
 # need Curl
 Test.SkipUnless(