diff --git a/src/util.h b/src/util.h
index eea23e8..9106161 100644
--- a/src/util.h
+++ b/src/util.h
@@ -24,8 +24,6 @@
 #ifndef UTIL_H_
 #define UTIL_H_
 
-#include "tinyglib.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -47,6 +45,7 @@
 #endif
 
 #include "libslirp.h"
+#include "tinyglib.h"
 
 #ifdef __GNUC__
 #define SLIRP_PACKED_BEGIN
diff --git a/src/vmstate.c b/src/vmstate.c
index 4f2aed0..02eb7ee 100644
--- a/src/vmstate.c
+++ b/src/vmstate.c
@@ -39,10 +39,6 @@
  */
 #include <assert.h>
 #include <errno.h>
-#include <string.h>
-#include "tinyglib.h"
-
-#include "stream.h"
 #include "vmstate.h"
 
 static int get_nullptr(SlirpIStream *f, void *pv, size_t size,