diff --git a/ChangeLog b/ChangeLog
index 61884724..9d2aa9ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 26 20:11:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* lib/xmalloc.c include/glibtop/xmalloc.h: (glibtop_free_r):
+	Argument to free can't be const!
+
+	* include/glibtop/glibtop-client/backend.h 
+	  lib/glibtop-backend.c lib/glibtop-client.c: Include 
+	glib-object.h, not gobject/gobject.h.
+
 2001-10-13  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am, configure.in, libgtop-2.0.pc.in, libgtop.pc.in:
diff --git a/include/glibtop/glibtop-backend.h b/include/glibtop/glibtop-backend.h
index 4816a2c2..90cc5355 100644
--- a/include/glibtop/glibtop-backend.h
+++ b/include/glibtop/glibtop-backend.h
@@ -27,7 +27,7 @@
 #define __GLIBTOP_BACKEND_H__
 
 #include <glibtop.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/include/glibtop/glibtop-client.h b/include/glibtop/glibtop-client.h
index bea2a8f3..74de1b7b 100644
--- a/include/glibtop/glibtop-client.h
+++ b/include/glibtop/glibtop-client.h
@@ -27,7 +27,8 @@
 #define __GLIBTOP_CLIENT_H__
 
 #include <glibtop.h>
-#include <gobject/gobject.h>
+
+#include <glib-object.h>
 
 #include <glibtop/glibtop-backend.h>
 
diff --git a/include/glibtop/xmalloc.h b/include/glibtop/xmalloc.h
index fe85c8e4..e4cbf31c 100644
--- a/include/glibtop/xmalloc.h
+++ b/include/glibtop/xmalloc.h
@@ -35,7 +35,7 @@ void *glibtop_malloc_r	(glibtop_server *server, size_t size);
 void *glibtop_calloc_r	(glibtop_server *server, size_t nmemb, size_t size);
 void *glibtop_realloc_r	(glibtop_server *server, void *ptr, size_t size);
 char *glibtop_strdup_r	(glibtop_server *server, const char *string);
-void glibtop_free_r	(glibtop_server *server, const void *ptr);
+void glibtop_free_r	(glibtop_server *server, void *ptr);
 
 G_END_DECLS
 
diff --git a/lib/glibtop-backend.c b/lib/glibtop-backend.c
index cd234c5e..8606a2be 100644
--- a/lib/glibtop-backend.c
+++ b/lib/glibtop-backend.c
@@ -25,8 +25,7 @@
 
 #include <glibtop.h>
 
-#include <gobject/gsignal.h>
-#include <gobject/gvaluetypes.h>
+#include <glib-object.h>
 
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>
diff --git a/lib/glibtop-client.c b/lib/glibtop-client.c
index 3719aaf7..68947fc5 100644
--- a/lib/glibtop-client.c
+++ b/lib/glibtop-client.c
@@ -25,8 +25,7 @@
 
 #include <glibtop.h>
 
-#include <gobject/gsignal.h>
-#include <gobject/gvaluetypes.h>
+#include <glib-object.h>
 
 static void glibtop_client_class_init    (glibtop_client_class   *klass);
 static void glibtop_client_init          (glibtop_client         *client);
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index f46ea55b..c8342c79 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -88,7 +88,7 @@ glibtop_strdup_r (glibtop_server *server, const char *string)
 }
 
 void
-glibtop_free_r (glibtop_server *server, const void *ptr)
+glibtop_free_r (glibtop_server *server, void *ptr)
 {
 #ifdef LIBGTOP_USE_GLIB_MALLOC
     g_free (ptr);