Killed branch. SVN SUCKS.affinity

Killed branch.
SVN SUCKS.

svn path=/branches/affinity; revision=2662

47 files changed, 0 insertions, 3363 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 4832afc3..00000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS		= glibtop
-
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
deleted file mode 100644
index e7b13360..00000000
--- a/include/glibtop/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-glibtopdir		= $(includedir)/libgtop-2.0/glibtop
-
-glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
-			  sem_limits.h uptime.h command.h mem.h proclist.h \
-			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
-			  procmem.h procuid.h swap.h \
-			  procsegment.h sysdeps.h global.h \
-			  procsignal.h union.h gnuserv.h \
-			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
-			  sysinfo.h ppp.h procargs.h netload.h \
-			  procwd.h \
-			  netlist.h procopenfiles.h open.h
-
-noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h
diff --git a/include/glibtop/call-vector.h.in b/include/glibtop/call-vector.h.in
deleted file mode 100644
index 4267b85c..00000000
--- a/include/glibtop/call-vector.h.in
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-@@AUTOGEN_COMMENT@@
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CALL_VECTOR_H__
-#define __GLIBTOP_CALL_VECTOR_H__
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-
-G_BEGIN_DECLS
-
-struct _glibtop_call_vector
-{
-    @@GLIBTOP_CALL_VECTOR@@
-};
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/call-vector.pl b/include/glibtop/call-vector.pl
deleted file mode 100644
index f46caa23..00000000
--- a/include/glibtop/call-vector.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/perl
-
-require 'c_types.pl';
-
-die "Usage: $0 features.def call-vector.h.in" unless $#ARGV == 1;
-
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
-
-sub toupper {
-    local($_) = @_;
-    tr/a-z/A-Z/;
-    return $_;
-}
-
-sub tolower {
-    local($_) = @_;
-    tr/A-Z/a-z/;
-    return $_;
-}
-
-$func_decl_code = '';
-
-open FEATURESDEF, $ARGV[1] or
-  die "open ($ARGV[1]): $!";
-
-while (<FEATURESDEF>) {
-  chop;				# strip record separator
-  
-  if (/^[^\#]/) {
-    &parse_features_def ($_);
-  }
-}
-
-close FEATURESDEF;
-
-sub parse_features_def {
-  local($line) = @_;
-  @line_fields = split(/\|/, $line, 9999);
-  $retval = $line_fields[1];
-  $element_def = $line_fields[3];
-  $feature = $line_fields[2];
-  $param_def = $line_fields[4];
-
-  $orig = $feature;
-  $feature =~ s/^@//;
-  $space = $feature;
-  $space =~ s/./ /g;
-
-  if ($retval eq 'retval') {
-    $retval_param = '&retval';
-    $retval = 'int';
-  }
-  elsif ($retval !~ /^void$/) {
-    $retval_param = 'NULL';
-  }
-  else {
-    $retval_param = 'NULL';
-  }
- 
-  if ($retval =~ /^(array|pointer)\((.*)\)$/) {
-    $retval = ($2 eq 'string') ? 'char **' : "$2 *";
-  }
-
-  $param_decl = '';
-  $nr_params = (@params = split(/:/, $param_def, 9999));
-  for ($param = 1; $param <= $nr_params; $param++) {
-    $list = $params[$param];
-    $type = $params[$param];
-    $type =~ s/\(.*//;
-    $list =~ s/^.*\(//;
-    $list =~ s/\)$//;
-    $count = (@fields = split(/,/, $list, 9999));
-    for ($field = 1; $field <= $count; $field++) {
-      my $c_type = $typeinfo->{$type}->[1];
-
-      $param_decl = $param_decl . ', ';
-      $param_decl = $param_decl . $c_type;
-    }
-  }
-
-  if ($line_fields[3] eq '') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] eq 'array') {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, glibtop_array *%s);\n], $retval, $feature, $param_decl);
-  } elsif ($line_fields[3] =~ /^array/) {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, glibtop_array *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  } else {
-    $func_decl_code .= sprintf
-      (qq[\t%s (*%s) (glibtop_server *, glibtop_closure *, %s *%s);\n], $retval, $feature, 'glibtop_'.$feature, $param_decl);
-  }
-}
-
-chop $func_decl_code;
-
-$auto_gen_comment = sprintf
-  (qq[/*\n * This file is automatically generated.\n * Please modify `call-vector.pl' and `call-vector.h.in'.\n */]);
-
-open CALLVECTOR, $ARGV[2] or
-  die "open ($ARGV[2]): $!";
-
-while (<CALLVECTOR>) {
-  chop;
-
-  s/^\s*\@\@GLIBTOP_CALL_VECTOR\@\@\s*$/$func_decl_code/;
-
-  s/^\s*\@\@AUTOGEN_COMMENT\@\@\s*$/$auto_gen_comment/;
-} continue {
-  print $_;
-}
-
-close CALLVECTOR;
diff --git a/include/glibtop/close.h b/include/glibtop/close.h
deleted file mode 100644
index 04f066bb..00000000
--- a/include/glibtop/close.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CLOSE_H__
-#define __GLIBTOP_CLOSE_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-void glibtop_close (void);
-
-void glibtop_close_r (glibtop *server);
-
-void glibtop_close_s (glibtop *server);
-void glibtop_close_p (glibtop *server);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
deleted file mode 100644
index bd9667e8..00000000
--- a/include/glibtop/command.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMMAND_H__
-#define __GLIBTOP_COMMAND_H__
-
-#include <glibtop.h>
-#include <glibtop/sysdeps.h>
-#include <glibtop/union.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_CMND_QUIT		0
-#define GLIBTOP_CMND_SYSDEPS		1
-
-#define GLIBTOP_CMND_CPU		2
-#define GLIBTOP_CMND_MEM		3
-#define GLIBTOP_CMND_SWAP		4
-#define GLIBTOP_CMND_UPTIME		5
-#define GLIBTOP_CMND_LOADAVG		6
-#define GLIBTOP_CMND_SHM_LIMITS		7
-#define GLIBTOP_CMND_MSG_LIMITS		8
-#define GLIBTOP_CMND_SEM_LIMITS		9
-#define GLIBTOP_CMND_PROCLIST		10
-
-#define GLIBTOP_CMND_PROC_STATE		11
-#define GLIBTOP_CMND_PROC_UID		12
-#define GLIBTOP_CMND_PROC_MEM		13
-#define GLIBTOP_CMND_PROC_TIME		14
-#define GLIBTOP_CMND_PROC_SIGNAL	15
-#define GLIBTOP_CMND_PROC_KERNEL	16
-#define GLIBTOP_CMND_PROC_SEGMENT	17
-#define GLIBTOP_CMND_PROC_ARGS		18
-#define GLIBTOP_CMND_PROC_MAP		19
-
-#define GLIBTOP_CMND_MOUNTLIST		20
-#define GLIBTOP_CMND_FSUSAGE		21
-#define GLIBTOP_CMND_NETLOAD		22
-#define GLIBTOP_CMND_PPP		23
-#define GLIBTOP_CMND_NETLIST		24
-#define GLIBTOP_CMND_PROC_OPEN_FILES	25
-#define GLIBTOP_CMND_PROC_WD		26
-
-#define GLIBTOP_MAX_CMND		27
-
-#define _GLIBTOP_PARAM_SIZE		16
-
-typedef struct _glibtop_command		glibtop_command;
-
-typedef struct _glibtop_response	glibtop_response;
-typedef union  _glibtop_response_union	glibtop_response_union;
-
-struct _glibtop_command
-{
-	guint64	command;
-	guint64	size, data_size;
-	char		parameter [_GLIBTOP_PARAM_SIZE];
-};
-
-union _glibtop_response_union
-{
-	glibtop_union	data;
-	glibtop_sysdeps	sysdeps;
-};
-
-struct _glibtop_response
-{
-	gint64 offset;
-	guint64 size, data_size;
-	glibtop_response_union u;
-};
-
-#define glibtop_call(p1, p2, p3, p4)	glibtop_call_r(glibtop_global_server, p1, p2, p3, p4)
-
-void *
-glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
-		const void *send_buf, size_t recv_size, void *recv_buf);
-
-void *
-glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
-		const void *send_buf, size_t recv_size, void *recv_buf);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h
deleted file mode 100644
index 1d673e91..00000000
--- a/include/glibtop/cpu.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CPU_H__
-#define __GLIBTOP_CPU_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_CPU_TOTAL	0
-#define GLIBTOP_CPU_USER	1
-#define GLIBTOP_CPU_NICE	2
-#define GLIBTOP_CPU_SYS		3
-#define GLIBTOP_CPU_IDLE	4
-#define GLIBTOP_CPU_FREQUENCY	5
-
-#define GLIBTOP_XCPU_TOTAL	6
-#define GLIBTOP_XCPU_USER	7
-#define GLIBTOP_XCPU_NICE	8
-#define GLIBTOP_XCPU_SYS	9
-#define GLIBTOP_XCPU_IDLE	10
-#define GLIBTOP_XCPU_FLAGS	11
-
-#define GLIBTOP_CPU_IOWAIT	12
-#define GLIBTOP_CPU_IRQ		13
-#define GLIBTOP_CPU_SOFTIRQ	14
-#define GLIBTOP_XCPU_IOWAIT	15
-#define GLIBTOP_XCPU_IRQ	16
-#define GLIBTOP_XCPU_SOFTIRQ	17
-
-#define GLIBTOP_MAX_CPU		18
-
-/* Nobody should really be using more than 4 processors.
-   Yes we are :)
-   Nobody should really be using more than 32 processors.
-*/
-#define GLIBTOP_NCPU		32
-
-typedef struct _glibtop_cpu	glibtop_cpu;
-
-struct _glibtop_cpu
-{
-	guint64	flags;
-	guint64 total;				/* GLIBTOP_CPU_TOTAL		*/
-	guint64 user;				/* GLIBTOP_CPU_USER		*/
-	guint64 nice;				/* GLIBTOP_CPU_NICE		*/
-	guint64 sys;				/* GLIBTOP_CPU_SYS		*/
-	guint64 idle;				/* GLIBTOP_CPU_IDLE		*/
-	guint64 iowait;				/* GLIBTOP_CPU_IOWAIT		*/
-	guint64 irq;				/* GLIBTOP_CPU_IRQ		*/
-	guint64 softirq;			/* GLIBTOP_CPU_SOFTIRQ		*/
-	guint64 frequency;			/* GLIBTOP_CPU_FREQUENCY	*/
-	guint64 xcpu_total [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_TOTAL		*/
-	guint64 xcpu_user [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_USER		*/
-	guint64 xcpu_nice [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_NICE		*/
-	guint64 xcpu_sys  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SYS		*/
-	guint64 xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
-	guint64 xcpu_iowait [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IOWAIT		*/
-	guint64 xcpu_irq [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IRQ		*/
-	guint64 xcpu_softirq  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SOFTIRQ		*/
-	guint64 xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
-};
-
-void glibtop_get_cpu(glibtop_cpu *buf);
-
-#if GLIBTOP_SUID_CPU
-#define glibtop_get_cpu_r	glibtop_get_cpu_p
-#else
-#define glibtop_get_cpu_r	glibtop_get_cpu_s
-#endif
-
-void glibtop_get_cpu_l (glibtop *server, glibtop_cpu *buf);
-
-#if GLIBTOP_SUID_CPU
-void _glibtop_init_cpu_p (glibtop *server);
-void glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf);
-#else
-void _glibtop_init_cpu_s (glibtop *server);
-void glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/error.h b/include/glibtop/error.h
deleted file mode 100644
index 9d64ff87..00000000
--- a/include/glibtop/error.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-
-/*
- * This is private API
- */
-
-#ifndef __GLIBTOP_ERROR_H__
-#define __GLIBTOP_ERROR_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_NORETURN;
-void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_NORETURN;
-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
-
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
-
-void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h
deleted file mode 100644
index e4f74eae..00000000
--- a/include/glibtop/fsusage.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_FSUSAGE_H__
-#define __GLIBTOP_FSUSAGE_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_FSUSAGE_BLOCKS		0
-#define GLIBTOP_FSUSAGE_BFREE		1
-#define GLIBTOP_FSUSAGE_BAVAIL		2
-#define GLIBTOP_FSUSAGE_FILES		3
-#define GLIBTOP_FSUSAGE_FFREE		4
-#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
-#define GLIBTOP_FSUSAGE_READ           6
-#define GLIBTOP_FSUSAGE_WRITE          7
-#define GLIBTOP_MAX_FSUSAGE		8
-
-
-typedef struct _glibtop_fsusage		glibtop_fsusage;
-
-struct _glibtop_fsusage
-{
-	guint64	flags;
-	guint64 blocks;		/* Total number of blocks. */
-	guint64 bfree;		/* Free blocks available to superuser. */
-	guint64 bavail;		/* Free blocks available to non-superuser. */
-	guint64 files;		/* Total file nodes. */
-	guint64 ffree;		/* Free file nodes. */
-	guint32	block_size;	/* Size of a block in bytes. */
-	guint64 read, write;    /* Total blocks read and written */
-};
-
-void glibtop_get_fsusage(glibtop_fsusage *buf, const char *mount_dir);
-
-#define glibtop_get_fsusage_r		glibtop_get_fsusage_s
-
-void glibtop_get_fsusage_l (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
-void glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf, const char *mount_dir);
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/glibtop-server.h b/include/glibtop/glibtop-server.h
deleted file mode 100644
index 3a3c63ee..00000000
--- a/include/glibtop/glibtop-server.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SERVER_H__
-#define __GLIBTOP_SERVER_H__
-
-#include <glibtop/global.h>
-#include <glibtop/sysdeps.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_server		glibtop_server;
-typedef struct _glibtop_server_info	glibtop_server_info;
-
-typedef struct _glibtop_closure		glibtop_closure;
-
-struct _glibtop_server_info
-{
-    int ncpu;			/* Number of CPUs, zero if single-processor */
-    unsigned long features;	/* Server is required for this features */
-    glibtop_sysdeps sysdeps;	/* Detailed feature list */
-    glibtop_sysdeps required;	/* Required feature list */
-    glibtop_sysdeps wanted;	/* We only want this features */
-};
-
-struct	_glibtop_server
-{
-    glibtop_server_info *info;
-
-    int refcount;
-    unsigned flags;
-    const char *name;
-
-    void *_priv;
-};
-
-glibtop_server *
-glibtop_server_new (void);
-
-void
-glibtop_server_ref (glibtop_server *server);
-
-void
-glibtop_server_unref (glibtop_server *server);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/global.h b/include/glibtop/global.h
deleted file mode 100644
index d17e70bd..00000000
--- a/include/glibtop/global.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_GLOBAL_H__
-#define __GLIBTOP_GLOBAL_H__
-
-#include <glib.h>
-
-#ifdef _IN_LIBGTOP
-
-#endif /* _IN_LIBGTOP */
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <stdarg.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-
-#include <string.h>
-
-#ifdef _IN_LIBGTOP
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#endif /* _IN_LIBGTOP */
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef _IN_LIBGTOP
-
-G_BEGIN_DECLS
-
-#ifndef HAVE_STRERROR
-char *strerror (int errno);
-#endif
-
-G_END_DECLS
-
-#endif /* _IN_LIBGTOP */
-
-#endif
diff --git a/include/glibtop/gnuserv.h b/include/glibtop/gnuserv.h
deleted file mode 100644
index aa24e1b3..00000000
--- a/include/glibtop/gnuserv.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*-C-*-
-
- Header file for the GNU Emacs server and client C code.
-
- This file is part of GNU Emacs.
-
- Copying is permitted under those conditions described by the GNU
- General Public License.
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-
- Author: Andy Norman (ange@hplb.hpl.hp.com), based on
-         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
-         Emacs distribution.
-
- Please mail bugs and suggestions to the author at the above address.
-*/
-
-/* HISTORY
- * 11-Nov-1990		bristor@simba
- *    Added EOT stuff.
- */
-
-/*
- * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
- * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
- * Please see the note at the end of the README file for details.
- *
- * (If gnuserv came bundled with your emacs, the README file is probably
- * ../etc/gnuserv.README relative to the directory containing this file)
- */
-
-#if 0
-static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
-#endif
-
-#define NO_SHORTNAMES
-
-#define PATCHLEVEL 2
-
-#define NO_SHORTNAMES
-/* gnuserv should not be compiled using SOCKS */
-#define DO_NOT_SOCKSIFY
-#include <glibtop.h>
-#undef read
-#undef write
-#undef open
-#undef close
-#undef signal
-
-/* Define the communication method between server and clients:
- *   You can have either or both kinds of sockets, but you can't mix
- *   sockets with sysv ipc
- */
-
-#define INTERNET_DOMAIN_SOCKETS
-#define UNIX_DOMAIN_SOCKETS
-
-/*
- * Define additional authentication protocols to be used. These methods will
- * be tried before falling back to the default gnuserv protocol (based on
- * the GNU_SECURE environment variable). Currently, only MIT-MAGIC-COOKIE-1
- * is also supported.
- *
- * Comment out the next line(s) if you don't want to enable the
- * appropriate authentication protocol.
- */
-
-#if defined (HAVE_XAUTH)
-#define AUTH_MAGIC_COOKIE
-#endif /* HAVE_XAUTH */
-
-/*
- * stuff related to supporting MIT-MAGIC-COOKIE-1
- */
-
-#if 0
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
-#endif
-#define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
-#define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
-
-
-#define DEFAUTH_NAME "GNU-SECURE"  /* name of default auth protocol */
-#define AUTH_TIMEOUT  15           /* # seconds to wait for auth data */
-#define AUTH_NAMESZ   15           /* max allows auth protocol name size */
-
-
-/*
- * Pick a default communication scheme, if none was specified.
- */
-
-#if !defined(UNIX_DOMAIN_SOCKETS) && !defined(INTERNET_DOMAIN_SOCKETS)
-
-/* BSD systems use Unix Domain sockets by default */
-
-#ifdef BSD
-#define UNIX_DOMAIN_SOCKETS
-#endif
-
-#endif /* No communication method pre-defined */
-
-/*
- * If you are using SYSV_IPC, you might want to make the buffer size bigger
- * since it limits the size of requests and responses. Don't make it bigger
- * than your system's max message size though (usually a couple of k) or else
- * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want.
- */
-
-#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
-#include <sys/socket.h>
-#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#define TABLE_SIZE 101		/* The number of entries in the hash table */
-#define HASH(host) host		/* Rather simplistic hash function */
-#define DEFAULT_PORT 21490	/* default port number to use is
-				 * DEFAULT_PORT + uid */
-#endif /* INTERNET_DOMAIN_SOCKETS */
-
-#ifdef UNIX_DOMAIN_SOCKETS
-#include <sys/un.h>
-#define HIDE_UNIX_SOCKET	/* put the unix socket in a protected dir */
-#endif /* UNIX_DOMAIN_SOCKETS */
-
-#define HOSTNAMSZ 255		/* max size of a hostname */
-#define REPLYSIZ 300		/* max size of reply from server to client */
-#undef FALSE
-#define FALSE 0
-#undef TRUE
-#define TRUE 1
-
-/* The casts shut Sun's compiler up and are safe in the context these
-   are actually used. */
-#define max2(x,y) (((int) (x) > (int) (y)) ? (x) : (y))
-#define min2(x,y) (((int) (x) < (int) (y)) ? (x) : (y))
-
-#ifndef _NFILE            /* rough guess at maximum number of open files */
-#define _NFILE 20
-#endif
-
-#define EOT_STR "\004"
-#define EOT_CHR '\004'
-
-/* connection types */
-#define CONN_UNIX     0
-#define CONN_INTERNET 1
-#define CONN_IPC      2
-
-/* function declarations */
-int glibtop_make_connection (const char *hostarg, int portarg, int *s);
-
-#ifdef INTERNET_DOMAIN_SOCKETS
-long glibtop_internet_addr (const char *host);
-#endif
-
diff --git a/include/glibtop/init_hooks.h b/include/glibtop/init_hooks.h
deleted file mode 100644
index 35f4d235..00000000
--- a/include/glibtop/init_hooks.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef H_LIBGTOP_INIT_HOOKS_1122955666
-#define H_LIBGTOP_INIT_HOOKS_1122955666
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-typedef void (*_glibtop_init_func_t)(glibtop *);
-
-extern const _glibtop_init_func_t _glibtop_init_hook_s[];
-extern const _glibtop_init_func_t _glibtop_init_hook_p[];
-
-G_END_DECLS
-
-#endif /* H_LIBGTOP_INIT_HOOKS_1122955666 */
diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h
deleted file mode 100644
index 2f7f4c06..00000000
--- a/include/glibtop/loadavg.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_LOADAVG_H__
-#define __GLIBTOP_LOADAVG_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_LOADAVG_LOADAVG		0
-#define GLIBTOP_LOADAVG_NR_RUNNING	1
-#define GLIBTOP_LOADAVG_NR_TASKS	2
-#define GLIBTOP_LOADAVG_LAST_PID	3
-
-#define GLIBTOP_MAX_LOADAVG		4
-
-typedef struct _glibtop_loadavg	glibtop_loadavg;
-
-struct _glibtop_loadavg
-{
-	guint64 flags;
-	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	guint64 nr_running;		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
-	guint64 nr_tasks;		/* GLIBTOP_LOADAVG_NR_TASKS	*/
-	guint64 last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
-};
-
-void glibtop_get_loadavg(glibtop_loadavg *buf);
-
-#if GLIBTOP_SUID_LOADAVG
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_p
-#else
-#define glibtop_get_loadavg_r		glibtop_get_loadavg_s
-#endif
-
-void glibtop_get_loadavg_l (glibtop *server, glibtop_loadavg *buf);
-
-#if GLIBTOP_SUID_LOADAVG
-void _glibtop_init_loadavg_p (glibtop *server);
-void glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf);
-#else
-void _glibtop_init_loadavg_s (glibtop *server);
-void glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h
deleted file mode 100644
index 00920675..00000000
--- a/include/glibtop/mem.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MEM_H__
-#define __GLIBTOP_MEM_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_MEM_TOTAL	0
-#define GLIBTOP_MEM_USED	1
-#define GLIBTOP_MEM_FREE	2
-#define GLIBTOP_MEM_SHARED	3
-#define GLIBTOP_MEM_BUFFER	4
-#define GLIBTOP_MEM_CACHED	5
-#define GLIBTOP_MEM_USER	6
-#define GLIBTOP_MEM_LOCKED	7
-
-#define GLIBTOP_MAX_MEM		8
-
-typedef struct _glibtop_mem	glibtop_mem;
-
-struct _glibtop_mem
-{
-	guint64	flags;
-	guint64 total;		/* GLIBTOP_MEM_TOTAL	*/
-	guint64 used;		/* GLIBTOP_MEM_USED	*/
-	guint64 free;		/* GLIBTOP_MEM_FREE	*/
-	guint64 shared;		/* GLIBTOP_MEM_SHARED	*/
-	guint64 buffer;		/* GLIBTOP_MEM_BUFFER	*/
-	guint64 cached;		/* GLIBTOP_MEM_CACHED	*/
-	guint64 user;		/* GLIBTOP_MEM_USER	*/
-	guint64 locked;		/* GLIBTOP_MEM_LOCKED	*/
-};
-
-void glibtop_get_mem(glibtop_mem *buf);
-
-#if GLIBTOP_SUID_MEM
-#define glibtop_get_mem_r		glibtop_get_mem_p
-#else
-#define glibtop_get_mem_r		glibtop_get_mem_s
-#endif
-
-void glibtop_get_mem_l (glibtop *server, glibtop_mem *buf);
-
-#if GLIBTOP_SUID_MEM
-void _glibtop_init_mem_p (glibtop *server);
-void glibtop_get_mem_p (glibtop *server, glibtop_mem *buf);
-#else
-void _glibtop_init_mem_s (glibtop *server);
-void glibtop_get_mem_s (glibtop *server, glibtop_mem *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h
deleted file mode 100644
index 28cf7aa3..00000000
--- a/include/glibtop/mountlist.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MOUNTLIST_H__
-#define __GLIBTOP_MOUNTLIST_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_MOUNTLIST_NUMBER	0
-#define GLIBTOP_MOUNTLIST_TOTAL		1
-#define GLIBTOP_MOUNTLIST_SIZE		2
-
-#define GLIBTOP_MAX_MOUNTLIST		3
-
-typedef struct _glibtop_mountentry	glibtop_mountentry;
-
-typedef struct _glibtop_mountlist	glibtop_mountlist;
-
-struct _glibtop_mountentry
-{
-	guint64 dev;
-	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
-	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
-	char type [GLIBTOP_MOUNTENTRY_LEN+1];
-};
-
-struct _glibtop_mountlist
-{
-	guint64	flags;
-	guint64 number;			/* GLIBTOP_MOUNTLIST_NUMBER	*/
-	guint64 total;			/* GLIBTOP_MOUNTLIST_TOTAL	*/
-	guint64 size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
-};
-
-glibtop_mountentry *
-glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs);
-
-#define glibtop_get_mountlist_r		glibtop_get_mountlist_s
-
-glibtop_mountentry *
-glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
-
-glibtop_mountentry *
-glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h
deleted file mode 100644
index e90b8032..00000000
--- a/include/glibtop/msg_limits.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MSG_LIMITS_H__
-#define __GLIBTOP_MSG_LIMITS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_IPC_MSGPOOL	0
-#define GLIBTOP_IPC_MSGMAP	1
-#define GLIBTOP_IPC_MSGMAX	2
-#define GLIBTOP_IPC_MSGMNB	3
-#define GLIBTOP_IPC_MSGMNI	4
-#define GLIBTOP_IPC_MSGSSZ	5
-#define GLIBTOP_IPC_MSGTQL	6
-
-#define GLIBTOP_MAX_MSG_LIMITS	7
-
-typedef struct _glibtop_msg_limits	glibtop_msg_limits;
-
-struct _glibtop_msg_limits
-{
-	guint64	flags;
-	guint64 msgpool;	/* GLIBTOP_IPC_MSGPOOL	*/
-	guint64 msgmap;		/* GLIBTOP_IPC_MSGMAP	*/
-	guint64 msgmax;		/* GLIBTOP_IPC_MSGMAX	*/
-	guint64 msgmnb;		/* GLIBTOP_IPC_MSGMNB	*/
-	guint64 msgmni;		/* GLIBTOP_IPC_MSGMNI	*/
-	guint64 msgssz;		/* GLIBTOP_IPC_MSGSSZ	*/
-	guint64 msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
-};
-
-void glibtop_get_msg_limits(glibtop_msg_limits *buf);
-
-#if GLIBTOP_SUID_MSG_LIMITS
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_p
-#else
-#define glibtop_get_msg_limits_r	glibtop_get_msg_limits_s
-#endif
-
-void glibtop_get_msg_limits_l (glibtop *server, glibtop_msg_limits *buf);
-
-#if GLIBTOP_SUID_MSG_LIMITS
-void _glibtop_init_msg_limits_p (glibtop *server);
-void glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf);
-#else
-void _glibtop_init_msg_limits_s (glibtop *server);
-void glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
-
diff --git a/include/glibtop/netlist.h b/include/glibtop/netlist.h
deleted file mode 100644
index f821c77d..00000000
--- a/include/glibtop/netlist.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2004 Benoît Dejean
-   This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETLIST_H__
-#define __GLIBTOP_NETLIST_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_NETLIST_NUMBER		0
-
-#define GLIBTOP_MAX_NETLIST		1
-
-typedef struct _glibtop_netlist	glibtop_netlist;
-
-struct _glibtop_netlist
-{
-	guint64 flags;
-	guint32 number;
-};
-
-char** glibtop_get_netlist(glibtop_netlist *buf);
-
-#if GLIBTOP_SUID_NETLIST
-#define glibtop_get_netlist_r		glibtop_get_netlist_p
-#else
-#define glibtop_get_netlist_r		glibtop_get_netlist_s
-#endif
-
-char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf);
-
-#if GLIBTOP_SUID_NETLIST
-void _glibtop_init_netlist_p (glibtop *server);
-char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf);
-#else
-void _glibtop_init_netlist_s (glibtop *server);
-char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h
deleted file mode 100644
index 80e848eb..00000000
--- a/include/glibtop/netload.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETLOAD_H__
-#define __GLIBTOP_NETLOAD_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_NETLOAD_IF_FLAGS	0
-#define GLIBTOP_NETLOAD_MTU		1
-#define GLIBTOP_NETLOAD_SUBNET		2
-#define GLIBTOP_NETLOAD_ADDRESS		3
-#define GLIBTOP_NETLOAD_PACKETS_IN	4
-#define GLIBTOP_NETLOAD_PACKETS_OUT	5
-#define GLIBTOP_NETLOAD_PACKETS_TOTAL	6
-#define GLIBTOP_NETLOAD_BYTES_IN	7
-#define GLIBTOP_NETLOAD_BYTES_OUT	8
-#define GLIBTOP_NETLOAD_BYTES_TOTAL	9
-#define GLIBTOP_NETLOAD_ERRORS_IN	10
-#define GLIBTOP_NETLOAD_ERRORS_OUT	11
-#define GLIBTOP_NETLOAD_ERRORS_TOTAL	12
-#define GLIBTOP_NETLOAD_COLLISIONS	13
-#define GLIBTOP_NETLOAD_ADDRESS6	14
-#define GLIBTOP_NETLOAD_PREFIX6		15
-#define GLIBTOP_NETLOAD_SCOPE6		16
-#define GLIBTOP_NETLOAD_HWADDRESS	17
-
-#define GLIBTOP_MAX_NETLOAD		18
-
-typedef struct _glibtop_netload	glibtop_netload;
-
-enum {
-	GLIBTOP_IF_FLAGS_UP = 1,
-	GLIBTOP_IF_FLAGS_BROADCAST,
-	GLIBTOP_IF_FLAGS_DEBUG,
-	GLIBTOP_IF_FLAGS_LOOPBACK,
-	GLIBTOP_IF_FLAGS_POINTOPOINT,
-	GLIBTOP_IF_FLAGS_RUNNING,
-	GLIBTOP_IF_FLAGS_NOARP,
-	GLIBTOP_IF_FLAGS_PROMISC,
-	GLIBTOP_IF_FLAGS_ALLMULTI,
-	GLIBTOP_IF_FLAGS_OACTIVE,
-	GLIBTOP_IF_FLAGS_SIMPLEX,
-	GLIBTOP_IF_FLAGS_LINK0,
-	GLIBTOP_IF_FLAGS_LINK1,
-	GLIBTOP_IF_FLAGS_LINK2,
-	GLIBTOP_IF_FLAGS_ALTPHYS,
-	GLIBTOP_IF_FLAGS_MULTICAST,
-	GLIBTOP_IF_FLAGS_WIRELESS
-};
-
-enum GLIBTOP_IF_IN6_SCOPE
-{
-	GLIBTOP_IF_IN6_SCOPE_UNKNOWN = 0,
-	GLIBTOP_IF_IN6_SCOPE_LINK    = 1,
-	GLIBTOP_IF_IN6_SCOPE_SITE    = 2,
-	GLIBTOP_IF_IN6_SCOPE_GLOBAL  = 4,
-	GLIBTOP_IF_IN6_SCOPE_HOST    = 8
-};
-
-struct _glibtop_netload
-{
-	guint64	flags;
-	guint64 if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
-
-	guint32	mtu;			/* GLIBTOP_NETLOAD_MTU		*/
-	guint32 subnet;			/* GLIBTOP_NETLOAD_SUBNET	*/
-	guint32 address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
-
-	guint64	packets_in;		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
-	guint64 packets_out;		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
-	guint64 packets_total;		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
-	guint64 bytes_in;		/* GLIBTOP_NETLOAD_BYTES_IN	*/
-	guint64 bytes_out;		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
-	guint64 bytes_total;		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
-	guint64 errors_in;		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
-	guint64 errors_out;		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
-	guint64 errors_total;		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
-	guint64 collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
-
-	guint8 address6[16];		/* GLIBTOP_NETLOAD_ADDRESS6     */
-	guint8 prefix6[16];		/* GLIBTOP_NETLOAD_PREXIF6      */
-	guint8 scope6;			/* GLIBTOP_NETLOAD_SCOPE6       */
-
-	guint8 hwaddress[8];		/* GLIBTOP_NETLOAD_HWADDRESS    */
-};
-
-void glibtop_get_netload(glibtop_netload *buf, const char *interface);
-
-#if GLIBTOP_SUID_NETLOAD
-#define glibtop_get_netload_r	glibtop_get_netload_p
-#else
-#define glibtop_get_netload_r	glibtop_get_netload_s
-#endif
-
-void glibtop_get_netload_l (glibtop *server, glibtop_netload *buf, const char *interface);
-
-#if GLIBTOP_SUID_NETLOAD
-void _glibtop_init_netload_p (glibtop *server);
-void glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, const char *interface);
-#else
-void _glibtop_init_netload_s (glibtop *server);
-void glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, const char *interface);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/open.h b/include/glibtop/open.h
deleted file mode 100644
index 8e7a49e0..00000000
--- a/include/glibtop/open.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_OPEN_H__
-#define __GLIBTOP_OPEN_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define _GLIBTOP_INIT_STATE_INIT	0x10000
-#define _GLIBTOP_INIT_STATE_OPEN	0x20000
-#define _GLIBTOP_INIT_STATE_SERVER	0x40000
-#define _GLIBTOP_INIT_STATE_SYSDEPS	0x80000
-
-#define GLIBTOP_INIT_NO_OPEN		1
-#define GLIBTOP_INIT_NO_INIT		2
-
-#define GLIBTOP_FEATURES_NO_SERVER	4
-#define GLIBTOP_FEATURES_EXCEPT		8
-
-#define GLIBTOP_METHOD_DIRECT		1
-#define GLIBTOP_METHOD_PIPE		2
-#define GLIBTOP_METHOD_INET		3
-#define GLIBTOP_METHOD_UNIX		4
-
-#define GLIBTOP_ERROR_METHOD_IGNORE	0
-#define GLIBTOP_ERROR_METHOD_WARN_ONCE	1
-#define GLIBTOP_ERROR_METHOD_WARN	2
-#define GLIBTOP_ERROR_METHOD_ABORT	3
-
-#define GLIBTOP_ERROR_METHOD_DEFAULT	GLIBTOP_ERROR_METHOD_WARN_ONCE
-
-void
-glibtop_open_l (glibtop *server, const char *program_name,
-		const unsigned long features, const unsigned flags);
-
-void
-glibtop_init_p (glibtop *server, const unsigned long features,
-		const unsigned flags);
-
-void
-glibtop_open_p (glibtop *server, const char *program_name,
-		const unsigned long features, const unsigned flags);
-
-void
-glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long features, const unsigned flags);
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/parameter.h b/include/glibtop/parameter.h
deleted file mode 100644
index 98a86bf6..00000000
--- a/include/glibtop/parameter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PARAMETER_H__
-#define __GLIBTOP_PARAMETER_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PARAM_METHOD		1
-#define GLIBTOP_PARAM_FEATURES		2
-#define GLIBTOP_PARAM_COMMAND		3
-#define GLIBTOP_PARAM_HOST		4
-#define GLIBTOP_PARAM_PORT		5
-#define GLIBTOP_PARAM_ERROR_METHOD	6
-#define GLIBTOP_PARAM_REQUIRED		7
-
-#define glibtop_get_parameter(p1,p2,p3)	glibtop_get_parameter_l(glibtop_global_server,p1,p2,p3)
-#define glibtop_set_parameter(p1,p2,p3) glibtop_set_parameter_l(glibtop_global_server,p1,p2,p3)
-
-size_t
-glibtop_get_parameter_l (glibtop *server, const unsigned parameter,
-			 void *data_ptr, size_t data_size);
-
-void
-glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
-			 const void *data_ptr, size_t data_size);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h
deleted file mode 100644
index 0b39ae32..00000000
--- a/include/glibtop/ppp.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PPP_H__
-#define __GLIBTOP_PPP_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1
-#define GLIBTOP_PPP_BYTES_OUT	2
-
-#define GLIBTOP_MAX_PPP		3
-
-typedef struct _glibtop_ppp	glibtop_ppp;
-
-enum {
-	GLIBTOP_PPP_STATE_UNKNOWN = 0,
-	GLIBTOP_PPP_STATE_HANGUP,
-	GLIBTOP_PPP_STATE_ONLINE
-};
-
-struct _glibtop_ppp
-{
-	guint64	flags;
-	guint64 state;			/* GLIBTOP_PPP_STATE		*/
-	guint64 bytes_in;		/* GLIBTOP_PPP_BYTES_IN		*/
-	guint64 bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
-};
-
-void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);
-
-#if GLIBTOP_SUID_PPP
-#define glibtop_get_ppp_r	glibtop_get_ppp_p
-#else
-#define glibtop_get_ppp_r	glibtop_get_ppp_s
-#endif
-
-void glibtop_get_ppp_l (glibtop *server, glibtop_ppp *buf, unsigned short device);
-
-#if GLIBTOP_SUID_PPP
-void _glibtop_init_ppp_p (glibtop *server);
-void glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device);
-#else
-void _glibtop_init_ppp_s (glibtop *server);
-void glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procaffinity.h b/include/glibtop/procaffinity.h
deleted file mode 100644
index e69de29b..00000000
--- a/include/glibtop/procaffinity.h
+++ /dev/null
diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h
deleted file mode 100644
index 59d4da3f..00000000
--- a/include/glibtop/procargs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROC_ARGS_H__
-#define __GLIBTOP_PROC_ARGS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_ARGS_SIZE		0
-
-#define GLIBTOP_MAX_PROC_ARGS		1
-
-typedef struct _glibtop_proc_args	glibtop_proc_args;
-
-struct _glibtop_proc_args
-{
-	guint64	flags;
-	guint64 size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
-};
-
-
-char *
-glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len);
-
-char *
-glibtop_get_proc_args (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
-
-#if GLIBTOP_SUID_PROC_ARGS
-
-# define glibtop_get_proc_args_r		glibtop_get_proc_args_p
-
-  void _glibtop_init_proc_args_p (glibtop *server);
-
-  char *
-  glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-
-
-#else /* !GLIBTOP_SUID_PROC_ARGS */
-
-# define glibtop_get_proc_args_r		glibtop_get_proc_args_s
-
-  void _glibtop_init_proc_args_s (glibtop *server);
-
-  char *
-  glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
-			   pid_t pid, unsigned max_len);
-#endif /* GLIBTOP_SUID_PROC_ARGS */
-
-
-
-/*
- * NEW functions
- */
-
-char **
-glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len);
-
-char **
-glibtop_get_proc_argv (glibtop_proc_args *buf, pid_t pid, unsigned max_len);
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h
deleted file mode 100644
index a0f80740..00000000
--- a/include/glibtop/prockernel.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCKERNEL_H__
-#define __GLIBTOP_PROCKERNEL_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_KERNEL_K_FLAGS	0
-#define GLIBTOP_PROC_KERNEL_MIN_FLT	1
-#define GLIBTOP_PROC_KERNEL_MAJ_FLT	2
-#define GLIBTOP_PROC_KERNEL_CMIN_FLT	3
-#define GLIBTOP_PROC_KERNEL_CMAJ_FLT	4
-#define GLIBTOP_PROC_KERNEL_KSTK_ESP	5
-#define GLIBTOP_PROC_KERNEL_KSTK_EIP	6
-#define GLIBTOP_PROC_KERNEL_NWCHAN	7
-#define GLIBTOP_PROC_KERNEL_WCHAN	8
-
-#define GLIBTOP_MAX_PROC_KERNEL		9
-
-typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
-
-/* Kernel stuff */
-
-struct _glibtop_proc_kernel
-{
-	guint64 flags;
-	guint64 k_flags;	/* kernel flags for the process */
-	guint64 min_flt;	/* number of minor page faults since
-				 * process start */
-	guint64 maj_flt;	/* number of major page faults since
-				 * process start */
-	guint64 cmin_flt;	/* cumulative min_flt of process and
-				 * child processes */
-	guint64 cmaj_flt;	/* cumulative maj_flt of process and
-				 * child processes */
-	guint64 kstk_esp;	/* kernel stack pointer */
-	guint64 kstk_eip;	/* kernel stack pointer */
-	guint64 nwchan;		/* address of kernel wait channel
-				 * proc is sleeping in */
-	char wchan [40];
-};
-
-void glibtop_get_proc_kernel(glibtop_proc_kernel *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_KERNEL
-#define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_p
-#else
-#define glibtop_get_proc_kernel_r	glibtop_get_proc_kernel_s
-#endif
-
-void glibtop_get_proc_kernel_l (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_KERNEL
-void _glibtop_init_proc_kernel_p (glibtop *server);
-void glibtop_get_proc_kernel_p (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
-#else
-void _glibtop_init_proc_kernel_s (glibtop *server);
-void glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h
deleted file mode 100644
index 7859fe08..00000000
--- a/include/glibtop/proclist.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCLIST_H__
-#define __GLIBTOP_PROCLIST_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROCLIST_NUMBER	0
-#define GLIBTOP_PROCLIST_TOTAL	1
-#define GLIBTOP_PROCLIST_SIZE	2
-
-#define GLIBTOP_MAX_PROCLIST	3
-
-/* You can use the folowing constants as the `which' member of
- * glibtop_get_proclist () to specify which processes to fetch. */
-
-#define GLIBTOP_KERN_PROC_ALL		0	/* all processes */
-#define GLIBTOP_KERN_PROC_PID		1
-#define GLIBTOP_KERN_PROC_PGRP		2
-#define GLIBTOP_KERN_PROC_SESSION	3
-#define GLIBTOP_KERN_PROC_TTY		4
-#define GLIBTOP_KERN_PROC_UID		5
-#define GLIBTOP_KERN_PROC_RUID		6
-
-#define GLIBTOP_KERN_PROC_MASK		15
-
-#define GLIBTOP_EXCLUDE_IDLE		0x1000
-#define GLIBTOP_EXCLUDE_SYSTEM		0x2000
-#define GLIBTOP_EXCLUDE_NOTTY		0x4000
-
-typedef struct _glibtop_proclist	glibtop_proclist;
-
-struct _glibtop_proclist
-{
-	guint64	flags;
-	guint64 number;			/* GLIBTOP_PROCLIST_NUMBER	*/
-	guint64 total;			/* GLIBTOP_PROCLIST_TOTAL	*/
-	guint64 size;			/* GLIBTOP_PROCLIST_SIZE	*/
-};
-
-pid_t*
-glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
-
-#if GLIBTOP_SUID_PROCLIST
-#define glibtop_get_proclist_r		glibtop_get_proclist_p
-#else
-#define glibtop_get_proclist_r		glibtop_get_proclist_s
-#endif
-
-pid_t*
-glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
-
-#if GLIBTOP_SUID_PROCLIST
-void _glibtop_init_proclist_p (glibtop *server);
-
-pid_t*
-glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
-#else
-void _glibtop_init_proclist_s (glibtop *server);
-
-pid_t*
-glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h
deleted file mode 100644
index 171904ef..00000000
--- a/include/glibtop/procmap.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROC_MAP_H__
-#define __GLIBTOP_PROC_MAP_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_MAP_NUMBER		0
-#define GLIBTOP_PROC_MAP_TOTAL		1
-#define GLIBTOP_PROC_MAP_SIZE		2
-
-#define GLIBTOP_MAX_PROC_MAP		3
-
-#define GLIBTOP_MAP_ENTRY_START		0
-#define GLIBTOP_MAP_ENTRY_END		1
-#define GLIBTOP_MAP_ENTRY_OFFSET	2
-#define GLIBTOP_MAP_ENTRY_PERM		3
-#define GLIBTOP_MAP_ENTRY_INODE		4
-#define GLIBTOP_MAP_ENTRY_DEVICE	5
-#define GLIBTOP_MAP_ENTRY_FILENAME	6
-
-/* Smap support */
-#define GLIBTOP_MAP_ENTRY_SIZE			 7
-#define GLIBTOP_MAP_ENTRY_RSS			 8
-#define GLIBTOP_MAP_ENTRY_SHARED_CLEAN		 9
-#define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
-#define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
-#define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
-
-#define GLIBTOP_MAX_MAP_ENTRY		13
-
-#define GLIBTOP_MAP_FILENAME_LEN	215
-
-#define GLIBTOP_MAP_PERM_READ		1
-#define GLIBTOP_MAP_PERM_WRITE		2
-#define GLIBTOP_MAP_PERM_EXECUTE	4
-#define GLIBTOP_MAP_PERM_SHARED		8
-#define GLIBTOP_MAP_PERM_PRIVATE	16
-
-typedef struct _glibtop_map_entry	glibtop_map_entry;
-
-typedef struct _glibtop_proc_map	glibtop_proc_map;
-
-struct _glibtop_map_entry
-{
-	guint64 flags; 
-	guint64 start; 
-	guint64 end; 
-	guint64 offset; 
-	guint64 perm; 
-	guint64 inode; 
-	guint64 device;
-	guint64 size;
-	guint64 rss;
-	guint64 shared_clean; 
-	guint64 shared_dirty;
-	guint64 private_clean; 
-	guint64 private_dirty;
-	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
-};
-
-struct _glibtop_proc_map
-{
-	guint64	flags;
-	guint64 number;			/* GLIBTOP_PROC_MAP_NUMBER	*/
-	guint64 total;			/* GLIBTOP_PROC_MAP_TOTAL	*/
-	guint64 size;			/* GLIBTOP_PROC_MAP_SIZE	*/
-};
-glibtop_map_entry *
-glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
-
-
-#if GLIBTOP_SUID_PROC_MAP
-#define glibtop_get_proc_map_r		glibtop_get_proc_map_p
-#else
-#define glibtop_get_proc_map_r		glibtop_get_proc_map_s
-#endif
-
-glibtop_map_entry *
-glibtop_get_proc_map_l (glibtop *server, glibtop_proc_map *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_MAP
-void _glibtop_init_proc_map_p (glibtop *server);
-
-glibtop_map_entry *
-glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf, pid_t pid);
-#else
-void _glibtop_init_proc_map_s (glibtop *server);
-
-glibtop_map_entry *
-glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h
deleted file mode 100644
index 10e12eb4..00000000
--- a/include/glibtop/procmem.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCMEM_H__
-#define __GLIBTOP_PROCMEM_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_MEM_SIZE		0
-#define GLIBTOP_PROC_MEM_VSIZE		1
-#define GLIBTOP_PROC_MEM_RESIDENT	2
-#define GLIBTOP_PROC_MEM_SHARE		3
-#define GLIBTOP_PROC_MEM_RSS		4
-#define GLIBTOP_PROC_MEM_RSS_RLIM	5
-
-#define GLIBTOP_MAX_PROC_MEM		6
-
-typedef struct _glibtop_proc_mem	glibtop_proc_mem;
-
-/* Memory section */
-
-struct _glibtop_proc_mem
-{
-	guint64	flags;
-	guint64 size;		/* total # of pages of memory */
-	guint64 vsize;		/* number of pages of virtual memory ... */
-	guint64 resident;	/* number of resident set
-				 * (non-swapped) pages (4k) */
-	guint64 share;		/* number of pages of shared (mmap'd) memory */
-	guint64 rss;		/* resident set size */
-	guint64 rss_rlim;	/* current limit (in bytes) of the rss
-				 * of the process; usually 2,147,483,647 */
-};
-
-void glibtop_get_proc_mem(glibtop_proc_mem *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_MEM
-#define glibtop_get_proc_mem_r		glibtop_get_proc_mem_p
-#else
-#define glibtop_get_proc_mem_r		glibtop_get_proc_mem_s
-#endif
-
-void glibtop_get_proc_mem_l (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_MEM
-void _glibtop_init_proc_mem_p (glibtop *server);
-void glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
-#else
-void _glibtop_init_proc_mem_s (glibtop *server);
-void glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h
deleted file mode 100644
index 3509737a..00000000
--- a/include/glibtop/procopenfiles.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   Copyright (C) 2004 Nicolás Lichtmaier
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   Modified by Nicolás Lichtmaier to give open process files.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROC_OPEN_FILES_H__
-#define __GLIBTOP_PROC_OPEN_FILES_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_OPEN_FILES_NUMBER		0
-#define GLIBTOP_PROC_OPEN_FILES_TOTAL		1
-#define GLIBTOP_PROC_OPEN_FILES_SIZE		2
-
-#define GLIBTOP_MAX_PROC_OPEN_FILES		3
-
-#define GLIBTOP_FILE_ENTRY_FD				0
-#define GLIBTOP_FILE_ENTRY_NAME				1
-#define GLIBTOP_FILE_ENTRY_TYPE				2
-#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_HOST		3
-#define GLIBTOP_FILE_ENTRY_INETSOCKET_DST_PORT		4
-
-#define GLIBTOP_MAX_OPEN_FILE_ENTRY		5
-
-#define GLIBTOP_OPEN_FILENAME_LEN	215
- /* ready for IPv6 */
-#define GLIBTOP_OPEN_DEST_HOST_LEN	46
-
-enum glibtop_file_type {
-	GLIBTOP_FILE_TYPE_FILE		= 1,
-	GLIBTOP_FILE_TYPE_PIPE		= 2,
-	GLIBTOP_FILE_TYPE_INETSOCKET	= 4,
-	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8
-};
-
-typedef struct _glibtop_open_files_entry glibtop_open_files_entry;
-
-typedef struct _glibtop_proc_open_files	glibtop_proc_open_files;
-
-struct _glibtop_open_files_entry
-{
-	int fd;
-	guint16 type; /* An "enum glibtop_file_type" value. */
-	union {
-		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET */
-		struct {
-			char dest_host[GLIBTOP_OPEN_DEST_HOST_LEN+1];
-			int dest_port;
-		} sock;
-
-		/* When type == GLIBTOP_FILE_TYPE_FILE */
-		struct {
-			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
-		} file;
-
-		/* When type == GLIBTOP_FILE_TYPE_LOCALSOCKET */
-		struct {
-			char name[GLIBTOP_OPEN_FILENAME_LEN+1];
-		} localsock;
-
-	} info;
-};
-
-struct _glibtop_proc_open_files
-{
-	guint64	flags;
-	guint64 number;			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
-	guint64 total;			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
-	guint64 size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
-};
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_FILE
-#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_p
-#else
-#define glibtop_get_proc_open_files_r		glibtop_get_proc_open_files_s
-#endif
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_l (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_FILE
-void _glibtop_init_proc_open_files_p (glibtop *server);
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_p (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-#else
-void _glibtop_init_proc_open_files_s (glibtop *server);
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
-#endif
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h
deleted file mode 100644
index 5d2815d9..00000000
--- a/include/glibtop/procsegment.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCSEGMENT_H__
-#define __GLIBTOP_PROCSEGMENT_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
-#define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
-#define GLIBTOP_PROC_SEGMENT_DATA_RSS		2
-#define GLIBTOP_PROC_SEGMENT_STACK_RSS		3
-#define GLIBTOP_PROC_SEGMENT_DIRTY_SIZE		4
-#define GLIBTOP_PROC_SEGMENT_START_CODE		5
-#define GLIBTOP_PROC_SEGMENT_END_CODE		6
-#define GLIBTOP_PROC_SEGMENT_START_STACK	7
-
-#define GLIBTOP_MAX_PROC_SEGMENT		8
-
-typedef struct _glibtop_proc_segment	glibtop_proc_segment;
-
-/* Segment stuff */
-
-struct _glibtop_proc_segment
-{
-	guint64	flags;
-	guint64 text_rss;	/* text resident set size */
-	guint64 shlib_rss;	/* shared-lib resident set size */
-	guint64 data_rss;	/* data resident set size */
-	guint64 stack_rss;	/* stack resident set size */
-	guint64 dirty_size;	/* size of dirty pages */
-	guint64 start_code;
-				/* address of beginning of code segment */
-	guint64 end_code;	/* address of end of code segment */
-	guint64 start_stack;	/* address of the bottom of stack segment */
-};
-
-void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_SEGMENT
-#define glibtop_get_proc_segment_r	glibtop_get_proc_segment_p
-#else
-#define glibtop_get_proc_segment_r	glibtop_get_proc_segment_s
-#endif
-
-void glibtop_get_proc_segment_l (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_SEGMENT
-void _glibtop_init_proc_segment_p (glibtop *server);
-void glibtop_get_proc_segment_p (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
-#else
-void _glibtop_init_proc_segment_s (glibtop *server);
-void glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h
deleted file mode 100644
index 10c3670c..00000000
--- a/include/glibtop/procsignal.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCSIGNAL_H__
-#define __GLIBTOP_PROCSIGNAL_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_SIGNAL_SIGNAL	0
-#define GLIBTOP_PROC_SIGNAL_BLOCKED	1
-#define GLIBTOP_PROC_SIGNAL_SIGIGNORE	2
-#define GLIBTOP_PROC_SIGNAL_SIGCATCH	3
-
-#define GLIBTOP_MAX_PROC_SIGNAL		4
-
-typedef struct _glibtop_proc_signal	glibtop_proc_signal;
-
-/* Signals section */
-
-struct _glibtop_proc_signal
-{
-	guint64	flags;
-	guint64 signal [2];		/* mask of pending signals */
-	guint64 blocked [2];		/* mask of blocked signals */
-	guint64 sigignore [2];		/* mask of ignored signals */
-	guint64 sigcatch [2];		/* mask of caught  signals */
-};
-
-void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_SIGNAL
-#define glibtop_get_proc_signal_r	glibtop_get_proc_signal_p
-#else
-#define glibtop_get_proc_signal_r	glibtop_get_proc_signal_s
-#endif
-
-void glibtop_get_proc_signal_l (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_SIGNAL
-void _glibtop_init_proc_signal_p (glibtop *server);
-void glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
-#else
-void _glibtop_init_proc_signal_s (glibtop *server);
-void glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h
deleted file mode 100644
index 7c05628b..00000000
--- a/include/glibtop/procstate.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCSTATE_H__
-#define __GLIBTOP_PROCSTATE_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_STATE_CMD		0
-#define GLIBTOP_PROC_STATE_STATE	1
-#define GLIBTOP_PROC_STATE_UID		2
-#define GLIBTOP_PROC_STATE_GID		3
-#define GLIBTOP_PROC_STATE_RUID     4
-#define GLIBTOP_PROC_STATE_RGID     5
-#define GLIBTOP_PROC_STATE_HAS_CPU  6
-#define GLIBTOP_PROC_STATE_PROCESSOR 7
-#define GLIBTOP_PROC_STATE_LAST_PROCESSOR 8
-
-#define GLIBTOP_MAX_PROC_STATE		9
-
-#define GLIBTOP_PROCESS_RUNNING                 1
-#define GLIBTOP_PROCESS_INTERRUPTIBLE           2
-#define GLIBTOP_PROCESS_UNINTERRUPTIBLE         4
-#define GLIBTOP_PROCESS_ZOMBIE                  8
-#define GLIBTOP_PROCESS_STOPPED                 16
-#define GLIBTOP_PROCESS_SWAPPING                32
-#define GLIBTOP_PROCESS_DEAD                    64
-
-typedef struct _glibtop_proc_state	glibtop_proc_state;
-
-/* Name and status */
-
-struct _glibtop_proc_state
-{
-	guint64 flags;
-	char cmd[40];		/* basename of executable file in
-				 * call to exec(2) */
-	unsigned state;
-	/* NOTE: when porting the library, TRY HARD to implement the
-	 *       following two fields. */
-	/* IMPORTANT NOTICE: For security reasons, it is extremely important
-	 *                   only to set the flags value for those two
-	 *                   fields if their values are corrent ! */
-	int uid;		/* UID of process */
-	int gid;		/* GID of process */
-    int ruid;
-    int rgid;
-    int has_cpu;
-    int processor;
-    int last_processor;
-};
-
-void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_STATE
-#define glibtop_get_proc_state_r	glibtop_get_proc_state_p
-#else
-#define glibtop_get_proc_state_r	glibtop_get_proc_state_s
-#endif
-
-void glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_STATE
-void _glibtop_init_proc_state_p (glibtop *server);
-void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t pid);
-#else
-void _glibtop_init_proc_state_s (glibtop *server);
-void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h
deleted file mode 100644
index 5f542aea..00000000
--- a/include/glibtop/proctime.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCTIME_H__
-#define __GLIBTOP_PROCTIME_H__
-
-#include <glibtop.h>
-#include <glibtop/cpu.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_TIME_START_TIME	0
-#define GLIBTOP_PROC_TIME_RTIME		1
-#define GLIBTOP_PROC_TIME_UTIME		2
-#define GLIBTOP_PROC_TIME_STIME		3
-#define GLIBTOP_PROC_TIME_CUTIME	4
-#define GLIBTOP_PROC_TIME_CSTIME	5
-#define GLIBTOP_PROC_TIME_TIMEOUT	6
-#define GLIBTOP_PROC_TIME_IT_REAL_VALUE	7
-#define GLIBTOP_PROC_TIME_FREQUENCY	8
-#define GLIBTOP_PROC_TIME_XCPU_UTIME	9
-#define GLIBTOP_PROC_TIME_XCPU_STIME	10
-
-#define GLIBTOP_MAX_PROC_TIME		11
-
-typedef struct _glibtop_proc_time	glibtop_proc_time;
-
-/* Time section */
-
-struct _glibtop_proc_time
-{
-	guint64	flags;
-	guint64 start_time;	/* start time of process --
-				 * seconds since 1-1-70 */
-	guint64 rtime;		/* real time accumulated by process */
-	guint64 utime;		/* user-mode CPU time accumulated by process */
-	guint64 stime;		/* kernel-mode CPU time accumulated by process */
-	guint64 cutime;		/* cumulative utime of process and
-				 * reaped children */
-	guint64 cstime;		/* cumulative stime of process and
-				 * reaped children */
-	guint64 timeout;	/* The time (in jiffies) of the process's
-				 * next timeout */
-	guint64 it_real_value;	/* The time (in jiffies) before the
-				 * next SIGALRM is sent to the process
-				 * due to an interval timer. */
-	guint64 frequency;	/* Tick frequency. */
-	guint64 xcpu_utime [GLIBTOP_NCPU];	/* utime and stime for all CPUs on */
-	guint64 xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
-};
-
-
-void glibtop_get_proc_time(glibtop_proc_time *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_TIME
-#define glibtop_get_proc_time_r	glibtop_get_proc_time_p
-#else
-#define glibtop_get_proc_time_r	glibtop_get_proc_time_s
-#endif
-
-void glibtop_get_proc_time_l (glibtop *server, glibtop_proc_time *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_TIME
-void _glibtop_init_proc_time_p (glibtop *server);
-void glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid);
-#else
-void _glibtop_init_proc_time_s (glibtop *server);
-void glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h
deleted file mode 100644
index 16268a2b..00000000
--- a/include/glibtop/procuid.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCUID_H__
-#define __GLIBTOP_PROCUID_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_UID_UID		0
-#define GLIBTOP_PROC_UID_EUID		1
-#define GLIBTOP_PROC_UID_GID		2
-#define GLIBTOP_PROC_UID_EGID		3
-#define GLIBTOP_PROC_UID_SUID		4
-#define GLIBTOP_PROC_UID_SGID		5
-#define GLIBTOP_PROC_UID_FSUID		6
-#define GLIBTOP_PROC_UID_FSGID		7
-#define GLIBTOP_PROC_UID_PID		8
-#define GLIBTOP_PROC_UID_PPID		9
-#define GLIBTOP_PROC_UID_PGRP		10
-#define GLIBTOP_PROC_UID_SESSION	11
-#define GLIBTOP_PROC_UID_TTY		12
-#define GLIBTOP_PROC_UID_TPGID		13
-#define GLIBTOP_PROC_UID_PRIORITY	14
-#define GLIBTOP_PROC_UID_NICE		15
-#define GLIBTOP_PROC_UID_NGROUPS    16
-#define GLIBTOP_PROC_UID_GROUPS     17
-
-#define GLIBTOP_MAX_PROC_UID		18
-
-typedef struct _glibtop_proc_uid	glibtop_proc_uid;
-
-#define GLIBTOP_MAX_GROUPS          64
-
-/* User, Group, Terminal and session */
-
-struct _glibtop_proc_uid
-{
-	guint64 flags;
-	gint32 uid;		/* user id */
-	gint32 euid;		/* effective user id */
-	gint32 gid;		/* group id */
-	gint32 egid;		/* effective group id */
-	gint32 suid;       /* set user id */
-	gint32 sgid;       /* set group id */
-	gint32 fsuid;      /* ??? user id */
-	gint32 fsgid;      /* ??? group id */
-	gint32 pid;		/* process id */
-	gint32 ppid;		/* pid of parent process */
-	gint32 pgrp;		/* process group id */
-	gint32 session;	/* session id */
-	gint32 tty;		/* full device number of controlling terminal */
-	gint32 tpgid;		/* terminal process group id */
-	gint32 priority;	/* kernel scheduling priority */
-	gint32 nice;		/* standard unix nice level of process */
-	gint32 ngroups;
-	gint32 groups [GLIBTOP_MAX_GROUPS];
-
-};
-
-void glibtop_get_proc_uid(glibtop_proc_uid *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_UID
-#define glibtop_get_proc_uid_r		glibtop_get_proc_uid_p
-#else
-#define glibtop_get_proc_uid_r		glibtop_get_proc_uid_s
-#endif
-
-void glibtop_get_proc_uid_l (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_UID
-void _glibtop_init_proc_uid_p (glibtop *server);
-void glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
-#else
-void _glibtop_init_proc_uid_s (glibtop *server);
-void glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/procwd.h b/include/glibtop/procwd.h
deleted file mode 100644
index 9da26059..00000000
--- a/include/glibtop/procwd.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright (C) 2007 Benoît Dejean
-   This file is part of LibGTop 2.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCWD_H__
-#define __GLIBTOP_PROCWD_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_proc_wd	glibtop_proc_wd;
-
-#define GLIBTOP_PROC_WD_NUMBER	0
-#define GLIBTOP_PROC_WD_ROOT	1
-#define GLIBTOP_PROC_WD_EXE	2
-#define GLIBTOP_PROC_WD_MAX	3
-
-#define GLIBTOP_PROC_WD_ROOT_LEN 215
-#define GLIBTOP_PROC_WD_EXE_LEN 215
-
-struct _glibtop_proc_wd
-{
-	guint64	flags;
-	guint32 number;
-	char root[GLIBTOP_PROC_WD_ROOT_LEN+1];
-	char exe[GLIBTOP_PROC_WD_EXE_LEN+1];
-};
-
-
-char ** glibtop_get_proc_wd(glibtop_proc_wd *buf, pid_t pid);
-char ** glibtop_get_proc_wd_l(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
-
-
-#if GLIBTOP_SUID_PROC_WD
-
-#define glibtop_get_proc_wd_r glibtop_get_proc_wd_p
-void _glibtop_init_proc_wd_p(glibtop *server);
-char ** glibtop_get_proc_wd_p(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
-
-#else
-
-#define glibtop_get_proc_wd_r glibtop_get_proc_wd_s
-void _glibtop_init_proc_wd_s(glibtop *server);
-char ** glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid);
-
-#endif
-
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/read.h b/include/glibtop/read.h
deleted file mode 100644
index 411cb764..00000000
--- a/include/glibtop/read.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_READ_H__
-#define __GLIBTOP_READ_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)
-
-void glibtop_read_l (glibtop *server, size_t size, void *buf);
-void glibtop_read_s (glibtop *server, size_t size, void *buf);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/read_data.h b/include/glibtop/read_data.h
deleted file mode 100644
index 611bd289..00000000
--- a/include/glibtop/read_data.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_READ_DATA_H__
-#define __GLIBTOP_READ_DATA_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)
-
-void *glibtop_read_data_l (glibtop *server);
-void *glibtop_read_data_s (glibtop *server);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h
deleted file mode 100644
index 612e07dc..00000000
--- a/include/glibtop/sem_limits.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SEM_LIMITS_H__
-#define __GLIBTOP_SEM_LIMITS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_IPC_SEMMAP	0
-#define GLIBTOP_IPC_SEMMNI	1
-#define GLIBTOP_IPC_SEMMNS	2
-#define GLIBTOP_IPC_SEMMNU	3
-#define GLIBTOP_IPC_SEMMSL	4
-#define GLIBTOP_IPC_SEMOPM	5
-#define GLIBTOP_IPC_SEMUME	6
-#define GLIBTOP_IPC_SEMUSZ	7
-#define GLIBTOP_IPC_SEMVMX	8
-#define GLIBTOP_IPC_SEMAEM	9
-
-#define GLIBTOP_MAX_SEM_LIMITS	10
-
-typedef struct _glibtop_sem_limits	glibtop_sem_limits;
-
-struct _glibtop_sem_limits
-{
-	guint64	flags;
-	guint64 semmap;		/* GLIBTOP_IPC_SEMMAP	*/
-	guint64 semmni;		/* GLIBTOP_IPC_SEMMNI	*/
-	guint64 semmns;		/* GLIBTOP_IPC_SEMMNS	*/
-	guint64 semmnu;		/* GLIBTOP_IPC_SEMMNU	*/
-	guint64 semmsl;		/* GLIBTOP_IPC_SEMMSL	*/
-	guint64 semopm;		/* GLIBTOP_IPC_SEMOPM	*/
-	guint64 semume;		/* GLIBTOP_IPC_SEMUME	*/
-	guint64 semusz;		/* GLIBTOP_IPC_SEMUSZ	*/
-	guint64 semvmx;		/* GLIBTOP_IPC_SEMVMX	*/
-	guint64 semaem;		/* GLIBTOP_IPC_SEMAEM	*/
-};
-
-void glibtop_get_sem_limits(glibtop_sem_limits *buf);
-
-#if GLIBTOP_SUID_SEM_LIMITS
-#define glibtop_get_sem_limits_r	glibtop_get_sem_limits_p
-#else
-#define glibtop_get_sem_limits_r	glibtop_get_sem_limits_s
-#endif
-
-void glibtop_get_sem_limits_l (glibtop *server, glibtop_sem_limits *buf);
-
-#if GLIBTOP_SUID_SEM_LIMITS
-void _glibtop_init_sem_limits_p (glibtop *server);
-void glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf);
-#else
-void _glibtop_init_sem_limits_s (glibtop *server);
-void glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h
deleted file mode 100644
index 842a1241..00000000
--- a/include/glibtop/shm_limits.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SHM_LIMITS_H__
-#define __GLIBTOP_SHM_LIMITS_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_IPC_SHMMAX	0
-#define GLIBTOP_IPC_SHMMIN	1
-#define GLIBTOP_IPC_SHMMNI	2
-#define GLIBTOP_IPC_SHMSEG	3
-#define GLIBTOP_IPC_SHMALL	4
-
-#define GLIBTOP_MAX_SHM_LIMITS	5
-
-typedef struct _glibtop_shm_limits	glibtop_shm_limits;
-
-struct _glibtop_shm_limits
-{
-	guint64	flags;
-	guint64 shmmax;		/* GLIBTOP_IPC_SHMMAX	*/
-	guint64 shmmin;		/* GLIBTOP_IPC_SHMMIN	*/
-	guint64 shmmni;		/* GLIBTOP_IPC_SHMMNI	*/
-	guint64 shmseg;		/* GLIBTOP_IPC_SHMSEG	*/
-	guint64 shmall;		/* GLIBTOP_IPC_SHMALL	*/
-};
-
-void glibtop_get_shm_limits(glibtop_shm_limits *buf);
-
-#if GLIBTOP_SUID_SHM_LIMITS
-#define glibtop_get_shm_limits_r	glibtop_get_shm_limits_p
-#else
-#define glibtop_get_shm_limits_r	glibtop_get_shm_limits_s
-#endif
-
-void glibtop_get_shm_limits_l (glibtop *server, glibtop_shm_limits *buf);
-
-#if GLIBTOP_SUID_SHM_LIMITS
-void _glibtop_init_shm_limits_p (glibtop *server);
-void glibtop_get_shm_limits_p (glibtop *, glibtop_shm_limits *buf);
-#else
-void _glibtop_init_shm_limits_s (glibtop *server);
-void glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/signal.h b/include/glibtop/signal.h
deleted file mode 100644
index a3b3ac76..00000000
--- a/include/glibtop/signal.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SIGNAL_H__
-#define __GLIBTOP_SIGNAL_H__
-
-#include <glibtop.h>
-
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_signame	glibtop_signame;
-
-struct _glibtop_signame
-{
-	const int number;
-	const char *name, *label;
-};
-
-extern const glibtop_signame glibtop_sys_siglist [];
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h
deleted file mode 100644
index e29d9527..00000000
--- a/include/glibtop/swap.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SWAP_H__
-#define __GLIBTOP_SWAP_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_SWAP_TOTAL	0
-#define GLIBTOP_SWAP_USED	1
-#define GLIBTOP_SWAP_FREE	2
-#define GLIBTOP_SWAP_PAGEIN	3
-#define GLIBTOP_SWAP_PAGEOUT	4
-
-#define GLIBTOP_MAX_SWAP	5
-
-typedef struct _glibtop_swap	glibtop_swap;
-
-struct _glibtop_swap
-{
-	guint64	flags;
-	guint64 total;		/* GLIBTOP_SWAP_TOTAL	*/
-	guint64 used;		/* GLIBTOP_SWAP_USED	*/
-	guint64 free;		/* GLIBTOP_SWAP_FREE	*/
-	guint64 pagein;		/* GLIBTOP_SWAP_PAGEIN	*/
-	guint64 pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
-};
-
-void
-glibtop_get_swap(glibtop_swap *buf);
-
-#if GLIBTOP_SUID_SWAP
-#define glibtop_get_swap_r		glibtop_get_swap_p
-#else
-#define glibtop_get_swap_r		glibtop_get_swap_s
-#endif
-
-void glibtop_get_swap_l (glibtop *server, glibtop_swap *buf);
-
-#if GLIBTOP_SUID_SWAP
-void _glibtop_init_swap_p (glibtop *server);
-void glibtop_get_swap_p (glibtop *server, glibtop_swap *buf);
-#else
-void _glibtop_init_swap_s (glibtop *server);
-void glibtop_get_swap_s (glibtop *server, glibtop_swap *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
deleted file mode 100644
index 40f0b6b2..00000000
--- a/include/glibtop/sysdeps.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SYSDEPS_H__
-#define __GLIBTOP_SYSDEPS_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_SYSDEPS_FEATURES	0
-#define GLIBTOP_SYSDEPS_CPU		1
-#define GLIBTOP_SYSDEPS_MEM		2
-#define GLIBTOP_SYSDEPS_SWAP		3
-#define GLIBTOP_SYSDEPS_UPTIME		4
-#define GLIBTOP_SYSDEPS_LOADAVG		5
-#define GLIBTOP_SYSDEPS_SHM_LIMITS	6
-#define GLIBTOP_SYSDEPS_MSG_LIMITS	7
-#define GLIBTOP_SYSDEPS_SEM_LIMITS	8
-#define GLIBTOP_SYSDEPS_PROCLIST	9
-#define GLIBTOP_SYSDEPS_PROC_STATE	10
-#define GLIBTOP_SYSDEPS_PROC_UID	11
-#define GLIBTOP_SYSDEPS_PROC_MEM	12
-#define GLIBTOP_SYSDEPS_PROC_TIME	13
-#define GLIBTOP_SYSDEPS_PROC_SIGNAL	14
-#define GLIBTOP_SYSDEPS_PROC_KERNEL	15
-#define GLIBTOP_SYSDEPS_PROC_SEGMENT	16
-#define GLIBTOP_SYSDEPS_PROC_ARGS	17
-#define GLIBTOP_SYSDEPS_PROC_MAP	18
-#define GLIBTOP_SYSDEPS_MOUNTLIST	19
-#define GLIBTOP_SYSDEPS_FSUSAGE		20
-#define GLIBTOP_SYSDEPS_NETLOAD		21
-#define GLIBTOP_SYSDEPS_PPP		22
-#define GLIBTOP_SYSDEPS_NETLIST		23
-#define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
-#define GLIBTOP_SYSDEPS_PROC_WD		25
-
-#define GLIBTOP_MAX_SYSDEPS		26
-
-#define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
-
-typedef struct _glibtop_sysdeps	glibtop_sysdeps;
-
-struct _glibtop_sysdeps
-{
-	guint64 flags;
-	guint64 features;		/* server features	*/
-	guint64 cpu;			/* glibtop_cpu		*/
-	guint64 mem;			/* glibtop_mem		*/
-	guint64 swap;			/* glibtop_swap		*/
-	guint64 uptime;			/* glibtop_uptime	*/
-	guint64 loadavg;		/* glibtop_loadavg	*/
-	guint64 shm_limits;		/* glibtop_shm_limits	*/
-	guint64 msg_limits;		/* glibtop_msg_limits	*/
-	guint64 sem_limits;		/* glibtop_sem_limits	*/
-	guint64 proclist;		/* glibtop_proclist	*/
-	guint64 proc_state;		/* glibtop_proc_state	*/
-	guint64 proc_uid;		/* glibtop_proc_uid	*/
-	guint64 proc_mem;		/* glibtop_proc_mem	*/
-	guint64 proc_time;		/* glibtop_proc_time	*/
-	guint64 proc_signal;		/* glibtop_proc_signal	*/
-	guint64 proc_kernel;		/* glibtop_proc_kernel	*/
-	guint64 proc_segment;		/* glibtop_proc_segment	*/
-	guint64 proc_args;		/* glibtop_proc_args	*/
-	guint64 proc_map;		/* glibtop_proc_map	*/
-	guint64 proc_open_files;	/* glibtop_proc_open_files */
-	guint64 mountlist;		/* glibtop_mountlist	*/
-	guint64 fsusage;		/* glibtop_fsusage	*/
-	guint64 netlist;		/* glibtop_netlist	*/
-	guint64 netload;		/* glibtop_netload	*/
-	guint64 ppp;			/* glibtop_ppp		*/
-	guint64	proc_wd;		/* glibtop_proc_wd	*/
-};
-
-void glibtop_get_sysdeps (glibtop_sysdeps *buf);
-void glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf);
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h
deleted file mode 100644
index c153c2ad..00000000
--- a/include/glibtop/sysinfo.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SYSINFO_H__
-#define __GLIBTOP_SYSINFO_H__
-
-#include <glibtop.h>
-#include <glibtop/cpu.h>
-#include <glibtop/global.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_SYSINFO_NCPU		0
-#define GLIBTOP_SYSINFO_CPUINFO		1
-
-#define GLIBTOP_MAX_SYSINFO		2
-
-typedef struct _glibtop_sysinfo	glibtop_sysinfo;
-
-typedef struct _glibtop_entry	glibtop_entry;
-
-struct _glibtop_entry
-{
-	GPtrArray	*labels;
-	GHashTable	*values; /* key -> description */
-	GHashTable	*descriptions; /* unused */
-};
-
-struct _glibtop_sysinfo
-{
-	guint64	flags;
-	guint64 ncpu;
-	glibtop_entry cpuinfo [GLIBTOP_NCPU];
-};
-
-#define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s
-
-const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
-const glibtop_sysinfo *glibtop_get_sysinfo (void);
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/union.h b/include/glibtop/union.h
deleted file mode 100644
index 39da4640..00000000
--- a/include/glibtop/union.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_UNION_H__
-#define __GLIBTOP_UNION_H__
-
-#include <glibtop/cpu.h>
-#include <glibtop/mem.h>
-#include <glibtop/swap.h>
-#include <glibtop/uptime.h>
-#include <glibtop/loadavg.h>
-#include <glibtop/shm_limits.h>
-#include <glibtop/msg_limits.h>
-#include <glibtop/sem_limits.h>
-#include <glibtop/proclist.h>
-
-#include <glibtop/procstate.h>
-#include <glibtop/procuid.h>
-#include <glibtop/procmem.h>
-#include <glibtop/proctime.h>
-#include <glibtop/procsignal.h>
-#include <glibtop/prockernel.h>
-#include <glibtop/procsegment.h>
-#include <glibtop/procargs.h>
-#include <glibtop/procmap.h>
-#include <glibtop/procopenfiles.h>
-#include <glibtop/procwd.h>
-
-#include <glibtop/mountlist.h>
-#include <glibtop/fsusage.h>
-
-#include <glibtop/netload.h>
-#include <glibtop/netlist.h>
-#include <glibtop/ppp.h>
-
-G_BEGIN_DECLS
-
-typedef union _glibtop_union	glibtop_union;
-
-union _glibtop_union
-{
-	glibtop_cpu		cpu;
-	glibtop_mem		mem;
-	glibtop_swap		swap;
-	glibtop_uptime		uptime;
-	glibtop_loadavg		loadavg;
-	glibtop_shm_limits	shm_limits;
-	glibtop_msg_limits	msg_limits;
-	glibtop_sem_limits	sem_limits;
-	glibtop_proclist	proclist;
-	glibtop_proc_state	proc_state;
-	glibtop_proc_uid	proc_uid;
-	glibtop_proc_mem	proc_mem;
-	glibtop_proc_time	proc_time;
-	glibtop_proc_signal	proc_signal;
-	glibtop_proc_kernel	proc_kernel;
-	glibtop_proc_segment	proc_segment;
-	glibtop_proc_args	proc_args;
-	glibtop_proc_map	proc_map;
-	glibtop_mountlist	mountlist;
-	glibtop_fsusage		fsusage;
-	glibtop_netlist		netlist;
-	glibtop_netload		netload;
-	glibtop_ppp		ppp;
-	glibtop_proc_open_files proc_open_files;
-	glibtop_proc_wd		proc_wd;
-};
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h
deleted file mode 100644
index 1b579ed3..00000000
--- a/include/glibtop/uptime.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_UPTIME_H__
-#define __GLIBTOP_UPTIME_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_UPTIME_UPTIME		0
-#define GLIBTOP_UPTIME_IDLETIME		1
-#define GLIBTOP_UPTIME_BOOT_TIME    2
-
-#define GLIBTOP_MAX_UPTIME		3
-
-typedef struct _glibtop_uptime	glibtop_uptime;
-
-struct _glibtop_uptime
-{
-	guint64 flags;
-	double uptime;		/* GLIBTOP_UPTIME_UPTIME	*/
-	double idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
-	guint64 boot_time;
-};
-
-void glibtop_get_uptime (glibtop_uptime *buf);
-
-#if GLIBTOP_SUID_UPTIME
-#define glibtop_get_uptime_r		glibtop_get_uptime_p
-#else
-#define glibtop_get_uptime_r		glibtop_get_uptime_s
-#endif
-
-void glibtop_get_uptime_l (glibtop *server, glibtop_uptime *buf);
-
-#if GLIBTOP_SUID_UPTIME
-void _glibtop_init_uptime_p (glibtop *server);
-void glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf);
-#else
-void _glibtop_init_uptime_s (glibtop *server);
-void glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf);
-#endif
-
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/version.h b/include/glibtop/version.h
deleted file mode 100644
index 90ba06df..00000000
--- a/include/glibtop/version.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_VERSION_H__
-#define __GLIBTOP_VERSION_H__
-
-#include <glibtop.h>
-
-#define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
-
-G_BEGIN_DECLS
-
-#if _IN_LIBGTOP
-
-void glibtop_send_version (glibtop *server, int fd);
-
-#endif
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/write.h b/include/glibtop/write.h
deleted file mode 100644
index bbed110a..00000000
--- a/include/glibtop/write.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_WRITE_H__
-#define __GLIBTOP_WRITE_H__
-
-#include <glibtop.h>
-
-G_BEGIN_DECLS
-
-#define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)
-
-void glibtop_write_l (glibtop *server, size_t size, void *buf);
-void glibtop_write_s (glibtop *server, size_t size, void *buf);
-
-G_END_DECLS
-
-#endif