diff --git a/src/db-builder-gdir.c b/src/db-builder-gdir.c
index 6abef95..0d3ded5 100644
--- a/src/db-builder-gdir.c
+++ b/src/db-builder-gdir.c
@@ -22,7 +22,6 @@
 #include "db-builder-gdir.h"
 
 #include <glib.h>
-#include <glib-object.h>
 
 /*
 struct DbBuilderGDirPrivate {
diff --git a/src/dmapd-dmap-container-db.c b/src/dmapd-dmap-container-db.c
index 81a171a..2c4b82d 100644
--- a/src/dmapd-dmap-container-db.c
+++ b/src/dmapd-dmap-container-db.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "dmapd-dmap-container-db.h"
 #include "dmapd-dmap-container-record.h"
diff --git a/src/dmapd-dmap-db-disk.c b/src/dmapd-dmap-db-disk.c
index c1a4834..636a183 100644
--- a/src/dmapd-dmap-db-disk.c
+++ b/src/dmapd-dmap-db-disk.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "util.h"
 #include "dmapd-dmap-db-disk.h"
diff --git a/src/dmapd-dmap-db-ghashtable.c b/src/dmapd-dmap-db-ghashtable.c
index 8c377c6..3f54024 100644
--- a/src/dmapd-dmap-db-ghashtable.c
+++ b/src/dmapd-dmap-db-ghashtable.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "util.h"
 #include "dmapd-dmap-db-ghashtable.h"
diff --git a/src/dmapd.c b/src/dmapd.c
index 00c1b06..c6348ed 100644
--- a/src/dmapd.c
+++ b/src/dmapd.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -32,7 +33,6 @@
 #include <pwd.h>
 #include <grp.h>
 #include <glib.h>
-#include <glib/gprintf.h>
 #include <libdmapsharing/dmap.h>
 
 #include "dmapd-dmap-container-record.h"