clean includes

Signed-off-by: Jarno Rajahalme <[email protected]>
cilium · Jan 31, 2025 · 240684c · 240684c
1 parent c89f50b
commit 240684c
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 42 deletions.
diff --git a/cilium/accesslog.cc b/cilium/accesslog.cc
@@ -1,10 +1,5 @@
 #include "accesslog.h"
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
 #include <chrono>
 #include <cstdint>
 #include <map>

diff --git a/cilium/bpf.cc b/cilium/bpf.cc
@@ -1,8 +1,8 @@
 #include "cilium/bpf.h"
 
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <cstdint>
 #include <fstream>
 #include <sstream>

diff --git a/cilium/bpf.h b/cilium/bpf.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <unistd.h>
-
 #include <cstdint>
 #include <string>
 

diff --git a/cilium/bpf_metadata.cc b/cilium/bpf_metadata.cc
@@ -4,7 +4,6 @@
 #include <fmt/format.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#include <sys/socket.h>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/cilium/conntrack.cc b/cilium/conntrack.cc
@@ -1,10 +1,9 @@
 #include "conntrack.h"
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
-#include <string.h>
 
 #include <cstdint>
+#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>

diff --git a/cilium/filter_state_cilium_policy.cc b/cilium/filter_state_cilium_policy.cc
@@ -1,9 +1,5 @@
 #include "cilium/filter_state_cilium_policy.h"
 
-#include <asm-generic/socket.h>
-#include <netinet/in.h>
-
-#include <cerrno>
 #include <string>
 
 #include "source/common/common/macros.h"

diff --git a/cilium/filter_state_cilium_policy.h b/cilium/filter_state_cilium_policy.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <asm-generic/socket.h>
-#include <netinet/in.h>
-
-#include <cerrno>
 #include <cstdint>
 #include <memory>
 #include <string>

diff --git a/cilium/grpc_subscription.cc b/cilium/grpc_subscription.cc
@@ -1,7 +1,5 @@
 #include "cilium/grpc_subscription.h"
 
-#include <fmt/format.h>
-
 #include <chrono>
 #include <memory>
 #include <string>

diff --git a/cilium/ipcache.cc b/cilium/ipcache.cc
@@ -1,6 +1,5 @@
 #include "ipcache.h"
 
-#include <arpa/inet.h>
 #include <netinet/in.h>
 
 #include <cstdint>

diff --git a/cilium/network_filter.cc b/cilium/network_filter.cc
@@ -1,7 +1,5 @@
 #include "cilium/network_filter.h"
 
-#include <dlfcn.h>
-
 #include <cstdint>
 #include <memory>
 #include <string>

diff --git a/cilium/network_policy.cc b/cilium/network_policy.cc
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <functional>
+#include <memory>
 #include <set>
 #include <string>
 #include <utility>

diff --git a/cilium/network_policy.h b/cilium/network_policy.h
@@ -26,7 +26,6 @@
 #include "envoy/ssl/context.h"
 #include "envoy/ssl/context_config.h"
 #include "envoy/stats/scope.h"
-#include "envoy/stats/stats_macros.h"
 
 #include "source/common/common/assert.h"
 #include "source/common/common/logger.h"

diff --git a/cilium/policy_id.h b/cilium/policy_id.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace Envoy {
 namespace Cilium {

diff --git a/cilium/privileged_service_client.cc b/cilium/privileged_service_client.cc
@@ -9,7 +9,6 @@
 #include <linux/limits.h>
 #include <pthread.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <cerrno>

diff --git a/cilium/privileged_service_client.h b/cilium/privileged_service_client.h
@@ -4,9 +4,12 @@
 #error "Linux platform file is part of non-Linux build."
 #endif
 
+#include <unistd.h>
+
+#include <cstdint>
+
 #include "envoy/api/os_sys_calls_common.h"
 
-#include "source/common/common/assert.h"
 #include "source/common/singleton/threadsafe_singleton.h"
 
 #include "starter/privileged_service_protocol.h"

diff --git a/cilium/socket_option_cilium_mark.cc b/cilium/socket_option_cilium_mark.cc
@@ -1,7 +1,6 @@
 #include "cilium/socket_option_cilium_mark.h"
 
 #include <asm-generic/socket.h>
-#include <netinet/in.h>
 
 #include <cerrno>
 #include <cstdint>

diff --git a/cilium/uds_client.cc b/cilium/uds_client.cc
@@ -1,8 +1,6 @@
 #include "cilium/uds_client.h"
 
-#include <errno.h>
 #include <fmt/format.h>
-#include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/cilium/websocket.cc b/cilium/websocket.cc
@@ -1,7 +1,5 @@
 #include "cilium/websocket.h"
 
-#include <http_parser.h>
-
 #include <cstdint>
 #include <memory>
 #include <string>

diff --git a/cilium/websocket_config.cc b/cilium/websocket_config.cc
@@ -1,6 +1,5 @@
 #include "cilium/websocket_config.h"
 
-#include <http_parser.h>
 #include <openssl/digest.h>
 #include <openssl/sha.h>
 

diff --git a/tests/accesslog_server.cc b/tests/accesslog_server.cc
@@ -1,7 +1,5 @@
 #include "tests/accesslog_server.h"
 
-#include <unistd.h>
-
 #include <chrono>
 #include <functional>
 #include <string>

diff --git a/tests/health_check_sink_server.cc b/tests/health_check_sink_server.cc
@@ -1,10 +1,5 @@
 #include "tests/health_check_sink_server.h"
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
 #include <chrono>
 #include <functional>
 #include <string>

diff --git a/tests/uds_server.cc b/tests/uds_server.cc
@@ -1,10 +1,10 @@
 #include "tests/uds_server.h"
 
-#include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
+#include <cerrno>
 #include <functional>
 #include <memory>
 #include <string>