From a35d2c01a5f079a4badbd3e871ff55d23eae4df7 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Tue, 12 Apr 2016 16:14:39 +0200
Subject: [PATCH] Bug 1246931: Include dbus.h in DBus IPC headers, r=shuang

The header files for DBus IPC forward declare several DBus types in
a way that interferes with the actual declarations. It's better to
include the DBus headers directly
---
 ipc/dbus/DBusUtils.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ipc/dbus/DBusUtils.h b/ipc/dbus/DBusUtils.h
index 42e046d1ed5a..bf3dac93aa73 100644
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -19,6 +19,7 @@
 #ifndef mozilla_ipc_dbus_dbusutils_h__
 #define mozilla_ipc_dbus_dbusutils_h__
 
+#include <dbus/dbus.h>
 #include "mozilla/RefPtr.h"
 
 // LOGE and free a D-Bus error
@@ -26,9 +27,6 @@
 #define LOG_AND_FREE_DBUS_ERROR_WITH_MSG(err, msg) log_and_free_dbus_error(err, __FUNCTION__, msg);
 #define LOG_AND_FREE_DBUS_ERROR(err) log_and_free_dbus_error(err, __FUNCTION__);
 
-struct DBusError;
-struct DBusMessage;
-
 namespace mozilla {
 namespace ipc {