diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 7a2b4bc1e..54e7f4d0a 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -103,4 +103,8 @@ if LNXACPI
 XORG_CFLAGS += -DHAVE_ACPI
 endif
 
+if NEED_DBUS
+XORG_CFLAGS += $(DBUS_CFLAGS)
+endif
+
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/include/dbus-core.h b/include/dbus-core.h
index b2d6d1b9e..d6260dc66 100644
--- a/include/dbus-core.h
+++ b/include/dbus-core.h
@@ -27,7 +27,7 @@
 #define DBUS_CORE_H
 
 #ifdef NEED_DBUS
-typedef struct DBusConnection DBusConnection;
+#include <dbus/dbus.h>
 
 typedef void (*dbus_core_connect_hook) (DBusConnection * connection,
                                                void *data);