sd-netlink: unexport sd-netlink

This effectively reverts 84e1001541151da71bae2137e2a1c254b5a3b89f.

The sd-netlink library has several issues, and we should not export it
without solving them. See issues #24258 and #24124.

6 files changed, 136 insertions, 291 deletions

diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 3510beea5b..18717cbb7b 100644
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -791,159 +791,4 @@ global:
         sd_id128_string_equal;
 
         sd_hwdb_new_from_path;
-
-        sd_netlink_open;
-        sd_netlink_open_fd;
-        sd_netlink_increase_rxbuf;
-        sd_netlink_ref;
-        sd_netlink_unref;
-        sd_netlink_send;
-        sd_netlink_call_async;
-        sd_netlink_call;
-        sd_netlink_read;
-        sd_netlink_get_events;
-        sd_netlink_get_timeout;
-        sd_netlink_process;
-        sd_netlink_wait;
-        sd_netlink_add_match;
-        sd_netlink_attach_event;
-        sd_netlink_detach_event;
-        sd_netlink_attach_filter;
-        sd_netlink_message_append_string;
-        sd_netlink_message_append_strv;
-        sd_netlink_message_append_flag;
-        sd_netlink_message_append_u8;
-        sd_netlink_message_append_u16;
-        sd_netlink_message_append_u32;
-        sd_netlink_message_append_u64;
-        sd_netlink_message_append_s8;
-        sd_netlink_message_append_s16;
-        sd_netlink_message_append_s32;
-        sd_netlink_message_append_s64;
-        sd_netlink_message_append_data;
-        sd_netlink_message_append_container_data;
-        sd_netlink_message_append_in_addr;
-        sd_netlink_message_append_in6_addr;
-        sd_netlink_message_append_sockaddr_in;
-        sd_netlink_message_append_sockaddr_in6;
-        sd_netlink_message_append_ether_addr;
-        sd_netlink_message_append_cache_info;
-        sd_netlink_message_open_container;
-        sd_netlink_message_open_container_union;
-        sd_netlink_message_close_container;
-        sd_netlink_message_read;
-        sd_netlink_message_read_data;
-        sd_netlink_message_read_data_suffix0;
-        sd_netlink_message_read_string_strdup;
-        sd_netlink_message_read_string;
-        sd_netlink_message_read_strv;
-        sd_netlink_message_read_u8;
-        sd_netlink_message_read_u16;
-        sd_netlink_message_read_u32;
-        sd_netlink_message_read_ether_addr;
-        sd_netlink_message_read_cache_info;
-        sd_netlink_message_read_in_addr;
-        sd_netlink_message_read_in6_addr;
-        sd_netlink_message_has_flag;
-        sd_netlink_message_enter_container;
-        sd_netlink_message_enter_array;
-        sd_netlink_message_exit_container;
-        sd_netlink_message_open_array;
-        sd_netlink_message_cancel_array;
-        sd_netlink_message_rewind;
-        sd_netlink_message_next;
-        sd_netlink_message_ref;
-        sd_netlink_message_unref;
-        sd_netlink_message_set_request_dump;
-        sd_netlink_message_is_error;
-        sd_netlink_message_get_errno;
-        sd_netlink_message_get_type;
-        sd_netlink_message_set_flags;
-        sd_netlink_message_is_broadcast;
-        sd_netlink_message_get_max_attribute;
-        sd_netlink_slot_ref;
-        sd_netlink_slot_unref;
-        sd_netlink_slot_get_netlink;
-        sd_netlink_slot_get_userdata;
-        sd_netlink_slot_set_userdata;
-        sd_netlink_slot_get_destroy_callback;
-        sd_netlink_slot_set_destroy_callback;
-        sd_netlink_slot_get_floating;
-        sd_netlink_slot_set_floating;
-        sd_netlink_slot_get_description;
-        sd_netlink_slot_set_description;
-
-        sd_rtnl_message_get_family;
-        sd_rtnl_message_new_addr;
-        sd_rtnl_message_new_addr_update;
-        sd_rtnl_message_addr_set_prefixlen;
-        sd_rtnl_message_addr_set_scope;
-        sd_rtnl_message_addr_set_flags;
-        sd_rtnl_message_addr_get_family;
-        sd_rtnl_message_addr_get_prefixlen;
-        sd_rtnl_message_addr_get_scope;
-        sd_rtnl_message_addr_get_flags;
-        sd_rtnl_message_addr_get_ifindex;
-        sd_rtnl_message_new_link;
-        sd_rtnl_message_link_set_flags;
-        sd_rtnl_message_link_set_type;
-        sd_rtnl_message_link_set_family;
-        sd_rtnl_message_link_get_ifindex;
-        sd_rtnl_message_link_get_flags;
-        sd_rtnl_message_link_get_type;
-        sd_rtnl_message_new_route;
-        sd_rtnl_message_route_set_dst_prefixlen;
-        sd_rtnl_message_route_set_src_prefixlen;
-        sd_rtnl_message_route_set_scope;
-        sd_rtnl_message_route_set_flags;
-        sd_rtnl_message_route_set_table;
-        sd_rtnl_message_route_set_type;
-        sd_rtnl_message_route_get_flags;
-        sd_rtnl_message_route_get_family;
-        sd_rtnl_message_route_get_protocol;
-        sd_rtnl_message_route_get_scope;
-        sd_rtnl_message_route_get_tos;
-        sd_rtnl_message_route_get_table;
-        sd_rtnl_message_route_get_dst_prefixlen;
-        sd_rtnl_message_route_get_src_prefixlen;
-        sd_rtnl_message_route_get_type;
-        sd_rtnl_message_new_nexthop;
-        sd_rtnl_message_nexthop_set_flags;
-        sd_rtnl_message_nexthop_get_flags;
-        sd_rtnl_message_nexthop_get_family;
-        sd_rtnl_message_nexthop_get_protocol;
-        sd_rtnl_message_new_neigh;
-        sd_rtnl_message_neigh_set_flags;
-        sd_rtnl_message_neigh_set_state;
-        sd_rtnl_message_neigh_get_family;
-        sd_rtnl_message_neigh_get_ifindex;
-        sd_rtnl_message_neigh_get_state;
-        sd_rtnl_message_neigh_get_flags;
-        sd_rtnl_message_new_addrlabel;
-        sd_rtnl_message_addrlabel_set_prefixlen;
-        sd_rtnl_message_addrlabel_get_prefixlen;
-        sd_rtnl_message_new_routing_policy_rule;
-        sd_rtnl_message_routing_policy_rule_set_tos;
-        sd_rtnl_message_routing_policy_rule_get_tos;
-        sd_rtnl_message_routing_policy_rule_set_table;
-        sd_rtnl_message_routing_policy_rule_get_table;
-        sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen;
-        sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen;
-        sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen;
-        sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen;
-        sd_rtnl_message_routing_policy_rule_set_fib_type;
-        sd_rtnl_message_routing_policy_rule_get_fib_type;
-        sd_rtnl_message_routing_policy_rule_set_flags;
-        sd_rtnl_message_routing_policy_rule_get_flags;
-        sd_rtnl_message_new_traffic_control;
-        sd_rtnl_message_traffic_control_get_ifindex;
-        sd_rtnl_message_traffic_control_get_handle;
-        sd_rtnl_message_traffic_control_get_parent;
-        sd_rtnl_message_new_mdb;
-
-        sd_genl_socket_open;
-        sd_genl_message_new;
-        sd_genl_message_get_family_name;
-        sd_genl_message_get_command;
-        sd_genl_add_match;
 } LIBSYSTEMD_251;
