4 files changed, 8 insertions, 4 deletions
diff --git a/src/daemon/CommLayerServerDBus.c b/src/daemon/CommLayerServerDBus.c
index 8311dc69..64930d5d 100644
--- a/src/daemon/CommLayerServerDBus.c
+++ b/src/daemon/CommLayerServerDBus.c
@@ -17,11 +17,17 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include <dbus/dbus.h>
+#include <internal_abrt_dbus.h>
 #include "abrtlib.h"
-#include "abrt_dbus.h"
 #include "comm_layer_inner.h"
 #include "CommLayerServerDBus.h"
 
+
+#define ABRTD_DBUS_NAME  "com.redhat.abrt"
+#define ABRTD_DBUS_PATH  "/com/redhat/abrt"
+#define ABRTD_DBUS_IFACE "com.redhat.abrt"
+
+
 /*
  * DBus signal emitters
  */
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index df8de7b9..80217b3c 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -19,7 +19,6 @@
 #include <fnmatch.h>
 #include "abrtlib.h"
 #include "rpm.h"
-#include "parse_options.h"
 
 // TODO: convert g_settings_foo usage to command-line switches
 
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index 367289f8..20caaaec 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -15,8 +15,8 @@
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+#include <syslog.h>
 #include "abrtlib.h"
-#include "parse_options.h"
 
 /* Maximal length of backtrace. */
 #define MAX_BACKTRACE_SIZE (1024*1024)
diff --git a/src/daemon/abrtd.c b/src/daemon/abrtd.c
index 32d948a5..8a22ab82 100644
--- a/src/daemon/abrtd.c
+++ b/src/daemon/abrtd.c
@@ -27,7 +27,6 @@
 #include "abrtlib.h"
 #include "comm_layer_inner.h"
 #include "CommLayerServerDBus.h"
-#include "parse_options.h"
 
 #define VAR_RUN_PIDFILE   VAR_RUN"/abrtd.pid"