diff --git a/ChangeLog b/ChangeLog
index 89ac3351..4dd754d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* glibtop.h: Moved foward declaration of glibtop to break circular
+	#includes dependencies.
+
 2004-06-18  Benoît Dejean  <tazforever@dlfp.org>
 
 	* include/glibtop/error.h: Also tries C99 __VA_ARGS__ before using
diff --git a/glibtop.h b/glibtop.h
index 53a407d8..8113bfe9 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -24,6 +24,9 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
+typedef struct _glibtop		glibtop;
+
+
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
@@ -37,10 +40,10 @@
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif
 
-typedef struct _glibtop		glibtop;
 
 #include <glibtop/sysdeps.h>
 
+
 struct _glibtop
 {
 	unsigned flags;