From 95a69bc2847c29efd6ad9dc814d4bb1c4f825781 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Mar 28 2011 21:03:54 +0000
Subject: - fixup some warnings

- retag 0.40

---

diff --git a/src/env.h b/src/env.h
index 46114f2..74dead7 100644
--- a/src/env.h
+++ b/src/env.h
@@ -18,10 +18,6 @@
 #ifndef cmenv_h
 #define cmenv_h
 
-#include <dbus/dbus.h>
-
-#include "tdbus.h"
-
 char *cm_env_config_dir(void);
 char *cm_env_request_dir(void);
 char *cm_env_ca_dir(void);
diff --git a/src/prefs.c b/src/prefs.c
index 91d0034..ccb1de1 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <dbus/dbus.h>
+
 #include "env.h"
 #include "prefs.h"
 #include "store-int.h"
diff --git a/src/store-files.c b/src/store-files.c
index 5213ce2..72c8573 100644
--- a/src/store-files.c
+++ b/src/store-files.c
@@ -33,6 +33,7 @@
 #include <dbus/dbus.h>
 #include <talloc.h>
 
+#include "env.h"
 #include "store.h"
 #include "store-int.h"
 #include "log.h"