diff --git a/sysdeps/names/cpu.c b/sysdeps/names/cpu.c
index 8bf80d8d..385c8e59 100644
--- a/sysdeps/names/cpu.c
+++ b/sysdeps/names/cpu.c
@@ -26,7 +26,7 @@ const char *glibtop_names_cpu [GLIBTOP_MAX_CPU] =
 	"total", "user", "nice", "sys", "idle", "frequency"
 };
 
-const char *glibtop_types_cpu [GLIBTOP_MAX_CPU] =
+const unsigned glibtop_types_cpu [GLIBTOP_MAX_CPU] =
 { 
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
diff --git a/sysdeps/names/mem.c b/sysdeps/names/mem.c
index 534274ca..cf912683 100644
--- a/sysdeps/names/mem.c
+++ b/sysdeps/names/mem.c
@@ -27,7 +27,7 @@ const char *glibtop_names_mem [GLIBTOP_MAX_MEM] =
 	"cached", "user", "locked"
 };
 
-const char *glibtop_types_mem [GLIBTOP_MAX_MEM] =
+const unsigned glibtop_types_mem [GLIBTOP_MAX_MEM] =
 { 
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
diff --git a/sysdeps/names/msg_limits.c b/sysdeps/names/msg_limits.c
index a2a9ee1f..512bbd48 100644
--- a/sysdeps/names/msg_limits.c
+++ b/sysdeps/names/msg_limits.c
@@ -26,7 +26,7 @@ const char *glibtop_names_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 	"msgpool", "msgmap", "msgmax", "msgmnb", "msgmni", "msgssz", "msgtql"
 };
 
-const char *glibtop_types_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
+const unsigned glibtop_types_msg_limits [GLIBTOP_MAX_MSG_LIMITS] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
diff --git a/sysdeps/names/procdata.c b/sysdeps/names/procdata.c
deleted file mode 100644
index 1729860c..00000000
--- a/sysdeps/names/procdata.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop/procdata.h>
-
-const char *glibtop_names_procdata [GLIBTOP_MAX_PROCDATA] =
-{ "cmd", "state", "uid", "pid", "ppid", "pgrp", "session",
-  "tty", "tpgid", "priority", "nice", "signal", "blocked",
-  "sigignore", "sigcatch", "start_time", "utime", "stime",
-  "cutime", "cstime", "size", "resident", "share", "trs",
-  "lrs", "drs", "dt", "vsize", "rss", "rss_rlim", "timeout",
-  "it_real_value", "k_flags", "min_flt", "maj_flt", "cmin_flt",
-  "cmaj_flt", "start_code", "end_code", "start_stack",
-  "kstk_esp", "kstk_eip", "wchan"
-};
-
-const char *glibtop_labels_procdata [GLIBTOP_MAX_PROCDATA] =
-{ N_("Cmd"), N_("Stat"), N_("UID"), N_("PID"), N_("PPID"), N_("PGRP"),
-  N_("Session"), N_("Tty"), N_("TPGID"), N_("Priority"), N_("Nice"),
-  N_("Signal"), N_("Blocked"), N_("SigIgnore"), N_("SigCatch"),
-  N_("Start_Time"), N_("UTime"), N_("STime"), N_("CUTime"), N_("CSTime"),
-  N_("Size"), N_("Resident"), N_("Share"), N_("TRS"), N_("LRS"), N_("DRS"),
-  N_("DT"), N_("VSize"), N_("RSS"), N_("RSS_RLim"), N_("Timeout"),
-  N_("It_Real_Value"), N_("Flags"), N_("Min_Flt"), N_("Maj_Flt"),
-  N_("CMin_Flt"), N_("Cmaj_Flt"), N_("Start_Code"), N_("End_Code"),
-  N_("Start_Stack"), N_("KSTK_ESP"), N_("KSTK_EIP"), N_("WChan")
-};
-
-const char *glibtop_descriptions_procdata [GLIBTOP_MAX_PROCDATA] =
-{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-  NULL, NULL
-};
diff --git a/sysdeps/names/prockernel.c b/sysdeps/names/prockernel.c
index a9442100..e49f9b83 100644
--- a/sysdeps/names/prockernel.c
+++ b/sysdeps/names/prockernel.c
@@ -28,7 +28,7 @@ const char *glibtop_names_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 	"kstk_esp", "kstk_eip", "wchan"
 };
 
-const char *glibtop_types_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
+const unsigned glibtop_types_proc_kernel [GLIBTOP_MAX_PROC_KERNEL] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
diff --git a/sysdeps/names/proclist.c b/sysdeps/names/proclist.c
index b1c8a360..8358d13e 100644
--- a/sysdeps/names/proclist.c
+++ b/sysdeps/names/proclist.c
@@ -26,7 +26,7 @@ const char *glibtop_names_proclist [GLIBTOP_MAX_PROCLIST] =
 	"number", "total", "size"
 };
 
-const char *glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
+const unsigned glibtop_types_proclist [GLIBTOP_MAX_PROCLIST] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
diff --git a/sysdeps/names/procmem.c b/sysdeps/names/procmem.c
index eeb5f46f..41385465 100644
--- a/sysdeps/names/procmem.c
+++ b/sysdeps/names/procmem.c
@@ -34,7 +34,7 @@ const char *glibtop_names_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 	"size", "vsize", "resident", "share", "rss", "rss_rlim"
 };
 