diff --git a/src/libsystemd/sd-netlink/netlink-genl.c b/src/libsystemd/sd-netlink/netlink-genl.c
index aeb4b8a686..1dc62e89ba 100644
--- a/src/libsystemd/sd-netlink/netlink-genl.c
+++ b/src/libsystemd/sd-netlink/netlink-genl.c
@@ -365,7 +365,7 @@ int genl_get_policy_set_and_header_size(
         return 0;
 }
 
-_public_ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) {
+int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_t cmd, sd_netlink_message **ret) {
         const GenericNetlinkFamily *family;
         int r;
 
@@ -381,7 +381,7 @@ _public_ int sd_genl_message_new(sd_netlink *nl, const char *family_name, uint8_
         return genl_message_new(nl, family, cmd, ret);
 }
 
-_public_ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) {
+int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message *m, const char **ret) {
         const GenericNetlinkFamily *family;
         uint16_t nlmsg_type;
         int r;
@@ -403,7 +403,7 @@ _public_ int sd_genl_message_get_family_name(sd_netlink *nl, sd_netlink_message
         return 0;
 }
 
-_public_ int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) {
+int sd_genl_message_get_command(sd_netlink *nl, sd_netlink_message *m, uint8_t *ret) {
         struct genlmsghdr *h;
         uint16_t nlmsg_type;
         size_t size;
@@ -448,7 +448,7 @@ static int genl_family_get_multicast_group_id_by_name(const GenericNetlinkFamily
         return 0;
 }
 
-_public_ int sd_genl_add_match(
+int sd_genl_add_match(
                 sd_netlink *nl,
                 sd_netlink_slot **ret_slot,
                 const char *family_name,
@@ -483,6 +483,6 @@ _public_ int sd_genl_add_match(
                                           callback, destroy_callback, userdata, description);
 }
 
-_public_ int sd_genl_socket_open(sd_netlink **ret) {
+int sd_genl_socket_open(sd_netlink **ret) {
         return netlink_open_family(ret, NETLINK_GENERIC);
 }
diff --git a/src/libsystemd/sd-netlink/netlink-message-rtnl.c b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
index c7fe031c99..109f3ee814 100644
--- a/src/libsystemd/sd-netlink/netlink-message-rtnl.c
+++ b/src/libsystemd/sd-netlink/netlink-message-rtnl.c
@@ -57,7 +57,7 @@ static bool rtnl_message_type_is_mdb(uint16_t type) {
         return IN_SET(type, RTM_NEWMDB, RTM_DELMDB, RTM_GETMDB);
 }
 
-_public_ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -75,7 +75,7 @@ _public_ int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -93,7 +93,7 @@ _public_ int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) {
+int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned char scope) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -107,7 +107,7 @@ _public_ int sd_rtnl_message_route_set_scope(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) {
+int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned flags) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -121,7 +121,7 @@ _public_ int sd_rtnl_message_route_set_flags(sd_netlink_message *m, unsigned fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) {
+int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *flags) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -136,7 +136,7 @@ _public_ int sd_rtnl_message_route_get_flags(sd_netlink_message *m, unsigned *fl
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) {
+int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned char table) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -150,7 +150,7 @@ _public_ int sd_rtnl_message_route_set_table(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -165,7 +165,7 @@ _public_ int sd_rtnl_message_route_get_family(sd_netlink_message *m, int *family
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) {
+int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char *type) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -180,7 +180,7 @@ _public_ int sd_rtnl_message_route_get_type(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) {
+int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char type) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -194,7 +194,7 @@ _public_ int sd_rtnl_message_route_set_type(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) {
+int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned char *protocol) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -209,7 +209,7 @@ _public_ int sd_rtnl_message_route_get_protocol(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) {
+int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned char *scope) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -224,7 +224,7 @@ _public_ int sd_rtnl_message_route_get_scope(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) {
+int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -239,7 +239,7 @@ _public_ int sd_rtnl_message_route_get_tos(sd_netlink_message *m, uint8_t *tos)
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) {
+int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned char *table) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -254,7 +254,7 @@ _public_ int sd_rtnl_message_route_get_table(sd_netlink_message *m, unsigned cha
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) {
+int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsigned char *dst_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -269,7 +269,7 @@ _public_ int sd_rtnl_message_route_get_dst_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) {
+int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsigned char *src_len) {
         struct rtmsg *rtm;
 
         assert_return(m, -EINVAL);
@@ -284,7 +284,7 @@ _public_ int sd_rtnl_message_route_get_src_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **ret,
                               uint16_t nlmsg_type, int rtm_family,
                               unsigned char rtm_protocol) {
         struct rtmsg *rtm;
@@ -310,7 +310,7 @@ _public_ int sd_rtnl_message_new_route(sd_netlink *rtnl, sd_netlink_message **re
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret,
                                 uint16_t nlmsg_type, int nh_family,
                                 unsigned char nh_protocol) {
         struct nhmsg *nhm;
@@ -348,7 +348,7 @@ _public_ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) {
+int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t flags) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -361,7 +361,7 @@ _public_ int sd_rtnl_message_nexthop_set_flags(sd_netlink_message *m, uint8_t fl
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) {
+int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *ret) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -375,7 +375,7 @@ _public_ int sd_rtnl_message_nexthop_get_flags(sd_netlink_message *m, uint8_t *r
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) {
+int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *family) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -389,7 +389,7 @@ _public_ int sd_rtnl_message_nexthop_get_family(sd_netlink_message *m, uint8_t *
         return 0;
 }
 
-_public_ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) {
+int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t *protocol) {
         struct nhmsg *nhm;
 
         assert_return(m, -EINVAL);
@@ -403,7 +403,7 @@ _public_ int sd_rtnl_message_nexthop_get_protocol(sd_netlink_message *m, uint8_t
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) {
+int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flags) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -416,7 +416,7 @@ _public_ int sd_rtnl_message_neigh_set_flags(sd_netlink_message *m, uint8_t flag
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) {
+int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t state) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -429,7 +429,7 @@ _public_ int sd_rtnl_message_neigh_set_state(sd_netlink_message *m, uint16_t sta
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) {
+int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *flags) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -442,7 +442,7 @@ _public_ int sd_rtnl_message_neigh_get_flags(sd_netlink_message *m, uint8_t *fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) {
+int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *state) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -455,7 +455,7 @@ _public_ int sd_rtnl_message_neigh_get_state(sd_netlink_message *m, uint16_t *st
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -470,7 +470,7 @@ _public_ int sd_rtnl_message_neigh_get_family(sd_netlink_message *m, int *family
         return 0;
 }
 
-_public_ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) {
+int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index) {
         struct ndmsg *ndm;
 
         assert_return(m, -EINVAL);
@@ -485,7 +485,7 @@ _public_ int sd_rtnl_message_neigh_get_ifindex(sd_netlink_message *m, int *index
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_neigh(
+int sd_rtnl_message_new_neigh(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -518,7 +518,7 @@ _public_ int sd_rtnl_message_new_neigh(
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) {
+int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flags, unsigned change) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -534,7 +534,7 @@ _public_ int sd_rtnl_message_link_set_flags(sd_netlink_message *m, unsigned flag
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) {
+int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -548,7 +548,7 @@ _public_ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type)
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) {
+int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -562,7 +562,7 @@ _public_ int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned fam
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret,
+int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret,
                              uint16_t nlmsg_type, int index) {
         struct ifinfomsg *ifi;
         int r;
@@ -587,7 +587,7 @@ _public_ int sd_rtnl_message_new_link(sd_netlink *rtnl, sd_netlink_message **ret
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -605,7 +605,7 @@ _public_ int sd_rtnl_message_addr_set_prefixlen(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) {
+int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char flags) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -619,7 +619,7 @@ _public_ int sd_rtnl_message_addr_set_flags(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) {
+int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char scope) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -633,7 +633,7 @@ _public_ int sd_rtnl_message_addr_set_scope(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) {
+int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_family) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -648,7 +648,7 @@ _public_ int sd_rtnl_message_addr_get_family(sd_netlink_message *m, int *ret_fam
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) {
+int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned char *ret_prefixlen) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -663,7 +663,7 @@ _public_ int sd_rtnl_message_addr_get_prefixlen(sd_netlink_message *m, unsigned
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) {
+int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char *ret_scope) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -678,7 +678,7 @@ _public_ int sd_rtnl_message_addr_get_scope(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) {
+int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char *ret_flags) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -693,7 +693,7 @@ _public_ int sd_rtnl_message_addr_get_flags(sd_netlink_message *m, unsigned char
         return 0;
 }
 
-_public_ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) {
+int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_ifindex) {
         struct ifaddrmsg *ifa;
 
         assert_return(m, -EINVAL);
@@ -708,7 +708,7 @@ _public_ int sd_rtnl_message_addr_get_ifindex(sd_netlink_message *m, int *ret_if
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_addr(
+int sd_rtnl_message_new_addr(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -737,7 +737,7 @@ _public_ int sd_rtnl_message_new_addr(
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_addr_update(
+int sd_rtnl_message_new_addr_update(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 int index,
@@ -753,7 +753,7 @@ _public_ int sd_rtnl_message_new_addr_update(
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) {
+int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -768,7 +768,7 @@ _public_ int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifinde
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) {
+int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -783,7 +783,7 @@ _public_ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *fla
         return 0;
 }
 
-_public_ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) {
+int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) {
         struct ifinfomsg *ifi;
 
         assert_return(m, -EINVAL);
@@ -798,7 +798,7 @@ _public_ int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short
         return 0;
 }
 
-_public_ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
+int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
         assert_return(m, -EINVAL);
         assert_return(family, -EINVAL);
 
@@ -857,7 +857,7 @@ _public_ int sd_rtnl_message_get_family(sd_netlink_message *m, int *family) {
         return -EOPNOTSUPP;
 }
 
-_public_ int sd_rtnl_message_new_addrlabel(
+int sd_rtnl_message_new_addrlabel(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -885,7 +885,7 @@ _public_ int sd_rtnl_message_new_addrlabel(
         return 0;
 }
 
-_public_ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
+int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsigned char prefixlen) {
         struct ifaddrlblmsg *addrlabel;
 
         assert_return(m, -EINVAL);
@@ -902,7 +902,7 @@ _public_ int sd_rtnl_message_addrlabel_set_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) {
+int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsigned char *prefixlen) {
         struct ifaddrlblmsg *addrlabel;
 
         assert_return(m, -EINVAL);
@@ -916,7 +916,7 @@ _public_ int sd_rtnl_message_addrlabel_get_prefixlen(sd_netlink_message *m, unsi
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_routing_policy_rule(
+int sd_rtnl_message_new_routing_policy_rule(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -941,7 +941,7 @@ _public_ int sd_rtnl_message_new_routing_policy_rule(
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) {
+int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m, uint8_t tos) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -955,7 +955,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_tos(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) {
+int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m, uint8_t *tos) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -969,7 +969,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_tos(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) {
+int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m, uint8_t table) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -983,7 +983,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_table(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) {
+int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m, uint8_t *table) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -997,7 +997,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_table(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) {
+int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m, uint32_t flags) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1010,7 +1010,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_flags(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) {
+int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m, uint32_t *flags) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1023,7 +1023,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_flags(sd_netlink_message *m
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) {
+int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message *m, uint8_t type) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1037,7 +1037,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_type(sd_netlink_message
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) {
+int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message *m, uint8_t *type) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1051,7 +1051,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_type(sd_netlink_message
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) {
+int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlink_message *m, uint8_t len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1065,7 +1065,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_dst_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) {
+int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlink_message *m, uint8_t *len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1079,7 +1079,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_dst_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) {
+int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlink_message *m, uint8_t len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1093,7 +1093,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_set_fib_src_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) {
+int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlink_message *m, uint8_t *len) {
         struct fib_rule_hdr *frh;
 
         assert_return(m, -EINVAL);
@@ -1107,7 +1107,7 @@ _public_ int sd_rtnl_message_routing_policy_rule_get_fib_src_prefixlen(sd_netlin
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_traffic_control(
+int sd_rtnl_message_new_traffic_control(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
@@ -1136,7 +1136,7 @@ _public_ int sd_rtnl_message_new_traffic_control(
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) {
+int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m, int *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1150,7 +1150,7 @@ _public_ int sd_rtnl_message_traffic_control_get_ifindex(sd_netlink_message *m,
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) {
+int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, uint32_t *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1164,7 +1164,7 @@ _public_ int sd_rtnl_message_traffic_control_get_handle(sd_netlink_message *m, u
         return 0;
 }
 
-_public_ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) {
+int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, uint32_t *ret) {
         struct tcmsg *tcm;
 
         assert_return(m, -EINVAL);
@@ -1178,7 +1178,7 @@ _public_ int sd_rtnl_message_traffic_control_get_parent(sd_netlink_message *m, u
         return 0;
 }
 
-_public_ int sd_rtnl_message_new_mdb(
+int sd_rtnl_message_new_mdb(
                 sd_netlink *rtnl,
                 sd_netlink_message **ret,
                 uint16_t nlmsg_type,
diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 33bec2ac9b..000a50ee3e 100644
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -113,7 +113,7 @@ int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_n
         return 0;
 }
 
-_public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) {
+int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) {
         assert_return(m, -EINVAL);
         assert_return(m->hdr, -EINVAL);
         assert_return(m->protocol != NETLINK_ROUTE ||
@@ -129,7 +129,7 @@ _public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump
 
 DEFINE_TRIVIAL_REF_FUNC(sd_netlink_message, sd_netlink_message);
 
-_public_ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
+sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
         while (m && --m->n_ref == 0) {
                 unsigned i;
 
@@ -146,7 +146,7 @@ _public_ sd_netlink_message* sd_netlink_message_unref(sd_netlink_message *m) {
         return NULL;
 }
 
-_public_ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
+int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
         assert_return(m, -EINVAL);
         assert_return(ret, -EINVAL);
 
@@ -155,7 +155,7 @@ _public_ int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *ret) {
         return 0;
 }
 
-_public_ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) {
+int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags) {
         assert_return(m, -EINVAL);
         assert_return(flags != 0, -EINVAL);
 
@@ -164,7 +164,7 @@ _public_ int sd_netlink_message_set_flags(sd_netlink_message *m, uint16_t flags)
         return 0;
 }
 
-_public_ int sd_netlink_message_is_broadcast(sd_netlink_message *m) {
+int sd_netlink_message_is_broadcast(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
 
         return m->multicast_group != 0;
@@ -230,7 +230,7 @@ static int message_attribute_has_type(sd_netlink_message *m, size_t *ret_size, u
         return 0;
 }
 
-_public_ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) {
+int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t attr_type, const char *data) {
         size_t length, size;
         int r;
 
@@ -256,7 +256,7 @@ _public_ int sd_netlink_message_append_string(sd_netlink_message *m, uint16_t at
         return 0;
 }
 
-_public_ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) {
+int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr_type, const char* const *data) {
         size_t length, size;
         int r;
 
@@ -284,7 +284,7 @@ _public_ int sd_netlink_message_append_strv(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr_type) {
         size_t size;
         int r;
 
@@ -302,7 +302,7 @@ _public_ int sd_netlink_message_append_flag(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) {
+int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -319,7 +319,7 @@ _public_ int sd_netlink_message_append_u8(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) {
+int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -336,7 +336,7 @@ _public_ int sd_netlink_message_append_u16(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) {
+int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -353,7 +353,7 @@ _public_ int sd_netlink_message_append_u32(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) {
+int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_type, uint64_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -370,7 +370,7 @@ _public_ int sd_netlink_message_append_u64(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) {
+int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_type, int8_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -387,7 +387,7 @@ _public_ int sd_netlink_message_append_s8(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) {
+int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_type, int16_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -404,7 +404,7 @@ _public_ int sd_netlink_message_append_s16(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) {
+int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_type, int32_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -421,7 +421,7 @@ _public_ int sd_netlink_message_append_s32(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) {
+int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_type, int64_t data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -438,7 +438,7 @@ _public_ int sd_netlink_message_append_s64(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) {
+int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr_type, const void *data, size_t len) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -451,7 +451,7 @@ _public_ int sd_netlink_message_append_data(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_append_container_data(
+int sd_netlink_message_append_container_data(
                 sd_netlink_message *m,
                 uint16_t container_type,
                 uint16_t attr_type,
@@ -493,11 +493,11 @@ int netlink_message_append_in_addr_union(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) {
+int sd_netlink_message_append_in_addr(sd_netlink_message *m, uint16_t attr_type, const struct in_addr *data) {
         return netlink_message_append_in_addr_union(m, attr_type, AF_INET, (const union in_addr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) {
+int sd_netlink_message_append_in6_addr(sd_netlink_message *m, uint16_t attr_type, const struct in6_addr *data) {
         return netlink_message_append_in_addr_union(m, attr_type, AF_INET6, (const union in_addr_union *) data);
 }
 
@@ -520,15 +520,15 @@ int netlink_message_append_sockaddr_union(sd_netlink_message *m, uint16_t attr_t
         return 0;
 }
 
-_public_ int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) {
+int sd_netlink_message_append_sockaddr_in(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in *data) {
         return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) {
+int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, uint16_t attr_type, const struct sockaddr_in6 *data) {
         return netlink_message_append_sockaddr_union(m, attr_type, (const union sockaddr_union *) data);
 }
 
-_public_ int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) {
+int sd_netlink_message_append_ether_addr(sd_netlink_message *m, uint16_t attr_type, const struct ether_addr *data) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -565,7 +565,7 @@ int netlink_message_append_hw_addr(sd_netlink_message *m, uint16_t attr_type, co
         return 0;
 }
 
-_public_ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) {
+int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_t attr_type, const struct ifa_cacheinfo *info) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -583,7 +583,7 @@ _public_ int sd_netlink_message_append_cache_info(sd_netlink_message *m, uint16_
         return 0;
 }
 
-_public_ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t attr_type) {
         size_t size;
         int r;
 
@@ -632,7 +632,7 @@ _public_ int sd_netlink_message_open_container(sd_netlink_message *m, uint16_t a
         return 0;
 }
 
-_public_ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) {
+int sd_netlink_message_open_container_union(sd_netlink_message *m, uint16_t attr_type, const char *key) {
         const NLAPolicySetUnion *policy_set_union;
         int r;
 
@@ -671,7 +671,7 @@ _public_ int sd_netlink_message_open_container_union(sd_netlink_message *m, uint
         return 0;
 }
 
-_public_ int sd_netlink_message_close_container(sd_netlink_message *m) {
+int sd_netlink_message_close_container(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
         assert_return(!m->sealed, -EPERM);
         assert_return(m->n_containers > 0, -EINVAL);
@@ -683,7 +683,7 @@ _public_ int sd_netlink_message_close_container(sd_netlink_message *m) {
         return 0;
 }
 
-_public_ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_type) {
         int r;
 
         assert_return(m, -EINVAL);
@@ -701,7 +701,7 @@ _public_ int sd_netlink_message_open_array(sd_netlink_message *m, uint16_t attr_
         return 0;
 }
 
-_public_ int sd_netlink_message_cancel_array(sd_netlink_message *m) {
+int sd_netlink_message_cancel_array(sd_netlink_message *m) {
         uint32_t rta_len;
 
         assert_return(m, -EINVAL);
@@ -757,7 +757,7 @@ static int netlink_message_read_internal(
         return RTA_PAYLOAD(rta);
 }
 
-_public_ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) {
+int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type, size_t size, void *data) {
         void *attr_data;
         int r;
 
@@ -776,7 +776,7 @@ _public_ int sd_netlink_message_read(sd_netlink_message *m, uint16_t attr_type,
         return r;
 }
 
-_public_ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
+int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
         void *attr_data;
         int r;
 
@@ -802,7 +802,7 @@ _public_ int sd_netlink_message_read_data(sd_netlink_message *m, uint16_t attr_t
         return r;
 }
 
-_public_ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
+int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_t attr_type, size_t *ret_size, void **ret_data) {
         void *attr_data;
         int r;
 
@@ -828,7 +828,7 @@ _public_ int sd_netlink_message_read_data_suffix0(sd_netlink_message *m, uint16_
         return r;
 }
 
-_public_ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) {
+int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16_t attr_type, char **data) {
         void *attr_data;
         int r;
 
@@ -855,7 +855,7 @@ _public_ int sd_netlink_message_read_string_strdup(sd_netlink_message *m, uint16
         return 0;
 }
 
-_public_ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) {
+int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr_type, const char **data) {
         void *attr_data;
         int r;
 
@@ -878,7 +878,7 @@ _public_ int sd_netlink_message_read_string(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) {
+int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_type, uint8_t *data) {
         void *attr_data;
         int r;
 
@@ -901,7 +901,7 @@ _public_ int sd_netlink_message_read_u8(sd_netlink_message *m, uint16_t attr_typ
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) {
+int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_type, uint16_t *data) {
         void *attr_data;
         bool net_byteorder;
         int r;
@@ -929,7 +929,7 @@ _public_ int sd_netlink_message_read_u16(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) {
+int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_type, uint32_t *data) {
         void *attr_data;
         bool net_byteorder;
         int r;
@@ -957,7 +957,7 @@ _public_ int sd_netlink_message_read_u32(sd_netlink_message *m, uint16_t attr_ty
         return 0;
 }
 
-_public_ int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) {
+int sd_netlink_message_read_ether_addr(sd_netlink_message *m, uint16_t attr_type, struct ether_addr *data) {
         void *attr_data;
         int r;
 
@@ -1005,7 +1005,7 @@ int netlink_message_read_hw_addr(sd_netlink_message *m, uint16_t attr_type, stru
         return 0;
 }
 
-_public_ int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) {
+int sd_netlink_message_read_cache_info(sd_netlink_message *m, uint16_t attr_type, struct ifa_cacheinfo *info) {
         void *attr_data;
         int r;
 
@@ -1052,7 +1052,7 @@ int netlink_message_read_in_addr_union(sd_netlink_message *m, uint16_t attr_type
         return 0;
 }
 
-_public_ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) {
+int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t attr_type, struct in_addr *data) {
         union in_addr_union u;
         int r;
 
@@ -1063,7 +1063,7 @@ _public_ int sd_netlink_message_read_in_addr(sd_netlink_message *m, uint16_t att
         return r;
 }
 
-_public_ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) {
+int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t attr_type, struct in6_addr *data) {
         union in_addr_union u;
         int r;
 
@@ -1074,7 +1074,7 @@ _public_ int sd_netlink_message_read_in6_addr(sd_netlink_message *m, uint16_t at
         return r;
 }
 
-_public_ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_type) {
         void *attr_data;
         int r;
 
@@ -1095,7 +1095,7 @@ _public_ int sd_netlink_message_has_flag(sd_netlink_message *m, uint16_t attr_ty
         return 1;
 }
 
-_public_ int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) {
+int sd_netlink_message_read_strv(sd_netlink_message *m, uint16_t container_type, uint16_t attr_type, char ***ret) {
         _cleanup_strv_free_ char **s = NULL;
         const NLAPolicySet *policy_set;
         const NLAPolicy *policy;
@@ -1192,7 +1192,7 @@ static int netlink_container_parse(
         return 0;
 }
 
-_public_ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t attr_type) {
         const NLAPolicy *policy;
         const NLAPolicySet *policy_set;
         void *container;
@@ -1279,7 +1279,7 @@ _public_ int sd_netlink_message_enter_container(sd_netlink_message *m, uint16_t
         return 0;
 }
 
-_public_ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) {
+int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr_type) {
         void *container;
         size_t size;
         int r;
@@ -1308,7 +1308,7 @@ _public_ int sd_netlink_message_enter_array(sd_netlink_message *m, uint16_t attr
         return 0;
 }
 
-_public_ int sd_netlink_message_exit_container(sd_netlink_message *m) {
+int sd_netlink_message_exit_container(sd_netlink_message *m) {
         assert_return(m, -EINVAL);
         assert_return(m->sealed, -EINVAL);
         assert_return(m->n_containers > 0, -EINVAL);
@@ -1322,7 +1322,7 @@ _public_ int sd_netlink_message_exit_container(sd_netlink_message *m) {
         return 0;
 }
 
-_public_ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) {
+int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_t *ret) {
         assert_return(m, -EINVAL);
         assert_return(m->sealed, -EINVAL);
         assert_return(ret, -EINVAL);
@@ -1331,14 +1331,14 @@ _public_ int sd_netlink_message_get_max_attribute(sd_netlink_message *m, uint16_
         return 0;
 }
 
-_public_ int sd_netlink_message_is_error(sd_netlink_message *m) {
+int sd_netlink_message_is_error(sd_netlink_message *m) {
         assert_return(m, 0);
         assert_return(m->hdr, 0);
 
         return m->hdr->nlmsg_type == NLMSG_ERROR;
 }
 
-_public_ int sd_netlink_message_get_errno(sd_netlink_message *m) {
+int sd_netlink_message_get_errno(sd_netlink_message *m) {
         struct nlmsgerr *err;
 
         assert_return(m, -EINVAL);
@@ -1373,7 +1373,7 @@ static int netlink_message_parse_error(sd_netlink_message *m) {
                                        NLMSG_PAYLOAD(m->hdr, hlen));
 }
 
-_public_ int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) {
+int sd_netlink_message_rewind(sd_netlink_message *m, sd_netlink *nl) {
         size_t size;
         int r;
 
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index b1a684a9af..feb751a848 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -69,7 +69,7 @@ static int netlink_new(sd_netlink **ret) {
         return 0;
 }
 
-_public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
+int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *nl = NULL;
         int r, protocol;
 
@@ -107,11 +107,11 @@ _public_ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         return 0;
 }
 
-_public_ int sd_netlink_open(sd_netlink **ret) {
+int sd_netlink_open(sd_netlink **ret) {
         return netlink_open_family(ret, NETLINK_ROUTE);
 }
 
-_public_ int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) {
+int sd_netlink_increase_rxbuf(sd_netlink *nl, size_t size) {
         assert_return(nl, -EINVAL);
         assert_return(!netlink_pid_changed(nl), -ECHILD);
 
@@ -155,7 +155,7 @@ static sd_netlink *netlink_free(sd_netlink *nl) {
 
 DEFINE_TRIVIAL_REF_UNREF_FUNC(sd_netlink, sd_netlink, netlink_free);
 
-_public_ int sd_netlink_send(
+int sd_netlink_send(
                 sd_netlink *nl,
                 sd_netlink_message *message,
                 uint32_t *serial) {
@@ -485,7 +485,7 @@ static int timeout_compare(const void *a, const void *b) {
         return CMP(x->timeout, y->timeout);
 }
 
-_public_ int sd_netlink_call_async(
+int sd_netlink_call_async(
                 sd_netlink *nl,
                 sd_netlink_slot **ret_slot,
                 sd_netlink_message *m,
@@ -550,7 +550,7 @@ _public_ int sd_netlink_call_async(
         return k;
 }
 
-_public_ int sd_netlink_read(
+int sd_netlink_read(
                 sd_netlink *nl,
                 uint32_t serial,
                 uint64_t usec,
@@ -627,7 +627,7 @@ _public_ int sd_netlink_read(
         }
 }
 
-_public_ int sd_netlink_call(
+int sd_netlink_call(
                 sd_netlink *nl,
                 sd_netlink_message *message,
                 uint64_t usec,
@@ -647,14 +647,14 @@ _public_ int sd_netlink_call(
         return sd_netlink_read(nl, serial, usec, ret);
 }
 
-_public_ int sd_netlink_get_events(sd_netlink *nl) {
+int sd_netlink_get_events(sd_netlink *nl) {
         assert_return(nl, -EINVAL);
         assert_return(!netlink_pid_changed(nl), -ECHILD);
 
         return nl->rqueue_size == 0 ? POLLIN : 0;
 }
 
-_public_ int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
+int sd_netlink_get_timeout(sd_netlink *nl, uint64_t *timeout_usec) {
         struct reply_callback *c;
 
         assert_return(nl, -EINVAL);
@@ -731,7 +731,7 @@ static int prepare_callback(sd_event_source *s, void *userdata) {
         return 1;
 }
 
-_public_ int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) {
+int sd_netlink_attach_event(sd_netlink *nl, sd_event *event, int64_t priority) {
         int r;
 
         assert_return(nl, -EINVAL);
@@ -783,7 +783,7 @@ fail:
         return r;
 }
 
-_public_ int sd_netlink_detach_event(sd_netlink *nl) {
+int sd_netlink_detach_event(sd_netlink *nl) {
         assert_return(nl, -EINVAL);
         assert_return(nl->event, -ENXIO);
 
@@ -846,7 +846,7 @@ int netlink_add_match_internal(
         return 0;
 }
 
-_public_ int sd_netlink_add_match(
+int sd_netlink_add_match(
                 sd_netlink *rtnl,
                 sd_netlink_slot **ret_slot,
                 uint16_t type,
@@ -916,7 +916,7 @@ _public_ int sd_netlink_add_match(
                                           destroy_callback, userdata, description);
 }
 
-_public_ int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) {
+int sd_netlink_attach_filter(sd_netlink *nl, size_t len, const struct sock_filter *filter) {
         assert_return(nl, -EINVAL);
         assert_return(len == 0 || filter, -EINVAL);
 
diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 6048c13859..c9e005b380 100644
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -12,7 +12,6 @@ _systemd_headers = [
         'sd-journal.h',
         'sd-login.h',
         'sd-messages.h',
-        'sd-netlink.h',
         'sd-path.h',
 ]
 
@@ -33,6 +32,7 @@ _not_installed_headers = [
         'sd-lldp-tx.h',
         'sd-lldp.h',
         'sd-ndisc.h',
+        'sd-netlink.h',
         'sd-network.h',
         'sd-radv.h',
         'sd-resolve.h',