4 files changed, 4 insertions, 4 deletions
diff --git a/src/libs6dns/s6dns_analyze_packet.c b/src/libs6dns/s6dns_analyze_packet.c
index 57a5ce5..8932ab3 100644
--- a/src/libs6dns/s6dns_analyze_packet.c
+++ b/src/libs6dns/s6dns_analyze_packet.c
@@ -3,9 +3,9 @@
 #include <errno.h>
 #include <skalibs/error.h>
 #include <skalibs/uint16.h>
+#include <skalibs/uint.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/genwrite.h>
-#include <skalibs/fmtscan.h>
 #include <s6-dns/s6dns-constants.h>
 #include <s6-dns/s6dns-domain.h>
 #include <s6-dns/s6dns-message.h>
diff --git a/src/libs6dns/s6dns_constants_error_str.c b/src/libs6dns/s6dns_constants_error_str.c
index 9dda1a7..6d477c2 100644
--- a/src/libs6dns/s6dns_constants_error_str.c
+++ b/src/libs6dns/s6dns_constants_error_str.c
@@ -5,7 +5,7 @@
 
 char const *s6dns_constants_error_str (int e)
 {
-  s6dns_constants_error_message_t *p = s6dns_constants_error ;
+  s6dns_constants_error_message_t const *p = s6dns_constants_error ;
   while ((p->num != e) && (p->num != -1)) p++ ;
   return p->num == -1 ? error_str(e) : p->string ;
 }
diff --git a/src/libs6dns/s6dns_engine.c b/src/libs6dns/s6dns_engine.c
index 4145ef7..207069e 100644
--- a/src/libs6dns/s6dns_engine.c
+++ b/src/libs6dns/s6dns_engine.c
@@ -14,9 +14,9 @@
 #include <skalibs/ip46.h>
 #include <skalibs/random.h>
 #include <s6-dns/s6dns-constants.h>
-#include <s6-dns/s6dns-message-internal.h>
 #include <s6-dns/s6dns-message.h>
 #include <s6-dns/s6dns-engine.h>
+#include "s6dns-message-internal.h"
 
 
  /* Utility functions */
diff --git a/src/libs6dns/s6dns_message_get_domain.c b/src/libs6dns/s6dns_message_get_domain.c
index b51adb5..7d2cfc6 100644
--- a/src/libs6dns/s6dns_message_get_domain.c
+++ b/src/libs6dns/s6dns_message_get_domain.c
@@ -1,8 +1,8 @@
 /* ISC license. */
 
 #include <s6-dns/s6dns-domain.h>
-#include <s6-dns/s6dns-message-internal.h>
 #include <s6-dns/s6dns-message.h>
+#include "s6dns-message-internal.h"
 
 int s6dns_message_get_domain (s6dns_domain_t *d, char const *packet, unsigned int packetlen, unsigned int *pos)
 {