From c034915cb63e52a00288db2b055e20faf60e8cdf Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 6 May 2025 13:33:49 +0200
Subject: [PATCH] af-list: Remove transitive includes

---
 src/basic/af-list.c        | 15 +++++++++++++++
 src/basic/af-list.h        | 22 ++++------------------
 src/shared/parse-helpers.c |  2 ++
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index 91a20b2e0c0..60da592e3f8 100644
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -6,6 +6,7 @@
 
 #include "af-list.h"
 #include "macro.h"
+#include "string-util.h"
 
 static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
 
@@ -23,6 +24,20 @@ const char* af_to_name(int id) {
         return af_names[id];
 }
 
+const char* af_to_name_short(int id) {
+        const char *f;
+
+        if (id == AF_UNSPEC)
+                return "*";
+
+        f = af_to_name(id);
+        if (!f)
+                return "unknown";
+
+        assert(startswith(f, "AF_"));
+        return f + 3;
+}
+
 int af_from_name(const char *name) {
         const struct af_name *sc;
 
diff --git a/src/basic/af-list.h b/src/basic/af-list.h
index e17762a35c0..07f50564583 100644
--- a/src/basic/af-list.h
+++ b/src/basic/af-list.h
@@ -1,26 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <sys/socket.h>
+#include "macro.h"
 
-#include "string-util.h"
+const char* af_to_name(int id) _const_;
+int af_from_name(const char *name) _pure_;
 
-const char* af_to_name(int id);
-int af_from_name(const char *name);
-
-static inline const char* af_to_name_short(int id) {
-        const char *f;
-
-        if (id == AF_UNSPEC)
-                return "*";
-
-        f = af_to_name(id);
-        if (!f)
-                return "unknown";
-
-        assert(startswith(f, "AF_"));
-        return f + 3;
-}
+const char* af_to_name_short(int id) _const_;
 
 const char* af_to_ipv4_ipv6(int id);
 int af_from_ipv4_ipv6(const char *af);
diff --git a/src/shared/parse-helpers.c b/src/shared/parse-helpers.c
index 63f592d18ee..348dce50590 100644
--- a/src/shared/parse-helpers.c
+++ b/src/shared/parse-helpers.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <sys/socket.h>
+
 #include "af-list.h"
 #include "extract-word.h"
 #include "ip-protocol-list.h"
-- 
2.47.3