diff --git a/src/dict.h b/src/dict.h
index 90372dfb..b49b8716 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -61,7 +61,7 @@ struct getdns_dict
 	struct mem_funcs mf;
 };
 
-inline static getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf)
+static inline getdns_dict *_getdns_dict_create_with_mf(struct mem_funcs *mf)
 { return getdns_dict_create_with_extended_memory_functions(
          mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }
 
diff --git a/src/dnssec.c b/src/dnssec.c
index 2e6425fb..b46be44b 100644
--- a/src/dnssec.c
+++ b/src/dnssec.c
@@ -217,7 +217,7 @@
 /*******************  Frequently Used Utility Functions  *********************
  *****************************************************************************/
 
-inline static size_t _dname_len(const uint8_t *name)
+static inline size_t _dname_len(const uint8_t *name)
 {
 	const uint8_t *p;
 	for (p = name; *p; p += *p + 1)
@@ -226,7 +226,7 @@ inline static size_t _dname_len(const uint8_t *name)
 	return p - name + 1;
 }
 
-inline static size_t _dname_label_count(const uint8_t *name)
+static inline size_t _dname_label_count(const uint8_t *name)
 {
 	size_t c;
 	for (c = 0; *name; name += *name + 1, c++)
@@ -235,7 +235,7 @@ inline static size_t _dname_label_count(const uint8_t *name)
 	return c;
 }
 
-inline static int _dname_equal(const uint8_t *left, const uint8_t *right)
+static inline int _dname_equal(const uint8_t *left, const uint8_t *right)
 {
 	return _getdns_dname_equal(left, right);
 }
@@ -382,7 +382,7 @@ static int bitmap_has_type(_getdns_rdf_iter *bitmap, uint16_t rr_type)
 }
 
 #if defined(SEC_DEBUG) && SEC_DEBUG
-inline static void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr)
+static inline void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr)
 {
 	char str_spc[8192], *str = str_spc;
 	size_t str_len = sizeof(str_spc);
@@ -398,7 +398,7 @@ inline static void debug_sec_print_rr(const char *msg, _getdns_rr_iter *rr)
 	    (UNCONST_UINT8_p) rr->pkt, rr->pkt_end - rr->pkt);
 	DEBUG_SEC("%s%s", msg, str_spc);
 }
-inline static void debug_sec_print_dname(const char *msg, const uint8_t *label)
+static inline void debug_sec_print_dname(const char *msg, const uint8_t *label)
 {
 	char str[1024];
 
@@ -1232,7 +1232,7 @@ typedef struct canon_rdata_iter {
 	size_t            len;
 } canon_rdata_iter;
 
-inline static void canon_rdata_iter_field_init(canon_rdata_iter *i)
+static inline void canon_rdata_iter_field_init(canon_rdata_iter *i)
 {
 	for (;;) {
 		if ((i->rdf->rdd_pos->type & GETDNS_RDF_N) == GETDNS_RDF_N) {
@@ -1251,23 +1251,23 @@ inline static void canon_rdata_iter_field_init(canon_rdata_iter *i)
 	}
 }
 
-inline static void canon_rdata_iter_init(canon_rdata_iter*i,_getdns_rr_iter*rr)
+static inline void canon_rdata_iter_init(canon_rdata_iter*i,_getdns_rr_iter*rr)
 {
 	if ((i->rdf = _getdns_rdf_iter_init(&i->rdf_spc, rr)))
 		canon_rdata_iter_field_init(i);
 }
 
-inline static int canon_rdata_iter_data(canon_rdata_iter *i)
+static inline int canon_rdata_iter_data(canon_rdata_iter *i)
 {
 	return i->rdf != NULL;
 }
 
-inline static uint8_t canon_rdata_iter_byte(canon_rdata_iter *i)
+static inline uint8_t canon_rdata_iter_byte(canon_rdata_iter *i)
 {
 	return *i->pos;
 }
 
-inline static void canon_rdata_iter_next(canon_rdata_iter *i)
+static inline void canon_rdata_iter_next(canon_rdata_iter *i)
 {
 	if (--i->len == 0 && (i->rdf = _getdns_rdf_iter_next(i->rdf)))
 		canon_rdata_iter_field_init(i);
diff --git a/src/dnssec.h b/src/dnssec.h
index ae131efc..4237f933 100644
--- a/src/dnssec.h
+++ b/src/dnssec.h
@@ -49,7 +49,7 @@ void _getdns_get_validation_chain(getdns_dns_req *dns_req);
 
 uint16_t _getdns_parse_ta_file(time_t *ta_mtime, gldns_buffer *gbuf);
 
-inline static int _dnssec_rdata_to_canonicalize(uint16_t rr_type)
+static inline int _dnssec_rdata_to_canonicalize(uint16_t rr_type)
 {
 	return rr_type == GLDNS_RR_TYPE_NS    || rr_type == GLDNS_RR_TYPE_MD
 	    || rr_type == GLDNS_RR_TYPE_MF    || rr_type == GLDNS_RR_TYPE_CNAME
diff --git a/src/list.h b/src/list.h
index 29aff579..a68351fe 100644
--- a/src/list.h
+++ b/src/list.h
@@ -59,7 +59,7 @@ struct getdns_list
 	struct mem_funcs mf;
 };
 
-inline static getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf)
+static inline getdns_list *_getdns_list_create_with_mf(struct mem_funcs *mf)
 { return getdns_list_create_with_extended_memory_functions(
          mf->mf_arg, mf->mf.ext.malloc, mf->mf.ext.realloc, mf->mf.ext.free); }
 
diff --git a/src/ub_loop.h b/src/ub_loop.h
index 94ad4699..e73667f5 100644
--- a/src/ub_loop.h
+++ b/src/ub_loop.h
@@ -69,7 +69,7 @@ typedef struct _getdns_ub_loop {
 
 void _getdns_ub_loop_init(_getdns_ub_loop *loop, struct mem_funcs *mf, getdns_eventloop *extension);
 
-inline static int _getdns_ub_loop_enabled(_getdns_ub_loop *loop)
+static inline int _getdns_ub_loop_enabled(_getdns_ub_loop *loop)
 { return loop->super.vmt ? 1 : 0; }
 
 #endif /* HAVE_UNBOUND_EVENT_API */
diff --git a/src/util-internal.c b/src/util-internal.c
index 3a70f81c..47a3fd21 100644
--- a/src/util-internal.c
+++ b/src/util-internal.c
@@ -438,7 +438,7 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
 }
 
 
-inline static getdns_dict *
+static inline getdns_dict *
 set_dict(getdns_dict **var, getdns_dict *value)
 {
 	if (*var)
@@ -446,7 +446,7 @@ set_dict(getdns_dict **var, getdns_dict *value)
 	return *var = value;
 }
 
-inline static int has_all_numeric_label(const uint8_t *dname)
+static inline int has_all_numeric_label(const uint8_t *dname)
 {
 	size_t i;