diff --git a/ChangeLog b/ChangeLog
index fe5e069c..2eb5b33d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-02-12  Martin Baulig  <martin@home-of-linux.org>
+
+	Thanks to Frederic Devernay for pointing out that we need to define
+	__BEGIN_DECLS and __END_DECLS when not using GNOME.
+
+	* configure.in: Define `WITHOUT_GNOME' if appropriate.
+
+	* include/glibtop/global.h: Define __BEGIN_DECLS and __END_DECLS
+	when WITHOUT_GNOME not when _IN_LIBGTOP.
+
 1999-02-12  Martin Baulig  <martin@home-of-linux.org>
 
 	* include/glibtop/global.h: Applied patch from Frederic Devernay;
diff --git a/include/glibtop/global.h b/include/glibtop/global.h
index 1cf90837..1181d642 100644
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -23,8 +23,10 @@
 #define __GLIBTOP_GLOBAL_H__
 
 #ifdef _IN_LIBGTOP
-
 #include <config.h>
+#endif
+
+#ifdef WITHOUT_GNOME
 
 /* __BEGIN_DECLS should be used at the beginning of your declarations,
    so that C++ compilers don't mangle their names.  Use __END_DECLS at
@@ -53,6 +55,10 @@
 # define __P(protos) ()
 #endif
 
+#endif /* WITHOUT_GNOME */
+
+#ifdef _IN_LIBGTOP
+
 /* Provide macros to feature the GCC function attribute.
  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)