diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
index 53451eb22d..2c60310cf9 100644
--- a/hw/vfio/amd-xgbe.c
+++ b/hw/vfio/amd-xgbe.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/vfio/vfio-amd-xgbe.h"
 
 static void amd_xgbe_realize(DeviceState *dev, Error **errp)
diff --git a/tests/boot-sector.c b/tests/boot-sector.c
index 0b48bb34bf..3ffe2987ff 100644
--- a/tests/boot-sector.c
+++ b/tests/boot-sector.c
@@ -10,9 +10,8 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "boot-sector.h"
-#include <string.h>
-#include <stdio.h>
 #include "qemu-common.h"
 #include "libqtest.h"
 
diff --git a/tests/pxe-test.c b/tests/pxe-test.c
index fa430958ea..875e4c4a26 100644
--- a/tests/pxe-test.c
+++ b/tests/pxe-test.c
@@ -11,8 +11,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "qemu-common.h"