-const char *glibtop_types_proc_mem [GLIBTOP_MAX_PROC_MEM] =
+const unsigned glibtop_types_proc_mem [GLIBTOP_MAX_PROC_MEM] =
 {
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG
diff --git a/sysdeps/names/procsegment.c b/sysdeps/names/procsegment.c
index fd81b9e3..c0c84b66 100644
--- a/sysdeps/names/procsegment.c
+++ b/sysdeps/names/procsegment.c
@@ -27,7 +27,7 @@ const char *glibtop_names_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 	"trs", "lrs", "drs", "dt", "start_code", "end_code", "start_stack"
 };
 
-const char *glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
+const unsigned glibtop_types_proc_segment [GLIBTOP_MAX_PROC_SEGMENT] =
 {
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
diff --git a/sysdeps/names/procsignal.c b/sysdeps/names/procsignal.c
index fe915a51..9e7a96e0 100644
--- a/sysdeps/names/procsignal.c
+++ b/sysdeps/names/procsignal.c
@@ -27,7 +27,7 @@ const char *glibtop_names_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 	"signal", "blocked", "sigignore", "sigcatch"
 };
 
-const char *glibtop_types_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
+const unsigned glibtop_types_proc_signal [GLIBTOP_MAX_PROC_SIGNAL] =
 {
 	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
 	GLIBTOP_TYPE_INT
diff --git a/sysdeps/names/procstate.c b/sysdeps/names/procstate.c
index d2a4511d..81cce3e9 100644
--- a/sysdeps/names/procstate.c
+++ b/sysdeps/names/procstate.c
@@ -27,7 +27,7 @@ const char *glibtop_names_proc_state [GLIBTOP_MAX_PROC_STATE] =
 	"cmd", "state", "uid", "gid"
 };
 
-const char *glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
+const unsigned glibtop_types_proc_state [GLIBTOP_MAX_PROC_STATE] =
 {
 	GLIBTOP_TYPE_STRING, GLIBTOP_TYPE_CHAR,
 	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT
diff --git a/sysdeps/names/proctime.c b/sysdeps/names/proctime.c
index 1010d6d7..125d674e 100644
--- a/sysdeps/names/proctime.c
+++ b/sysdeps/names/proctime.c
@@ -36,7 +36,7 @@ const char *glibtop_names_proc_time [GLIBTOP_MAX_PROC_TIME] =
 	"timeout", "it_real_value"
 };
 
-const char *glibtop_types_proc_time [GLIBTOP_MAX_PROC_TIME] =
+const unsigned glibtop_types_proc_time [GLIBTOP_MAX_PROC_TIME] =
 {
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
 	GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG, GLIBTOP_TYPE_LONG,
diff --git a/sysdeps/names/procuid.c b/sysdeps/names/procuid.c
index 6f27d57f..d457ae56 100644
--- a/sysdeps/names/procuid.c
+++ b/sysdeps/names/procuid.c
@@ -41,7 +41,7 @@ const char *glibtop_names_proc_uid [GLIBTOP_MAX_PROC_UID] =
 	"session", "tty", "tpgid", "priority", "nice"
 };
 
-const char *glibtop_types_proc_uid [GLIBTOP_MAX_PROC_UID] =
+const unsigned glibtop_types_proc_uid [GLIBTOP_MAX_PROC_UID] =
 {
 	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
 	GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT, GLIBTOP_TYPE_INT,
diff --git a/sysdeps/names/sem_limits.c b/sysdeps/names/sem_limits.c
index 86650fa4..62923ce0 100644
--- a/sysdeps/names/sem_limits.c
+++ b/sysdeps/names/sem_limits.c
@@ -27,7 +27,7 @@ const char *glibtop_names_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 	"semopm", "semume", "semusz", "semvmx", "semaem"
 };
 
-const char *glibtop_types_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
+const unsigned glibtop_types_sem_limits [GLIBTOP_MAX_SEM_LIMITS] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
diff --git a/sysdeps/names/shm_limits.c b/sysdeps/names/shm_limits.c
index 1d0ce27d..cbf8e058 100644
--- a/sysdeps/names/shm_limits.c
+++ b/sysdeps/names/shm_limits.c
@@ -26,7 +26,7 @@ const char *glibtop_names_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 	"shmmax", "shmmin", "shmmni", "shmseg", "shmall"
 };
 
-const char *glibtop_types_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
+const unsigned glibtop_types_shm_limits [GLIBTOP_MAX_SHM_LIMITS] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
diff --git a/sysdeps/names/swap.c b/sysdeps/names/swap.c
index 2b617f70..8e45f803 100644
--- a/sysdeps/names/swap.c
+++ b/sysdeps/names/swap.c
@@ -26,7 +26,7 @@ const char *glibtop_names_swap [GLIBTOP_MAX_SWAP] =
 	"total", "used", "free"
 };
 
-const char *glibtop_types_swap [GLIBTOP_MAX_SWAP] =
+const unsigned glibtop_types_swap [GLIBTOP_MAX_SWAP] =
 {
 	GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
diff --git a/sysdeps/names/uptime.c b/sysdeps/names/uptime.c
index 8271d729..7f7c3c91 100644
--- a/sysdeps/names/uptime.c
+++ b/sysdeps/names/uptime.c
@@ -26,7 +26,7 @@ const char *glibtop_names_uptime [GLIBTOP_MAX_UPTIME] =
 	"uptime", "idletime"
 };
 
-const char *glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
+const unsigned glibtop_types_uptime [GLIBTOP_MAX_UPTIME] =
 {
 	GLIBTOP_TYPE_DOUBLE, GLIBTOP_TYPE_DOUBLE
 };