diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index cb82317119fb8a247cc8df83a488c5746cea3d56..05aa2d1e6b6ec5ad825866e3c7224463c2fe461f 100644
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -10,6 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
 #include "ui/console.h"
 
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 5019bbbef1f4fc38efb47612485ca48d7a0c96df..c231960d96abd4192052b1238b7b7d85ddc2627c 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/devices.h"
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index e309fbe92ed656b7779404e1d33a62e76a8f301a..321a25157bd8e0c2763f7adbbd0b09226711b187 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 5198037d821d10999006e6baf94733099b1c2517..b6ce1c8bc71218fed28e653cb44d23f8817cb5bf 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -26,6 +26,7 @@
  * Reference: Finn Thogersons' VGADOC4b
  *   available at http://home.worldonline.dk/~finth/
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "ui/console.h"
diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c
index 7f075ce776ab4a9646c7ecc16d79886997e4a6ce..df51358e7285b6a9d1354354a3b2003f6ebe87e9 100644
--- a/hw/display/framebuffer.c
+++ b/hw/display/framebuffer.c
@@ -17,6 +17,7 @@
    - Remove all DisplayState knowledge from devices.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "framebuffer.h"
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 7f83a007b7046aa34d00fe6c773763e9ee395fbb..70ef2c7453338a2f75ccff31b9a8557359a141c5 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 1ea49b7389902d8ffcb4b83f960e97bb517e57b5..09dcdb46a34501aedaf97148fa9e254015ab274c 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c
index b1c7af5819db7fb39317ed571ba6d6b6ab9398c1..783e9e131831fd291712ee3229fa36b02e7aa782 100644
--- a/hw/display/omap_dss.c
+++ b/hw/display/omap_dss.c
@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c
index 678f9a1b423255c2aa6311b43bbc50bbfd7f4b38..ce1058bf85f8bf94dd19266cb01920e55cb03ed0 100644
--- a/hw/display/omap_lcdc.c
+++ b/hw/display/omap_lcdc.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c
index d944d3fdb519728cabfb7af18d8450a8759d981b..2ec6d8fa3d6cd3b6596d76654d53a923e64c5164 100644
--- a/hw/display/qxl-logger.c
+++ b/hw/display/qxl-logger.c
@@ -19,6 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "qxl.h"
 
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 7e4ef1ed04dd0c8003c878fdb2cafce46fab4e7b..9ad9d9e0f56d1c7c56a6d55358720b01fa2f5f7e 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -19,6 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qxl.h"
 #include "trace.h"
 
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 8a3040cbbf711825d12cc27d9d8d14b189894e35..a423deeceab1ebfdb93b37bd8ffa1cfd691082b3 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include <zlib.h>
-#include <stdint.h>
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 3c3f97824bffc37c55cafab065fe1839b5c9029c..29572437e416e9c2d91444e6f8971cbe1e98bffc 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "ui/console.h"
diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c
index f6804fb51b303deca4929b80dc1aa74762efeecb..d3017563f3f0973a2d9f416c17842997ed0602b7 100644
--- a/hw/display/ssd0303.c
+++ b/hw/display/ssd0303.c
@@ -10,6 +10,7 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+#include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 #include "ui/console.h"
 
diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
index 7545da88d7802c0724d7da6db81bf2f6f99256a8..14c1bf339ccf222fc048687a60cabfa0b3c37a7c 100644
--- a/hw/display/ssd0323.c
+++ b/hw/display/ssd0323.c
@@ -10,6 +10,7 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+#include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
 #include "ui/console.h"
 
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 516af1a5c3e2efe07af036ed9aa29ba705e85d26..31043b178361c46b46f957e0575678c3fd6dcc74 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -10,6 +10,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/devices.h"
 #include "hw/block/flash.h"
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index d720ea66662c2d18a60e8f8bd9e19a8054362135..8afc2f33c6d00bc32d75934e11badd089b47f430 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c
index 4efc222789e318113dc1ce97c23a418e99a8ec10..51ccbccc41927f1f73f07741c9f44ee519c0af47 100644
--- a/hw/display/vga-isa-mm.c
+++ b/hw/display/vga-isa-mm.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/i386/pc.h"
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 7f3c98941bec4502467238dd66d9a9e94b6c8efc..f5aff1cbe08962d4d18ceab79b86aaa974be02ff 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -23,6 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/i386/pc.h"
diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 1dfa331e6013313eeb7b7e22b1970d9d4ea0b3a0..ac9a76499e9074658366e2e29f69b555c5ecca44 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -23,6 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/pci/pci.h"
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 84ce0af5623d33e26c397b01af69779973699bc4..555cac64c7ddcd9de6043d3f40562810a4ec8492 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "vga.h"
 #include "ui/console.h"
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 9354037852d631e636d017c89648b0fd55486ce2..17bba630eb149b3d851718b15815e15010df0abc 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "trace.h"