diff --git a/examples/first.c b/examples/first.c
index 19b95d39..0bc0a09e 100644
--- a/examples/first.c
+++ b/examples/first.c
@@ -38,7 +38,7 @@
 #endif
 
 int
-main (int G_GNUC_UNUSED argc, char G_GNUC_UNUSED *argv [])
+main (int argc, char *argv [])
 {
 	glibtop_union data;
 	glibtop_sysdeps sysdeps;
diff --git a/examples/mountlist.c b/examples/mountlist.c
index 0c5ce08e..af63afc7 100644
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -36,7 +36,7 @@
 #endif
 
 int
-main (int G_GNUC_UNUSED argc, char G_GNUC_UNUSED *argv [])
+main (int argc, char *argv [])
 {
 	glibtop_fsusage fsusage;
 	glibtop_mountlist mount_list;
diff --git a/lib/inodedb.c b/lib/inodedb.c
index d3faab5a..ef3d2018 100644
--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -33,7 +33,7 @@
 
 glibtop_inodedb *
 glibtop_inodedb_open_s (glibtop *server, unsigned databases,
-			unsigned long G_GNUC_UNUSED cachesize)
+			unsigned long cachesize)
 {
 	glibtop_inodedb *inodedb;
 	char filename [BUFSIZ];
@@ -76,7 +76,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,
 }
 
 const char *
-glibtop_inodedb_lookup_s (glibtop G_GNUC_UNUSED *server,
+glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
 			  u_int64_t device, u_int64_t inode)
 {
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 1e80b61f..82fd646c 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -488,7 +488,7 @@ handle_signal (int sig)
 }
 
 int
-main (int G_GNUC_UNUSED argc, char G_GNUC_UNUSED *argv [])
+main (int argc, char *argv [])
 {
 	glibtop *server = glibtop_global_server;
 
diff --git a/src/daemon/server.c b/src/daemon/server.c
index 804f0721..577cb672 100644
--- a/src/daemon/server.c
+++ b/src/daemon/server.c
@@ -51,7 +51,7 @@ GLIBTOP_SUID_PROC_MAP;
 #include <locale.h>
 
 int
-main(int G_GNUC_UNUSED argc, char G_GNUC_UNUSED *argv[])
+main(int argc, char *argv[])
 {
 	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
 
diff --git a/src/daemon/slave.c b/src/daemon/slave.c
index 51489fbb..09e24c92 100644
--- a/src/daemon/slave.c
+++ b/src/daemon/slave.c
@@ -24,10 +24,10 @@
 void
 handle_slave_connection (int input, int output)
 {
-	glibtop G_GNUC_UNUSED *server = glibtop_global_server;
-	int64_t G_GNUC_UNUSED *param_ptr;
-	void G_GNUC_UNUSED *ptr;
-	pid_t G_GNUC_UNUSED pid;
+	glibtop *server = glibtop_global_server;
+	int64_t *param_ptr;
+	void *ptr;
+	pid_t pid;
 
 	glibtop_response _resp, *resp = &_resp;
 	glibtop_command _cmnd, *cmnd = &_cmnd;
@@ -98,10 +98,10 @@ handle_slave_connection (int input, int output)
 
 void
 handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
-		      const void G_GNUC_UNUSED *parameter)
+		      const void *parameter)
 {
 	glibtop *server = glibtop_global_server;
-	pid_t G_GNUC_UNUSED pid;
+	pid_t pid;
 
 	switch (cmnd->command) {
 	case GLIBTOP_CMND_SYSDEPS:
diff --git a/sysdeps/common/fsusage.c b/sysdeps/common/fsusage.c
index 1021bf37..9e6a84af 100644
--- a/sysdeps/common/fsusage.c
+++ b/sysdeps/common/fsusage.c
@@ -103,7 +103,7 @@ adjust_blocks (blocks, fromsize, tosize)
 static int
 get_fs_usage (path, disk, fsp)
      const char *path;
-     const char G_GNUC_UNUSED *disk;
+     const char *disk;
      struct fs_usage *fsp;
 {
 #ifdef STAT_STATFS3_OSF1
diff --git a/sysdeps/common/inodedb.c b/sysdeps/common/inodedb.c
index d3faab5a..ef3d2018 100644
--- a/sysdeps/common/inodedb.c
+++ b/sysdeps/common/inodedb.c
@@ -33,7 +33,7 @@
 
 glibtop_inodedb *
 glibtop_inodedb_open_s (glibtop *server, unsigned databases,
-			unsigned long G_GNUC_UNUSED cachesize)
+			unsigned long cachesize)
 {
 	glibtop_inodedb *inodedb;
 	char filename [BUFSIZ];
@@ -76,7 +76,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,
 }
 
 const char *
-glibtop_inodedb_lookup_s (glibtop G_GNUC_UNUSED *server,
+glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
 			  u_int64_t device, u_int64_t inode)
 {
diff --git a/sysdeps/common/mountlist.c b/sysdeps/common/mountlist.c
index 895dfce1..77f9755a 100644
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -260,7 +260,7 @@ fstype_to_string (t)
 
 static struct mount_entry *
 read_filesystem_list (need_fs_type, all_fs)
-     int G_GNUC_UNUSED need_fs_type, G_GNUC_UNUSED all_fs;
+     int need_fs_type, all_fs;
 {
   struct mount_entry *mount_list;
   struct mount_entry *me;
diff --git a/sysdeps/common/xmalloc.c b/sysdeps/common/xmalloc.c
index afbaf0e4..fcf5c96d 100644
--- a/sysdeps/common/xmalloc.c
+++ b/sysdeps/common/xmalloc.c
@@ -64,7 +64,7 @@ glibtop_strdup_r (glibtop *server, const char *string)
 }
 
 void
-glibtop_free_r (glibtop G_GNUC_UNUSED *server, const void *ptr)
+glibtop_free_r (glibtop *server, const void *ptr)
 {
 	if (ptr) free ((void *) ptr);
 }
diff --git a/sysdeps/freebsd/close.c b/sysdeps/freebsd/close.c
index bf9b2a64..0a207f29 100644
--- a/sysdeps/freebsd/close.c
+++ b/sysdeps/freebsd/close.c
@@ -25,5 +25,5 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close_p (glibtop G_GNUC_UNUSED *server)
+glibtop_close_p (glibtop *server)
 { }
diff --git a/sysdeps/freebsd/nosuid.c b/sysdeps/freebsd/nosuid.c
index 1e8b4665..8f139785 100644
--- a/sysdeps/freebsd/nosuid.c
+++ b/sysdeps/freebsd/nosuid.c
@@ -24,12 +24,12 @@
 #include <glibtop/close.h>
 
 void
-glibtop_open_s (glibtop G_GNUC_UNUSED *server,
-		const char G_GNUC_UNUSED *program_name,
-		const unsigned long G_GNUC_UNUSED features,
-		const unsigned G_GNUC_UNUSED flags)
+glibtop_open_s (glibtop *server,
+		const char *program_name,
+		const unsigned long features,
+		const unsigned flags)
 { }
 
 void
-glibtop_close_s (glibtop G_GNUC_UNUSED *server)
+glibtop_close_s (glibtop *server)
 { }
diff --git a/sysdeps/freebsd/open.c b/sysdeps/freebsd/open.c
index e4f7757d..c75762a3 100644
--- a/sysdeps/freebsd/open.c
+++ b/sysdeps/freebsd/open.c
@@ -48,8 +48,8 @@ glibtop_init_p (glibtop *server, const unsigned long features,
 
 void
 glibtop_open_p (glibtop *server, const char *program_name,
-		const unsigned long G_GNUC_UNUSED features,
-		const unsigned G_GNUC_UNUSED flags)
+		const unsigned long features,
+		const unsigned flags)
 {
 #ifdef DEBUG
 	fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); 
diff --git a/sysdeps/freebsd/procsegment.c b/sysdeps/freebsd/procsegment.c
index 41b4a99a..da4bffac 100644
--- a/sysdeps/freebsd/procsegment.c
+++ b/sysdeps/freebsd/procsegment.c
@@ -44,7 +44,7 @@ glibtop_init_proc_segment_p (glibtop *server)
 void
 glibtop_get_proc_segment_p (glibtop *server,
 			    glibtop_proc_segment *buf,
-			    pid_t G_GNUC_UNUSED pid)
+			    pid_t pid)
 {
 	glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_SEGMENT), 0);
 	
diff --git a/sysdeps/linux/close.c b/sysdeps/linux/close.c
index 160d6bfa..9506f275 100644
--- a/sysdeps/linux/close.c
+++ b/sysdeps/linux/close.c
@@ -24,5 +24,5 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close_s (glibtop G_GNUC_UNUSED *server)
+glibtop_close_s (glibtop *server)
 { }
diff --git a/sysdeps/linux/cpu.c b/sysdeps/linux/cpu.c
index 0217a187..bd959d07 100644
--- a/sysdeps/linux/cpu.c
+++ b/sysdeps/linux/cpu.c
@@ -53,7 +53,7 @@ void
 glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
 	char buffer [BUFSIZ], *p;
-	int fd, len, G_GNUC_UNUSED i;
+	int fd, len, i;
 
 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
 
diff --git a/sysdeps/linux/open.c b/sysdeps/linux/open.c
index 16bf6550..af51e9e3 100644
--- a/sysdeps/linux/open.c
+++ b/sysdeps/linux/open.c
@@ -56,8 +56,8 @@ static void set_linux_version(void) {
 
 void
 glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long G_GNUC_UNUSED features,
-		const unsigned G_GNUC_UNUSED flags)
+		const unsigned long features,
+		const unsigned flags)
 {
 #ifdef HAVE_LIBGTOP_SMP
 	char buffer [BUFSIZ], *p;
diff --git a/sysdeps/linux/proctime.c b/sysdeps/linux/proctime.c
index 425fd2fc..951e789d 100644
--- a/sysdeps/linux/proctime.c
+++ b/sysdeps/linux/proctime.c
@@ -52,7 +52,7 @@ void
 glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
 {
 	char buffer [BUFSIZ], *p;
-	int G_GNUC_UNUSED i;
+	int i;
 	
 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_TIME, 0);