Remove orig content.

49 files changed, 0 insertions, 2557 deletions

diff --git a/includes/alpha/processor-platform.h b/includes/alpha/processor-platform.h
deleted file mode 100644
index 778a1a88..00000000
--- a/includes/alpha/processor-platform.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-struct _Processor {
-    gchar *model_name;
-    gfloat bogomips, cpu_mhz;
-    gchar *strmodel;
-    gchar *cycle_frequency_hz_str;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/arm/processor-platform.h b/includes/arm/processor-platform.h
deleted file mode 100644
index 0ffdac24..00000000
--- a/includes/arm/processor-platform.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gchar *model_name;
-    gchar *linux_name;
-    gchar *flags;
-    gfloat bogomips;
-
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *cpu_implementer;
-    gchar *cpu_architecture;
-    gchar *cpu_variant;
-    gchar *cpu_part;
-    gchar *cpu_revision;
-
-    gint mode;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/benchmark.h b/includes/benchmark.h
deleted file mode 100644
index 277f0c07..00000000
--- a/includes/benchmark.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef __BENCHMARK_H__
-#define __BENCHMARK_H__
-
-#include "hardinfo.h"
-
-extern ProgramParameters params;
-
-enum {
-    BENCHMARK_BLOWFISH,
-    BENCHMARK_CRYPTOHASH,
-    BENCHMARK_FIB,
-    BENCHMARK_NQUEENS,
-    BENCHMARK_ZLIB,
-    BENCHMARK_FFT,
-    BENCHMARK_RAYTRACE,
-    BENCHMARK_GUI,
-    BENCHMARK_N_ENTRIES
-} BenchmarkEntries;
-
-void benchmark_bfish(void);
-void benchmark_cryptohash(void);
-void benchmark_fft(void);
-void benchmark_fib(void);
-void benchmark_fish(void);
-void benchmark_gui(void);
-void benchmark_nqueens(void);
-void benchmark_raytrace(void);
-void benchmark_zlib(void);
-
-typedef struct {
-    double result;
-    double elapsed_time;
-    int threads_used;
-} bench_value;
-
-#define EMPTY_BENCH_VALUE {-1.0f,0,0}
-
-char *bench_value_to_str(bench_value r);
-bench_value bench_value_from_str(const char* str);
-
-/* Note:
- *    benchmark_parallel_for(): element [start] included, but [end] is excluded.
- *    callback(): expected to processes elements [start] through [end] inclusive.
- */
-bench_value benchmark_parallel_for(gint n_threads, guint start, guint end,
-                               gpointer callback, gpointer callback_data);
-
-bench_value benchmark_parallel(gint n_threads, gpointer callback, gpointer callback_data);
-
-bench_value benchmark_crunch_for(float seconds, gint n_threads,
-                               gpointer callback, gpointer callback_data);
-
-extern bench_value bench_results[BENCHMARK_N_ENTRIES];
-
-#endif /* __BENCHMARK_H__ */
diff --git a/includes/binreloc.h b/includes/binreloc.h
deleted file mode 100644
index 3bf48bc6..00000000
--- a/includes/binreloc.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * BinReloc - a library for creating relocatable executables
- * Written by: Hongli Lai <h.lai@chello.nl>
- * http://autopackage.org/
- *
- * This source code is public domain. You can relicense this code
- * under whatever license you want.
- *
- * See http://autopackage.org/docs/binreloc/ for
- * more information and how to use this.
- */
-
-#ifndef __BINRELOC_H__
-#define __BINRELOC_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-
-/** These error codes can be returned by br_init(), br_init_lib(), gbr_init() or gbr_init_lib(). */
-typedef enum {
-	/** Cannot allocate memory. */
-	GBR_INIT_ERROR_NOMEM,
-	/** Unable to open /proc/self/maps; see errno for details. */
-	GBR_INIT_ERROR_OPEN_MAPS,
-	/** Unable to read from /proc/self/maps; see errno for details. */
-	GBR_INIT_ERROR_READ_MAPS,
-	/** The file format of /proc/self/maps is invalid; kernel bug? */
-	GBR_INIT_ERROR_INVALID_MAPS,
-	/** BinReloc is disabled (the ENABLE_BINRELOC macro is not defined). */
-	GBR_INIT_ERROR_DISABLED
-} GbrInitError;
-
-
-#ifndef BINRELOC_RUNNING_DOXYGEN
-/* Mangle symbol names to avoid symbol collisions with other ELF objects. */
-	#define gbr_find_exe         UfUy21856259474323_gbr_find_exe
-	#define gbr_find_exe_dir     UfUy21856259474323_gbr_find_exe_dir
-	#define gbr_find_prefix      UfUy21856259474323_gbr_find_prefix
-	#define gbr_find_bin_dir     UfUy21856259474323_gbr_find_bin_dir
-	#define gbr_find_sbin_dir    UfUy21856259474323_gbr_find_sbin_dir
-	#define gbr_find_data_dir    UfUy21856259474323_gbr_find_data_dir
-	#define gbr_find_locale_dir  UfUy21856259474323_gbr_find_locale_dir
-	#define gbr_find_lib_dir     UfUy21856259474323_gbr_find_lib_dir
-	#define gbr_find_libexec_dir UfUy21856259474323_gbr_find_libexec_dir
-	#define gbr_find_etc_dir     UfUy21856259474323_gbr_find_etc_dir
-
-
-#endif
-gboolean gbr_init             (GError **error);
-gboolean gbr_init_lib         (GError **error);
-
-gchar   *gbr_find_exe         (const gchar *default_exe);
-gchar   *gbr_find_exe_dir     (const gchar *default_dir);
-gchar   *gbr_find_prefix      (const gchar *default_prefix);
-gchar   *gbr_find_bin_dir     (const gchar *default_bin_dir);
-gchar   *gbr_find_sbin_dir    (const gchar *default_sbin_dir);
-gchar   *gbr_find_data_dir    (const gchar *default_data_dir);
-gchar   *gbr_find_locale_dir  (const gchar *default_locale_dir);
-gchar   *gbr_find_lib_dir     (const gchar *default_lib_dir);
-gchar   *gbr_find_libexec_dir (const gchar *default_libexec_dir);
-gchar   *gbr_find_etc_dir     (const gchar *default_etc_dir);
-
-
-G_END_DECLS
-
-#endif /* __BINRELOC_H__ */
diff --git a/includes/blowfish.h b/includes/blowfish.h
deleted file mode 100644
index 3f33e945..00000000
--- a/includes/blowfish.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

-blowfish.h:  Header file for blowfish.c

-

-Copyright (C) 1997 by Paul Kocher

-

-This library is free software; you can redistribute it and/or

-modify it under the terms of the GNU Lesser General Public

-License as published by the Free Software Foundation; either

-version 2.1 of the License, or (at your option) any later version.

-This 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

-Lesser General Public License for more details.

-You should have received a copy of the GNU Lesser General Public

-License along with this library; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-

-

-See blowfish.c for more information about this file.

-*/

-

-  

-typedef struct {

-  unsigned long P[16 + 2];

-  unsigned long S[4][256];

-} BLOWFISH_CTX;

-

-void Blowfish_Init(BLOWFISH_CTX *ctx, unsigned char *key, int keyLen);

-void Blowfish_Encrypt(BLOWFISH_CTX *ctx, unsigned long *xl, unsigned long *xr);

-void Blowfish_Decrypt(BLOWFISH_CTX *ctx, unsigned long *xl, unsigned long *xr);

-

-

-

diff --git a/includes/callbacks.h b/includes/callbacks.h
deleted file mode 100644
index 392d5767..00000000
--- a/includes/callbacks.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __CALLBACKS_H__
-#define __CALLBACKS_H__
-
-#include <gtk/gtk.h>
-
-void cb_about();
-void cb_about_module(GtkAction *action);
-void cb_generate_report();
-void cb_quit();
-void cb_refresh();
-void cb_copy_to_clipboard();
-void cb_side_pane();
-void cb_toolbar();
-void cb_open_web_page();
-void cb_open_online_docs();
-void cb_open_online_docs_context();
-void cb_sync_manager();
-void cb_report_bug();
-void cb_donate();
-void cb_connect_to();
-void cb_manage_hosts();
-void cb_connect_host(GtkAction * action);
-void cb_local_computer();
-void cb_act_as_server();
-
-#endif	/* __CALLBACKS_H__ */
diff --git a/includes/computer.h b/includes/computer.h
deleted file mode 100644
index 5a69a171..00000000
--- a/includes/computer.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef __COMPUTER_H__
-#define __COMPUTER_H__
-
-#include "hardinfo.h"
-
-typedef struct _Computer	Computer;
-typedef struct _OperatingSystem	OperatingSystem;
-typedef struct _MemoryInfo	MemoryInfo;
-typedef struct _UptimeInfo	UptimeInfo;
-typedef struct _LoadInfo	LoadInfo;
-typedef struct _DisplayInfo	DisplayInfo;
-
-typedef struct _AlsaInfo	AlsaInfo;
-typedef struct _AlsaCard	AlsaCard;
-
-typedef struct _FileSystem	FileSystem;
-typedef struct _FileSystemEntry	FileSystemEntry;
-
-struct _AlsaCard {
-    gchar *alsa_name;
-    gchar *friendly_name;
-/*  
-  gchar   *board;
-  gchar    revision, compat_class;
-  gint     subsys_vendorid, subsys_id;
-  
-  gint     cap_dac_res, cap_adc_res;
-  gboolean cap_3d_enh;
-  
-  gint     curr_mic_gain;
-  gboolean curr_3d_enh,
-           curr_loudness,
-           curr_simstereo;
-  gchar   *curr_mic_select;
-*/
-};
-
-struct _AlsaInfo {
-    GSList *cards;
-};
-
-struct _DisplayInfo {
-    gchar *ogl_vendor, *ogl_renderer, *ogl_version;
-    gboolean dri;
-    
-    gchar *display_name, *vendor, *version;
-    gchar *extensions;
-    gchar *monitors;
-    
-    gint width, height;
-};
-
-struct _LoadInfo {
-    float load1, load5, load15;
-};
-
-struct _UptimeInfo {
-    int days, hours, minutes;
-};
-
-struct _Computer {
-    MemoryInfo *memory;
-    OperatingSystem *os;
-    DisplayInfo *display;
-    AlsaInfo *alsa;
-
-    gchar *date_time;
-};
-
-struct _OperatingSystem {
-    gchar *kernel;
-    gchar *libc;
-    gchar *distrocode, *distro;
-    gchar *hostname;
-    gchar *language;
-    gchar *homedir;
-    gchar *kernel_version;
-
-    gchar *languages;
-
-    gchar *desktop;
-    gchar *username;
-    
-    gchar *boots;
-
-    gchar *entropy_avail;
-};
-
-struct _MemoryInfo {
-    gint total, used, free, cached;
-    gfloat ratio;
-};
-
-#define get_str(field_name,ptr)               \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = g_strdup(tmp[1]);                   \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-#define get_int(field_name,ptr)               \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = atoi(tmp[1]);                       \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-#define get_float(field_name,ptr)             \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = atof(tmp[1]);                       \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-
-extern gchar *users;
-extern gchar *groups;
-extern gchar *fs_list;
-extern GHashTable *_module_hash_table;
-extern Computer *computer;
-extern gchar *module_list;
-
-gchar *computer_get_formatted_loadavg();
-gchar *computer_get_formatted_uptime();
-gchar *computer_get_alsacards(Computer * computer);
-gchar *computer_get_entropy_avail();
-
-OperatingSystem *computer_get_os(void);
-AlsaInfo *computer_get_alsainfo(void);
-MemoryInfo *computer_get_memory(void);
-UptimeInfo *computer_get_uptime(void);
-DisplayInfo *computer_get_display(void);
-
-void scan_modules_do(void);
-void scan_filesystems(void);
-void scan_users_do(void);
-
-#endif				/* __COMPUTER_H__ */
diff --git a/includes/cpu_util.h b/includes/cpu_util.h
deleted file mode 100644
index c11d3f69..00000000
--- a/includes/cpu_util.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __CPU_UTIL_H__
-#define __CPU_UTIL_H__
-
-#include "hardinfo.h"
-
-#ifndef PROC_CPUINFO
-#define PROC_CPUINFO "/proc/cpuinfo"
-#endif
-
-#define STRIFNULL(f,cs) if (f == NULL) f = g_strdup(cs);
-#define UNKIFNULL(f) STRIFNULL(f, _("(Unknown)") )
-#define EMPIFNULL(f) STRIFNULL(f, "")
-
-const gchar *byte_order_str(void);
-
-/* from /sys/devices/system/cpu/cpu%d/%s */
-gchar* get_cpu_str(const gchar* file, gint cpuid);
-gint get_cpu_int(const char* item, int cpuid, int null_val);
-
-/* space delimted list of flags, finds flag */
-int processor_has_flag(gchar * strflags, gchar * strflag);
-
-typedef struct {
-    gint id;
-    gint cpukhz_max, cpukhz_min, cpukhz_cur;
-    gchar *scaling_driver, *scaling_governor;
-    gint transition_latency;
-    gchar *shared_list;
-} cpufreq_data;
-
-typedef struct {
-    gint id; /* thread */
-    gint socket_id;
-    gint core_id;
-    gint book_id;
-    gint drawer_id;
-} cpu_topology_data;
-
-cpufreq_data *cpufreq_new(gint id);
-void cpufreq_update(cpufreq_data *cpufd, int cur_only);
-void cpufreq_free(cpufreq_data *cpufd);
-
-gchar *cpufreq_section_str(cpufreq_data *cpufd);
-
-cpu_topology_data *cputopo_new(gint id);
-void cputopo_free(cpu_topology_data *cputd);
-
-gchar *cputopo_section_str(cpu_topology_data *cputd);
-
-#endif
diff --git a/includes/devices.h b/includes/devices.h
deleted file mode 100644
index e18a3838..00000000
--- a/includes/devices.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __DEVICES_H__
-#define __DEVICES_H__
-
-#include "hardinfo.h"
-#include "processor-platform.h"
-#include "dmi_util.h"
-
-typedef struct _Processor Processor;
-
-#define WALK_UNTIL(x)   while((*buf != '\0') && (*buf != x)) buf++
-
-#define GET_STR(field_name,ptr)      					\
-  if (!ptr && strstr(tmp[0], field_name)) {				\
-    ptr = g_markup_escape_text(g_strstrip(tmp[1]), strlen(tmp[1]));	\
-    g_strfreev(tmp);                 					\
-    continue;                        					\
-  }
-
-#define get_str(field_name,ptr)               \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = g_strdup(tmp[1]);                   \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-#define get_int(field_name,ptr)               \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = atoi(tmp[1]);                       \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-#define get_float(field_name,ptr)             \
-  if (g_str_has_prefix(tmp[0], field_name)) { \
-    ptr = atof(tmp[1]);                       \
-    g_strfreev(tmp);                          \
-    continue;                                 \
-  }
-
-
-/* Processor */
-GSList *processor_scan(void);
-void get_processor_strfamily(Processor * processor);
-gchar *processor_get_detailed_info(Processor * processor);
-gchar *processor_get_info(GSList * processors);
-gchar *processor_name(GSList * processors);
-gchar *processor_name_default(GSList * processors);
-gchar *processor_describe(GSList * processors);
-gchar *processor_describe_default(GSList * processors);
-gchar *processor_describe_by_counting_names(GSList * processors);
-gchar *processor_frequency_desc(GSList *processors);
-
-/* Memory */
-void init_memory_labels(void);
-void scan_memory_do(void);
-
-/* Printers */
-void init_cups(void);
-
-/* Battery */
-void scan_battery_do(void);
-
-/* PCI */
-void scan_pci_do(void);
-
-/* Printers */
-void scan_printers_do(void);
-
-/* Sensors */
-void scan_sensors_do(void);
-void sensors_init(void);
-void sensors_shutdown(void);
-
-#if defined(ARCH_x86) || defined(ARCH_x86_64)
-/* SPD */
-void scan_spd_do(void);
-#endif /* ARCH_x86 */
-
-extern gchar *battery_list;
-extern gchar *input_icons;
-extern gchar *input_list;
-extern gchar *lginterval;
-extern gchar *meminfo;
-extern gchar *pci_list;
-extern gchar *printer_icons;
-extern gchar *printer_list;
-extern gchar *sensors;
-extern gchar *storage_icons;
-extern gchar *storage_list;
-extern gchar *usb_list;
-extern GHashTable *memlabels;
-extern GHashTable *_pci_devices;
-extern GHashTable *sensor_compute;
-extern GHashTable *sensor_labels;
-extern GModule *cups;
-
-#if defined(ARCH_x86) || defined(ARCH_x86_64)
-extern gchar *spd_info;
-extern gchar *dmi_info;
-#endif
-
-extern gchar *dtree_info;
-
-#endif /* __DEVICES_H__ */
diff --git a/includes/dmi_util.h b/includes/dmi_util.h
deleted file mode 100644
index aecda739..00000000
--- a/includes/dmi_util.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2017 Leandro A. F. Pereira <leandro@hardinfo.org>
- *    This file
- *    Copyright (C) 2017 Burt P. <pburt0@gmail.com>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __DMI_UTIL_H__
-#define __DMI_UTIL_H__
-
-char *dmi_get_str(const char *id_str);
-
-/* if chassis_type is <=0 it will be fetched from DMI.
- * with_val = true, will return a string like "[3] Desktop" instead of just
- * "Desktop". */
-char *dmi_chassis_type_str(int chassis_type, gboolean with_val);
-
-#endif
diff --git a/includes/dt_util.h b/includes/dt_util.h
deleted file mode 100644
index 7ef6808b..00000000
--- a/includes/dt_util.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#ifndef _DT_UTIL_H_
-#define _DT_UTIL_H_
-
-#include <stdint.h>
-
-/* some not-quite-complete stuff that can be disabled */
-#define DTEX_PHREFS 1
-
-#ifndef DTR_ROOT
-#define DTR_ROOT dtr_find_device_tree_root()
-#endif
-
-enum {
-    DT_TYPE_ERR,
-
-    DT_NODE,
-    DTP_UNK,     /* arbitrary-length byte sequence */
-    DTP_EMPTY,   /* empty property */
-    DTP_STR,     /* null-delimited list of strings */
-    DTP_HEX,     /* list of 32-bit values displayed in hex */
-    DTP_UINT,    /* unsigned int list */
-    DTP_INTRUPT, /* interrupt-specifier list */
-    DTP_INTRUPT_EX, /* extended interrupt-specifier list */
-    DTP_OVR,     /* all in /__overrides__ */
-    DTP_PH,      /* phandle */
-    DTP_PH_REF,  /* reference to phandle */
-    DTP_REG,     /* <#address-cells, #size-cells> */
-    DTP_CLOCKS,  /* <phref, #clock-cells> */
-    DTP_GPIOS,   /* <phref, #gpio-cells> */
-    DTP_DMAS,    /* dma-specifier list */
-};
-
-/* simplest, no aliases, doesn't require an existing dt.
- * use dtr_get_prop_str() for complete. */
-char* dtr_get_string(const char *p, int decode);
-
-typedef uint32_t dt_uint; /* big-endian */
-
-typedef struct _dtr dtr;
-typedef struct _dtr_obj dtr_obj;
-
-dtr *dtr_new(const char *base_path); /* NULL for DTR_ROOT */
-void dtr_free(dtr *);
-int dtr_was_found(dtr *);
-const char *dtr_base_path(dtr *);
-char *dtr_messages(dtr *); /* returns a message log */
-
-dtr_obj *dtr_obj_read(dtr *, const char *dtp);
-void dtr_obj_free(dtr_obj *);
-int dtr_obj_type(dtr_obj *);
-char *dtr_obj_alias(dtr_obj *);
-char *dtr_obj_symbol(dtr_obj *);
-char *dtr_obj_path(dtr_obj *);        /* device tree path */
-char *dtr_obj_full_path(dtr_obj *);   /* system path */
-
-/* find property/node 'name' relative to node
- * if node is NULL, then from root */
-dtr_obj *dtr_get_prop_obj(dtr *, dtr_obj *node, const char *name);
-char *dtr_get_prop_str(dtr *, dtr_obj *node, const char *name);
-uint32_t dtr_get_prop_u32(dtr *, dtr_obj *node, const char *name);
-
-/* attempts to render the object as a string */
-char* dtr_str(dtr_obj *obj);
-
-int dtr_guess_type(dtr_obj *obj);
-char *dtr_elem_phref(dtr *, dt_uint e, int show_path);
-char *dtr_elem_hex(dt_uint e);
-char *dtr_elem_byte(uint8_t e);
-char *dtr_elem_uint(dt_uint e);
-char *dtr_list_byte(uint8_t *bytes, unsigned long count);
-char *dtr_list_hex(dt_uint *list, unsigned long count);
-
-int dtr_cellv_find(dtr_obj *obj, char *qprop, int limit);
-
-char *dtr_maps_info(dtr *); /* returns hardinfo shell section */
-
-const char *dtr_find_device_tree_root(void);
-
-/* write to the message log */
-void dtr_msg(dtr *s, char *fmt, ...);
-
-#define sp_sep(STR) (strlen(STR) ? " " : "")
-/* appends an element to a string, adding a space if
- * the string is not empty.
- * ex: ret = appf(ret, "%s=%s\n", name, value); */
-char *appf(char *src, char *fmt, ...);
-
-#endif
diff --git a/includes/egg-markdown.h b/includes/egg-markdown.h
deleted file mode 100644
index 4475b9f0..00000000
--- a/includes/egg-markdown.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2008 Richard Hughes <richard@hughsie.com>
- * Copyright (C) 2009 Leandro Pereira <leandro@hardinfo.org>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EGG_MARKDOWN_H
-#define __EGG_MARKDOWN_H
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_MARKDOWN		(egg_markdown_get_type ())
-#define EGG_MARKDOWN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EGG_TYPE_MARKDOWN, EggMarkdown))
-#define EGG_MARKDOWN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EGG_TYPE_MARKDOWN, EggMarkdownClass))
-#define EGG_IS_MARKDOWN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EGG_TYPE_MARKDOWN))
-#define EGG_IS_MARKDOWN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EGG_TYPE_MARKDOWN))
-#define EGG_MARKDOWN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EGG_TYPE_MARKDOWN, EggMarkdownClass))
-#define EGG_MARKDOWN_ERROR		(egg_markdown_error_quark ())
-#define EGG_MARKDOWN_TYPE_ERROR	(egg_markdown_error_get_type ())
-
-#define EGG_MARKDOWN_MAX_LINE_LENGTH	2048
-
-typedef struct EggMarkdownPrivate EggMarkdownPrivate;
-
-typedef struct
-{
-	 GObject		 parent;
-	 EggMarkdownPrivate	*priv;
-} EggMarkdown;
-
-typedef struct
-{
-	GObjectClass	parent_class;
-	void		(* active_changed)		(EggMarkdown	*self,
-							 gboolean	 active);
-} EggMarkdownClass;
-
-typedef enum {
-	EGG_MARKDOWN_OUTPUT_TEXT,
-	EGG_MARKDOWN_OUTPUT_PANGO,
-	EGG_MARKDOWN_OUTPUT_HTML,
-	EGG_MARKDOWN_OUTPUT_UNKNOWN
-} EggMarkdownOutput;
-
-GType		 egg_markdown_get_type	  		(void);
-EggMarkdown	*egg_markdown_new			(void);
-gboolean	 egg_markdown_set_output		(EggMarkdown		*self,
-							 EggMarkdownOutput	 output);
-gboolean	 egg_markdown_set_max_lines		(EggMarkdown		*self,
-							 gint			 max_lines);
-gboolean	 egg_markdown_set_smart_quoting		(EggMarkdown		*self,
-							 gboolean		 smart_quoting);
-gboolean	 egg_markdown_set_escape		(EggMarkdown		*self,
-							 gboolean		 escape);
-gboolean	 egg_markdown_set_autocode		(EggMarkdown		*self,
-							 gboolean		 autocode);
-gchar		*egg_markdown_parse			(EggMarkdown		*self,
-							 const gchar		*text);
-void		 egg_markdown_clear			(EggMarkdown		*self);
-gchar 		*egg_markdown_get_link_uri		(EggMarkdown		*self,
-                                                         const gint		link_id);
-
-G_END_DECLS
-
-#endif /* __EGG_MARKDOWN_H */
-
diff --git a/includes/expr.h b/includes/expr.h
deleted file mode 100644
index 4bda6b72..00000000
--- a/includes/expr.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef __EXPR_H__
-#define __EXPR_H__
-
-typedef struct _MathToken MathToken;
-
-typedef enum {
-    TOKEN_OPERATOR,
-    TOKEN_VARIABLE,
-    TOKEN_VALUE
-} MathTokenType;
-
-struct _MathToken {
-    union {
-	gfloat	value;
-	gchar	op;
-    } val;
-    MathTokenType type;
-};
-
-#define math_postfix_free math_infix_free
-
-GSList	*math_infix_to_postfix(GSList *infix);
-void	 math_infix_free(GSList *infix, gboolean free_tokens);
-
-GSList	*math_string_to_infix(gchar *string);
-GSList	*math_string_to_postfix(gchar *string);
-
-gfloat	 math_postfix_eval(GSList *postfix, gfloat at_value);
-gfloat	 math_string_eval(gchar *string, gfloat at_value);
-
-#endif	/* __EXPR_H__ */
diff --git a/includes/fftbench.h b/includes/fftbench.h
deleted file mode 100644
index 7c0afc3d..00000000
--- a/includes/fftbench.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __FFTBENCH_H__ 
-#define __FFTBENCH_H__
-
-#include <glib.h>
-
-typedef struct _FFTBench	FFTBench;
-
-struct _FFTBench {
-  double **a, *b, *r;
-  int *p;
-};
-
-FFTBench *fft_bench_new(void);
-void fft_bench_run(FFTBench *fftbench);
-void fft_bench_free(FFTBench *fftbench);
-
-#endif /* __FFTBENCH_H__ */
-
-
diff --git a/includes/gettext.h b/includes/gettext.h
deleted file mode 100644
index fcdb2051..00000000
--- a/includes/gettext.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#ifndef __GETTEXT_H__
-#define __GETTEXT_H__
-
-#include <string.h>
-#include <libintl.h>
-#include <locale.h>
-
-static const char *
-__pgettext_expr (const char *msgctxt, const char *msgid)
-{
-  size_t msgctxt_len = strlen (msgctxt) + 1;
-  size_t msgid_len = strlen (msgid) + 1;
-  const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-  char msg_ctxt_id[msgctxt_len + msgid_len];
-#else
-  char buf[1024];
-  char *msg_ctxt_id =
-    (msgctxt_len + msgid_len <= sizeof (buf)
-     ? buf
-     : (char *) malloc (msgctxt_len + msgid_len));
-  if (msg_ctxt_id != NULL)
-#endif
-    {
-      int found_translation;
-      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-      msg_ctxt_id[msgctxt_len - 1] = '\004';
-      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-      translation = gettext (msg_ctxt_id);
-      found_translation = (translation != msg_ctxt_id);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-      if (msg_ctxt_id != buf)
-        free (msg_ctxt_id);
-#endif
-      if (found_translation)
-        return translation;
-    }
-  return msgid;
-}
-
-#define _(STRING) gettext(STRING)
-#define N_(STRING) (STRING)
-#define C_(CTX, STRING) __pgettext_expr(CTX, STRING)
-#define NC_(CTX, STRING) (STRING)
-
-#endif
diff --git a/includes/guibench.h b/includes/guibench.h
deleted file mode 100644
index d24403bc..00000000
--- a/includes/guibench.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __GUIBENCH_H__
-#define __GUIBENCH_H__
-
-double guibench(void);
-
-#endif	/* __GUIBENCH_H__ */
\ No newline at end of file
diff --git a/includes/hardinfo.h b/includes/hardinfo.h
deleted file mode 100644
index 637aa1fd..00000000
--- a/includes/hardinfo.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __HARDINFO_H__
-#define __HARDINFO_H__
-
-#include <gtk/gtk.h>
-#include "config.h"
-#include "shell.h"
-#include "vendor.h"
-#include "gettext.h"
-#include "info.h"
-
-#define HARDINFO_COPYRIGHT_LATEST_YEAR 2017
-
-#ifndef LOCALEDIR
-#define LOCALEDIR "/usr/share/locale"
-#endif
-
-typedef enum {
-  MODULE_FLAG_NONE = 0,
-  MODULE_FLAG_NO_REMOTE = 1<<0,
-  MODULE_FLAG_HAS_HELP = 1<<1,
-} ModuleEntryFlags;
-
-typedef struct _ModuleEntry		ModuleEntry;
-typedef struct _ModuleAbout		ModuleAbout;
-typedef struct _FileTypes		FileTypes;
-typedef struct _ProgramParameters	ProgramParameters;
-
-struct _ProgramParameters {
-  gboolean create_report;
-  gboolean show_version;
-  gboolean gui_running;
-  gboolean list_modules;
-  gboolean autoload_deps;
-  gboolean run_xmlrpc_server;
-
-  gint     report_format;
-
-  gchar  **use_modules;
-  gchar   *run_benchmark;
-  gchar   *result_format;
-  gchar   *path_lib;
-  gchar   *path_data;
-  gchar   *argv0;
-};
-
-struct _FileTypes {
-  gchar	*name;
-  gchar *mime_type;
-  gchar *extension;
-  gpointer data;
-};
-
-struct _ModuleEntry {
-    gchar	*name;
-    gchar	*icon;
-    gpointer	 callback;
-    gpointer	 scan_callback;
-    guint32	 flags;
-};
-
-struct _ModuleAbout {
-    const gchar *description;
-    const gchar	*author;
-    const gchar	*version;
-    const gchar	*license;
-};
-
-/* String utility functions */
-inline void  remove_quotes(gchar *str);
-inline char *strend(gchar *str, gchar chr);
-inline void  remove_linefeed(gchar *str);
-gchar       *strreplacechr(gchar *string, gchar *replace, gchar new_char);
-gchar       *strreplace(gchar *string, gchar *replace, gchar *replacement);
-
-/* Widget utility functions */
-void widget_set_cursor(GtkWidget *widget, GdkCursorType cursor_type);
-gint tree_view_get_visible_height(GtkTreeView *tv);
-
-/* File Chooser utility functions */
-void      file_chooser_open_expander(GtkWidget *chooser);
-void      file_chooser_add_filters(GtkWidget *chooser, FileTypes *filters);
-gchar    *file_chooser_get_extension(GtkWidget *chooser, FileTypes *filters);
-gchar    *file_chooser_build_filename(GtkWidget *chooser, gchar *extension);
-gpointer  file_types_get_data_by_name(FileTypes *file_types, gchar *name);
-
-/* Misc utility functions */
-#if RELEASE == 1
-gpointer idle_free(gpointer ptr);
-#else
-gpointer __idle_free(gpointer ptr, gchar *f, gint l);
-#define  idle_free(p) __idle_free(p, __FILE__, __LINE__)
-#endif	/* RELEASE == 1 */
-
-gchar	     *find_program(gchar *program_name);
-inline gchar *size_human_readable(gfloat size);
-void          nonblock_sleep(guint msec);
-void          open_url(gchar *url);
-GSList	     *modules_get_list(void);
-GSList	     *modules_load_selected(void);
-GSList       *modules_load_all(void);
-void	      module_unload_all(void);
-ModuleAbout  *module_get_about(ShellModule *module);
-gchar        *seconds_to_string(unsigned int seconds);
-
-gchar        *h_strdup_cprintf(const gchar *format, gchar *source, ...);
-gchar	     *h_strconcat(gchar *string1, ...);
-void          h_hash_table_remove_all (GHashTable *hash_table);
-
-void	      module_entry_scan_all_except(ModuleEntry *entries, gint except_entry);
-void	      module_entry_scan_all(ModuleEntry *entries);
-void	      module_entry_reload(ShellModuleEntry *module_entry);
-void	      module_entry_scan(ShellModuleEntry *module_entry);
-gchar	     *module_entry_function(ShellModuleEntry *module_entry);
-const gchar  *module_entry_get_note(ShellModuleEntry *module_entry);
-gchar        *module_entry_get_field(ShellModuleEntry * module_entry, gchar * field);
-gchar        *module_entry_get_moreinfo(ShellModuleEntry * module_entry, gchar * field);
-
-/* BinReloc stuff */
-gboolean binreloc_init(gboolean try_hardcoded);
-
-/* GTK UI stuff */
-gboolean ui_init(int *argc, char ***argv);
-void     parameters_init(int *argc, char ***argv, ProgramParameters *params);
-extern   ProgramParameters params;
-
-/* Module stuff */
-gchar		*module_call_method(gchar *method);
-gchar           *module_call_method_param(gchar * method, gchar * parameter);
-
-/* Sysfs stuff */
-gfloat		h_sysfs_read_float(gchar *endpoint, gchar *entry);
-gint		h_sysfs_read_int(gchar *endpoint, gchar *entry);
-gchar	       *h_sysfs_read_string(gchar *endpoint, gchar *entry);
-
-#define SCAN_START()  static gboolean scanned = FALSE; if (reload) scanned = FALSE; if (scanned) return;
-#define SCAN_END()    scanned = TRUE;
-
-#define _CONCAT(a,b) a ## b
-#define CONCAT(a,b) _CONCAT(a,b)
-
-void moreinfo_init(void);
-void moreinfo_shutdown(void);
-void moreinfo_add_with_prefix(gchar *prefix, gchar *key, gchar *value);
-void moreinfo_add(gchar *key, gchar *value);
-void moreinfo_del_with_prefix(gchar *prefix);
-void moreinfo_clear(void);
-gchar *moreinfo_lookup_with_prefix(gchar *prefix, gchar *key);
-gchar *moreinfo_lookup(gchar *key);
-
-#if !GLIB_CHECK_VERSION(2,44,0)
-    /* g_strv_contains() requires glib>2.44
-     * fallback for older versions in hardinfo/util.c */
-gboolean g_strv_contains(const gchar * const * strv, const gchar *str);
-#endif
-
-/* Hardinfo labels that have # are truncated and/or hidden.
- * Labels can't have $ because that is the delimiter in
- * moreinfo.
- * replacing = true will free v */
-gchar *hardinfo_clean_label(const gchar *v, int replacing);
-/* hardinfo uses the values as {ht,x}ml, apparently */
-gchar *hardinfo_clean_value(const gchar *v, int replacing);
-
-#endif				/* __HARDINFO_H__ */
diff --git a/includes/help-viewer.h b/includes/help-viewer.h
deleted file mode 100644
index 688ff325..00000000
--- a/includes/help-viewer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *    HelpViewer - Simple Help file browser
- *    Copyright (C) 2009 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __HELP_VIEWER_H__
-#define __HELP_VIEWER_H__
-
-typedef struct _HelpViewer	HelpViewer;
-
-struct _HelpViewer {
-    GtkWidget *window;
-    GtkWidget *status_bar;
-    
-    GtkWidget *btn_back, *btn_forward;
-    GtkWidget *text_view;
-    GtkWidget *text_search;
-    
-    gchar *current_file;
-    gchar *help_directory;
-
-    GSList *back_stack, *forward_stack;
-};
-
-HelpViewer *help_viewer_new(const gchar *help_dir, const gchar *help_file);
-void help_viewer_open_page(HelpViewer *help_viewer, const gchar *page);
-void help_viewer_destroy(HelpViewer *help_viewer);
-
-#endif	/* __HELP_VIEWER_H__ */
-
diff --git a/includes/ia64/processor-platform.h b/includes/ia64/processor-platform.h
deleted file mode 100644
index 5d525639..00000000
--- a/includes/ia64/processor-platform.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *model_name;
-    gchar *vendor_id;
-    gfloat bogomips;
-    gchar *strmodel;
-
-    gchar *family, *arch, *archrev, *features;
-    gint model, revision;
-    gint cpu_regs;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/iconcache.h b/includes/iconcache.h
deleted file mode 100644
index 97f59a82..00000000
--- a/includes/iconcache.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __ICONCACHE_H__
-#define __ICONCACHE_H__
-
-#include <gtk/gtk.h>
-
-void		 icon_cache_init(void);
-GdkPixbuf	*icon_cache_get_pixbuf(const gchar *file);
-GtkWidget	*icon_cache_get_image(const gchar *file);
-GdkPixbuf	*icon_cache_get_pixbuf_at_size(const gchar *file, gint wid, gint hei);
-GtkWidget	*icon_cache_get_image_at_size(const gchar *file, gint wid, gint hei);
-
-#endif	/* __ICONCACHE_H__ */
diff --git a/includes/info.h b/includes/info.h
deleted file mode 100644
index 253c06e0..00000000
--- a/includes/info.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2017 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#pragma once
-
-#include <glib.h>
-
-struct Info {
-    GArray *groups;
-
-    const gchar *column_titles[5];
-
-    ShellViewType view_type;
-
-    int reload_interval;
-
-    gboolean column_headers_visible;
-    gboolean zebra_visible;
-    gboolean normalize_percentage;
-};
-
-struct InfoGroup {
-    const gchar *name;
-
-    GArray *fields;
-
-     /* scaffolding fields */
-    const gchar *computed;
-};
-
-struct InfoField {
-    const gchar *name;
-    gchar *value;
-
-    int update_interval;
-
-    gboolean free_value_on_flatten;
-};
-
-struct Info *info_new(void);
-
-void info_add_group(struct Info *info, const gchar *group_name, ...);
-void info_add_computed_group(struct Info *info, const gchar *name, const gchar *value);
-
-struct InfoField info_field(const gchar *name, gchar *value);
-struct InfoField info_field_printf(const gchar *name, const gchar *format, ...)
-    __attribute__((format(printf, 2, 3)));
-struct InfoField info_field_update(const gchar *name, int update_interval);
-struct InfoField info_field_last(void);
-
-void info_set_column_title(struct Info *info, const gchar *column, const gchar *title);
-void info_set_column_headers_visible(struct Info *info, gboolean setting);
-void info_set_zebra_visible(struct Info *info, gboolean setting);
-void info_set_normalize_percentage(struct Info *info, gboolean setting);
-void info_set_view_type(struct Info *info, ShellViewType setting);
-void info_set_reload_interval(struct Info *info, int setting);
-
-gchar *info_flatten(struct Info *info);
diff --git a/includes/loadgraph.h b/includes/loadgraph.h
deleted file mode 100644
index d79ca39b..00000000
--- a/includes/loadgraph.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Simple Load Graph
- * Copyright (C) 2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- * The Simple Load Graph is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License, version 2.1, as published by the Free Software Foundation.
- *
- * The Simple Load Graph 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the Simple Load Graph; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- */
-
-
-#ifndef __LOADGRAPH_H__
-#define __LOADGRAPH_H__
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-typedef struct _LoadGraph LoadGraph;
-
-typedef enum {
-    LG_COLOR_GREEN = 0x4FB05A,
-    LG_COLOR_BLUE  = 0x4F58B0,
-    LG_COLOR_RED   = 0xB04F4F
-} LoadGraphColor;
-
-LoadGraph   *load_graph_new(gint size);
-void         load_graph_destroy(LoadGraph *lg);
-void         load_graph_configure_expose(LoadGraph *lg);
-GtkWidget   *load_graph_get_framed(LoadGraph *lg);
-
-void         load_graph_update(LoadGraph *lg, gdouble value);
-void         load_graph_update_ex(LoadGraph *lg, guint line, gdouble value);
-
-void         load_graph_set_color(LoadGraph *lg, LoadGraphColor color);
-void         load_graph_clear(LoadGraph *lg);
-
-void         load_graph_set_data_suffix(LoadGraph *lg, gchar *suffix);
-gchar       *load_graph_get_data_suffix(LoadGraph *lg);
-
-gint         load_graph_get_height(LoadGraph *lg);
-
-#endif  /* __LOADGRAPH_H__ */
diff --git a/includes/m68k/processor-platform.h b/includes/m68k/processor-platform.h
deleted file mode 100644
index 9aea1dfe..00000000
--- a/includes/m68k/processor-platform.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-struct _Processor {
-    gchar *model_name;
-    gfloat bogomips, cpu_mhz;
-
-    gchar *fpu_name, *mmu_name, *calibration;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/markdown-text-view.h b/includes/markdown-text-view.h
deleted file mode 100644
index 648ea39c..00000000
--- a/includes/markdown-text-view.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Markdown Text View
- * GtkTextView subclass that supports Markdown syntax
- *
- * Copyright (C) 2009 Leandro Pereira <leandro@hardinfo.org>
- * Portions Copyright (C) 2007-2008 Richard Hughes <richard@hughsie.com>
- * Portions Copyright (C) GTK+ Team (based on hypertext textview demo)
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-#ifndef __MARKDOWN_TEXTVIEW_H__
-#define __MARKDOWN_TEXTVIEW_H__
-
-#include <gtk/gtk.h>
-#include "egg-markdown.h"
-
-G_BEGIN_DECLS
-#define TYPE_MARKDOWN_TEXTVIEW			(markdown_textview_get_type())
-#define MARKDOWN_TEXTVIEW(obj)			(G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_MARKDOWN_TEXTVIEW, MarkdownTextView))
-#define MARKDOWN_TEXTVIEW_CLASS(obj)		(G_TYPE_CHECK_CLASS_CAST((obj), MARKDOWN_TEXTVIEW, MarkdownTextViewClass))
-#define IS_MARKDOWN_TEXTVIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_MARKDOWN_TEXTVIEW))
-#define IS_MARKDOWN_TEXTVIEW_CLASS(obj)		(G_TYPE_CHECK_CLASS_TYPE((obj), TYPE_MARKDOWN_TEXTVIEW))
-#define MARKDOWN_TEXTVIEW_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_MARKDOWN_TEXTVIEW, MarkdownTextViewClass))
-
-typedef struct _MarkdownTextView MarkdownTextView;
-typedef struct _MarkdownTextViewClass MarkdownTextViewClass;
-
-struct _MarkdownTextView {
-    GtkTextView parent;
-
-    EggMarkdown *markdown;
-    gboolean hovering_over_link;
-    gchar *image_directory;
-};
-
-struct _MarkdownTextViewClass {
-    GtkTextViewClass parent_class;
-    
-    void	(*link_clicked)		(MarkdownTextView *text_view, gchar *uri);
-    void	(*hovering_over_link)	(MarkdownTextView *text_view, gchar *uri);
-    void	(*hovering_over_text)	(MarkdownTextView *text_view);
-    void	(*file_load_complete)	(MarkdownTextView *text_view, gchar *file);
-};
-
-GtkWidget	*markdown_textview_new();
-gboolean	 markdown_textview_load_file(MarkdownTextView * textview,
-		  	                     const gchar * file_name);
-gboolean 	 markdown_textview_set_text(MarkdownTextView * textview,
-                                            const gchar * text);
-void		 markdown_textview_clear(MarkdownTextView * textview);
-void		 markdown_textview_set_image_directory(MarkdownTextView * self,
-                                                       const gchar * directory);
-GType		 markdown_textview_get_type();
-G_END_DECLS
-
-#endif				/* __MARKDOWN_TEXTVIEW_H__ */
diff --git a/includes/md5.h b/includes/md5.h
deleted file mode 100644
index 1522170c..00000000
--- a/includes/md5.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* See md5.c for explanation and copyright information.  */
-
-#ifndef MD5_H
-#define MD5_H
-
-/* Unlike previous versions of this code, uint32 need not be exactly
-   32 bits, merely 32 bits or more.  Choosing a data type which is 32
-   bits instead of 64 is not important; speed is considerably more
-   important.  ANSI guarantees that "unsigned long" will be big enough,
-   and always using it seems to have few disadvantages.  */
-typedef unsigned long uint32;
-
-struct MD5Context {
-        uint32 buf[4];
-        uint32 bits[2];
-        unsigned char in[64];
-};
-
-void MD5Init (struct MD5Context *context);
-void MD5Update (struct MD5Context *context,
-                           unsigned char const *buf, unsigned len);
-void MD5Final (unsigned char digest[16],
-                          struct MD5Context *context);
-void MD5Transform (uint32 buf[4], const unsigned char in[64]);
-
-#endif /* !MD5_H */
diff --git a/includes/menu.h b/includes/menu.h
deleted file mode 100644
index 3c804008..00000000
--- a/includes/menu.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef __MENU_H__
-#define __MENU_H__
-
-#include <shell.h>
-
-
-void	menu_init(Shell *shell);
-
-#endif	/* __MENU_H__ */
diff --git a/includes/mips/processor-platform.h b/includes/mips/processor-platform.h
deleted file mode 100644
index 9bdae18b..00000000
--- a/includes/mips/processor-platform.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-struct _Processor {
-    gchar *model_name;
-    gchar *vendor_id;
-    gfloat bogomips, cpu_mhz;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/network.h b/includes/network.h
deleted file mode 100644
index 1e71126e..00000000
--- a/includes/network.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __NETWORK_H__
-#define __NETWORK_H__
-
-#include "hardinfo.h"
-
-extern gchar *smb_shares_list;
-extern gchar *nfs_shares_list;
-extern gchar *network_interfaces;
-extern gchar *network_icons;
-
-void scan_net_interfaces(void);
-
-#endif /* __NETWORK_H__ */
\ No newline at end of file
diff --git a/includes/nqueens.h b/includes/nqueens.h
deleted file mode 100644
index a4be93f0..00000000
--- a/includes/nqueens.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * N-Queens Problem Solver
- * Found somewhere on the Internet; can't remember where. Possibly Wikipedia.
- */
-#ifndef __NQUEENS_H__ 
-#define __NQUEENS_H__
-
-int nqueens(int y);
-
-
-#endif /* __NQUEENS_H__ */
-
-
diff --git a/includes/parisc/processor-platform.h b/includes/parisc/processor-platform.h
deleted file mode 100644
index c55c69ec..00000000
--- a/includes/parisc/processor-platform.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *model_name;
-    gchar *vendor_id;
-    gchar *flags;
-    gfloat bogomips;
-    gchar *has_fpu;
-    gchar *strmodel;
-
-    gchar *cpu_family;
-    gchar *icache_str, *dcache_str;
-    gchar *hversion, *sversion;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/ppc/processor-platform.h b/includes/ppc/processor-platform.h
deleted file mode 100644
index d3d1a568..00000000
--- a/includes/ppc/processor-platform.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *model_name;
-    gchar *revision;
-    /* gint cache_size; */
-    gfloat bogomips;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/remote.h b/includes/remote.h
deleted file mode 100644
index 6a988a3b..00000000
--- a/includes/remote.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *    Remote Client
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __REMOTE_H__
-#define __REMOTE_H__
-
-void remote_disconnect_all(gboolean ssh);
-gboolean remote_connect_host(gchar * hostname);
-void connect_dialog_show(GtkWidget * parent);
-void host_manager_show(GtkWidget * parent);
-
-#endif	/* __REMOTE_H__ */
-
diff --git a/includes/report.h b/includes/report.h
deleted file mode 100644
index 782621cb..00000000
--- a/includes/report.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
- 
-#ifndef __REPORT_H__
-#define __REPORT_H__
-#include <gtk/gtk.h>
-#include <shell.h>
-
-typedef enum {
-    REPORT_FORMAT_HTML,
-    REPORT_FORMAT_TEXT,
-    N_REPORT_FORMAT
-} ReportFormat;
-
-typedef enum {
-    REPORT_COL_PROGRESS = 1<<0,
-    REPORT_COL_VALUE    = 1<<1,
-    REPORT_COL_EXTRA1   = 1<<2,
-    REPORT_COL_EXTRA2   = 1<<3,
-    REPORT_COL_TEXTVALUE= 1<<4
-} ReportColumn;
-
-typedef struct _ReportDialog	ReportDialog;
-typedef struct _ReportContext	ReportContext;
-
-struct _ReportContext {
-  ShellModuleEntry	*entry;
-  gchar			*output;
-  
-  void (*header)      	(ReportContext *ctx);
-  void (*footer)      	(ReportContext *ctx);
-  void (*title)      	(ReportContext *ctx, gchar *text);
-  void (*subtitle)    	(ReportContext *ctx, gchar *text);
-  void (*subsubtitle)	(ReportContext *ctx, gchar *text);
-  void (*keyvalue)   	(ReportContext *ctx, gchar *key, gchar *value);
-  
-  ReportFormat		format;
-  
-  gboolean		is_image_enabled;
-  gboolean		first_table;
-
-  gboolean		show_column_headers;
-  guint			columns;
-  GHashTable		*column_titles;
-};
-
-struct _ReportDialog {
-  GtkWidget *dialog;
-  GtkWidget *filechooser;
-  GtkWidget *btn_cancel;
-  GtkWidget *btn_generate;
-  GtkWidget *btn_sel_all;
-  GtkWidget *btn_sel_none;
-  GtkWidget *treeview;
-  
-  GtkTreeModel *model;
-};
-
-void		 report_dialog_show();
-
-ReportContext	*report_context_html_new();
-ReportContext	*report_context_text_new();
-
-void		 report_header		(ReportContext *ctx);
-void		 report_footer		(ReportContext *ctx);
-void		 report_title		(ReportContext *ctx, gchar *text);
-void 		 report_subtitle	(ReportContext *ctx, gchar *text);
-void 		 report_subsubtitle	(ReportContext *ctx, gchar *text);
-void		 report_key_value	(ReportContext *ctx, gchar *key, gchar *value);
-void		 report_table		(ReportContext *ctx, gchar *text);
-
-void             report_create_from_module_list(ReportContext *ctx, GSList *modules);
-gchar           *report_create_from_module_list_format(GSList *modules, ReportFormat format);
-
-void		 report_context_free(ReportContext *ctx);
-void             report_module_list_free(GSList *modules);
-
-#endif	/* __REPORT_H__ */
diff --git a/includes/riscv/processor-platform.h b/includes/riscv/processor-platform.h
deleted file mode 100644
index 07cbf86e..00000000
--- a/includes/riscv/processor-platform.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gint id; /* hart */
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *model_name;
-    gchar *mmu, *isa, *uarch;
-    gchar *flags; /* expanded from isa */
-    gfloat bogomips; /* not used */
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/s390/processor-platform.h b/includes/s390/processor-platform.h
deleted file mode 100644
index 9164a7f2..00000000
--- a/includes/s390/processor-platform.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-struct _Processor {
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *model_name; /* vendor_id */
-    gchar *proc_str;
-    gfloat bogomips;
-
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/sh/processor-platform.h b/includes/sh/processor-platform.h
deleted file mode 100644
index 26b58ec5..00000000
--- a/includes/sh/processor-platform.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-struct _Processor {
-    gchar *model_name;
-    gchar *vendor_id;
-    gfloat bogomips, cpu_mhz;
-
-    gfloat bus_mhz, mod_mhz;
-
-    gchar *family;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/sha1.h b/includes/sha1.h
deleted file mode 100644
index 573ff8ac..00000000
--- a/includes/sha1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- */
-
-#ifndef __SHA1_H__
-#define __SHA1_H__
-
-#include <glib.h>
-
-#ifndef LITTLE_ENDIAN
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define LITTLE_ENDIAN		/* This should be #define'd if true. */
-#endif /* G_BYTE_ORDER */
-#endif /* LITTLE_ENDIAN */
-
-
-typedef struct {
-    guint32 state[5];
-    guint32 count[2];
-    guchar buffer[64];
-} SHA1_CTX;
-
-void SHA1Transform(guint32 state[5], guchar buffer[64]);
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, guchar* data, unsigned int len);
-void SHA1Final(guchar digest[20], SHA1_CTX* context);
-
-#endif	/* __SHA1_H__ */
diff --git a/includes/shell.h b/includes/shell.h
deleted file mode 100644
index 2eb9e6d2..00000000
--- a/includes/shell.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef __SHELL_H__
-#define __SHELL_H__
-
-#include <gtk/gtk.h>
-
-#include "loadgraph.h"
-#include "help-viewer.h"
-
-typedef struct _Shell			Shell;
-typedef struct _ShellTree		ShellTree;
-typedef struct _ShellInfoTree		ShellInfoTree;
-typedef struct _ShellNote		ShellNote;
-typedef struct _ShellSummary		ShellSummary;
-
-typedef struct _ShellModule		ShellModule;
-typedef struct _ShellModuleMethod	ShellModuleMethod;
-typedef struct _ShellModuleEntry	ShellModuleEntry;
-
-typedef struct _ShellFieldUpdate	ShellFieldUpdate;
-typedef struct _ShellFieldUpdateSource	ShellFieldUpdateSource;
-
-typedef enum {
-    SHELL_ORDER_DESCENDING,
-    SHELL_ORDER_ASCENDING,
-} ShellOrderType;
-
-typedef enum {
-    SHELL_PACK_RESIZE = 1 << 0,
-    SHELL_PACK_SHRINK = 1 << 1
-} ShellPackOptions;
-
-typedef enum {
-    SHELL_VIEW_NORMAL,
-    SHELL_VIEW_DUAL,
-    SHELL_VIEW_LOAD_GRAPH,
-    SHELL_VIEW_PROGRESS,
-    SHELL_VIEW_PROGRESS_DUAL,
-    SHELL_VIEW_SUMMARY,
-    SHELL_VIEW_N_VIEWS
-} ShellViewType;
-
-typedef enum {
-    TREE_COL_PBUF,
-    TREE_COL_NAME,
-    TREE_COL_MODULE_ENTRY,
-    TREE_COL_MODULE,
-    TREE_COL_SEL,
-    TREE_NCOL
-} ShellTreeColumns;
-
-typedef enum {
-    INFO_TREE_COL_NAME,
-    INFO_TREE_COL_VALUE,
-    INFO_TREE_COL_DATA,
-    INFO_TREE_COL_PBUF,
-    INFO_TREE_COL_PROGRESS,
-    INFO_TREE_COL_EXTRA1,
-    INFO_TREE_COL_EXTRA2,
-    INFO_TREE_NCOL
-} ShellInfoTreeColumns;
-
-struct _Shell {
-    GtkWidget		*window, *vbox;
-    GtkWidget		*status, *progress;
-    GtkWidget		*remote_label;
-    GtkWidget		*notebook;
-    GtkWidget		*hpaned, *vpaned;
-
-    ShellTree		*tree;
-    ShellInfoTree	*info, *moreinfo;
-    ShellModule		*selected_module;
-    ShellModuleEntry	*selected;
-    ShellNote		*note;
-    ShellSummary	*summary;
-    LoadGraph		*loadgraph;
-
-    GtkActionGroup	*action_group;
-    GtkUIManager	*ui_manager;
-    GSList		*merge_ids;
-
-    ShellViewType	 view_type;
-    gboolean		 normalize_percentage;
-    
-    gint		_pulses;
-    ShellOrderType	_order_type;
-    
-    GKeyFile		*hosts;
-    HelpViewer		*help_viewer;
-};
-
-struct _ShellSummary {
-    GtkWidget		*header;
-    GtkWidget		*scroll;
-    GtkWidget		*view;
-    
-    GSList		*items;
-};
-
-struct _ShellTree {
-    GtkWidget		*scroll;
-    GtkWidget		*view;
-    GtkTreeModel	*model;
-    GtkTreeSelection	*selection;
-
-    GSList		*modules;
-};
-
-struct _ShellInfoTree {
-    GtkWidget		*scroll;
-    GtkWidget		*view;
-    GtkTreeModel        *model;
-    GtkTreeSelection	*selection;
-    
-    GtkTreeViewColumn	 *col_progress, *col_value, *col_extra1, *col_extra2, *col_textvalue;
-};
-
-struct _ShellNote {
-    GtkWidget		*event_box;
-    GtkWidget		*label;
-};
-
-struct _ShellModule {
-    gchar		*name;
-    GdkPixbuf		*icon;
-    GModule		*dll;
-
-    gpointer		(*aboutfunc) ();
-    gchar		*(*summaryfunc) ();
-    void		(*deinit) ();
-    
-    guchar		 weight;
-
-    GSList		*entries;
-};
-
-struct _ShellModuleMethod {
-    gchar	*name;
-    gpointer	function;
-};
-
-struct _ShellModuleEntry {
-    gchar		*name;
-    GdkPixbuf		*icon;
-    gchar		*icon_file;
-    gboolean		 selected;
-    gint		 number;
-    guint32		 flags;
-    
-    gchar		*(*func) ();
-    void		(*scan_func) ();
-
-    gchar		*(*fieldfunc) (gchar * entry);
-    gchar 		*(*morefunc)  (gchar * entry);
-    gchar		*(*notefunc)  (gint entry);
-};
-
-struct _ShellFieldUpdate {
-    ShellModuleEntry	*entry;
-    gchar		*field_name;
-};
-
-struct _ShellFieldUpdateSource {
-    guint		 source_id;
-    ShellFieldUpdate	*sfu;
-};
-
-void		shell_init(GSList *modules);
-void		shell_do_reload(void);
-
-Shell	       *shell_get_main_shell();
-
-void		shell_action_set_enabled(const gchar *action_name,
-                                         gboolean setting);
-gboolean	shell_action_get_enabled(const gchar *action_name);
-gboolean	shell_action_get_active(const gchar *action_name);
-void		shell_action_set_active(const gchar *action_name,
-                                        gboolean setting);
-void		shell_action_set_property(const gchar *action_name,
-                                          const gchar *property,
-                                          gboolean setting);
-
-void		shell_set_side_pane_visible(gboolean setting);
-void		shell_set_note_from_entry(ShellModuleEntry *entry);
-void		shell_ui_manager_set_visible(const gchar *path,
-                                             gboolean setting);
-
-void		shell_status_update(const gchar *message);
-void		shell_status_pulse(void);
-void		shell_status_set_percentage(gint percentage);
-void		shell_status_set_enabled(gboolean setting);
-
-void		shell_view_set_enabled(gboolean setting);
-
-void		shell_clear_timeouts(Shell *shell);
-void		shell_clear_tree_models(Shell *shell);
-void		shell_clear_field_updates(void);
-void		shell_set_title(Shell *shell, char *subtitle);
-
-void		shell_add_modules_to_gui(gpointer _shell_module, gpointer _shell_tree);
-
-void		shell_save_hosts_file(void);
-void		shell_update_remote_menu(void);
-
-void		shell_set_remote_label(Shell *shell, gchar *label);
-
-#endif				/* __SHELL_H__ */
-
-
diff --git a/includes/socket.h b/includes/socket.h
deleted file mode 100644
index 7c44837e..00000000
--- a/includes/socket.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __HI_SOCKET_H__
-#define __HI_SOCKET_H__
-
-typedef struct _Socket	Socket;
-
-struct _Socket {
-  gint   sock;
-};
-
-Socket *sock_connect(gchar * host, gint port);
-int	sock_write(Socket * s, gchar * str);
-int	sock_read(Socket * s, gchar * buffer, gint size);
-void	sock_close(Socket * s);
-
-int	sock_ready_to_read(Socket *s);
-int	sock_ready_to_write(Socket *s);
-
-#endif	/* __HI_SOCKET_H__ */
diff --git a/includes/sparc/processor-platform.h b/includes/sparc/processor-platform.h
deleted file mode 100644
index 31748a5b..00000000
--- a/includes/sparc/processor-platform.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-struct _Processor {
-    gchar *model_name;
-    gchar *has_fpu;
-    gfloat cpu_mhz;
-    gchar *cpucaps;
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/ssh-conn.h b/includes/ssh-conn.h
deleted file mode 100644
index b1b0a9ca..00000000
--- a/includes/ssh-conn.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 
-   Remote Client
-   HardInfo - Displays System Information
-   Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
-
-   Based on ssh-method.c from GnomeVFS
-   Copyright (C) 1999 Free Software Foundation
-   Original author: Ian McKellar <yakk@yakk.net>
-
-   The Gnome 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 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 Gnome 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.
-*/
-#ifndef __SSH_CONN_H__
-#define __SSH_CONN_H__
-
-#include "config.h"
-#ifdef HAS_LIBSOUP
-#include <libsoup/soup.h>
-
-typedef struct _SSHConn SSHConn;
-
-typedef enum {
-    SSH_CONN_OK,
-    SSH_CONN_NO_URI,
-    SSH_CONN_UNKNOWN_PROTOCOL,
-    SSH_CONN_UNKNOWN_ERROR,
-    SSH_CONN_CANNOT_SPAWN_SSH,
-    SSH_CONN_BAD_PARAMS,
-    SSH_CONN_PERMISSION_DENIED,
-    SSH_CONN_HOST_KEY_CHECK_FAIL,
-    SSH_CONN_REFUSED,
-    SSH_CONN_INVALID_USER_PASS,
-} SSHConnResponse;
-
-struct _SSHConn {
-    SoupURI *uri;
-    int fd_read, fd_write, fd_error;
-    GPid pid;
-    gchar *askpass_path;
-    
-    gint exit_status;
-};
-
-SSHConnResponse ssh_new(SoupURI * uri,
-			SSHConn ** conn_return, gchar * command);
-void ssh_close(SSHConn * conn);
-
-int ssh_write(SSHConn * conn,
-	      gconstpointer buffer, gint num_bytes, gint * bytes_written);
-int ssh_read(gint fd, gpointer buffer, gint num_bytes, gint * bytes_read);
-
-const char *ssh_conn_errors[10];
-#endif				/* HAS_LIBSOUP */
-#endif				/* __SSH_CONN_H__ */
diff --git a/includes/stock.h b/includes/stock.h
deleted file mode 100644
index 706e5c51..00000000
--- a/includes/stock.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __STOCK_H__
-#define __STOCK_H__
-
-#define HI_STOCK_REPORT		"hi-stock-report"
-#define HI_STOCK_INTERNET	"hi-stock-internet"
-#define HI_STOCK_MODULE		"hi-stock-module"
-#define HI_STOCK_ABOUT_MODULES	"hi-stock-about-modules"
-#define HI_STOCK_SYNC_MENU	"hi-stock-sync-menu"
-#define HI_STOCK_DONATE		"hi-stock-donate"
-#define HI_STOCK_SERVER		"hi-stock-server"
-
-void stock_icons_init(void);
-void stock_icon_register(gchar *filename, gchar *stock_id);
-void stock_icon_register_pixbuf(GdkPixbuf *pixbuf, gchar *stock_id);
-
-#endif	/* __STOCK_H__ */
diff --git a/includes/syncmanager.h b/includes/syncmanager.h
deleted file mode 100644
index ae0ed267..00000000
--- a/includes/syncmanager.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __SYNCMANAGER_H__
-#define __SYNCMANAGER_H__
-
-#include <gtk/gtk.h>
-
-typedef struct _SyncEntry	SyncEntry;
-
-struct _SyncEntry {
-  gchar *name;
-  gchar	*fancy_name;
-  gchar	*save_to;
-
-  gchar	*(*get_data)(void);
-  void   (*callback)(SyncEntry *entry, const gchar *response);
-  
-  gboolean selected;
-};
-
-void sync_manager_add_entry(SyncEntry *entry);
-void sync_manager_clear_entries(void);
-void sync_manager_show(GtkWidget *parent);
-gint sync_manager_count_entries(void);
-
-#endif	/* __SYNCMANAGER_H__ */
diff --git a/includes/test-utils.h b/includes/test-utils.h
deleted file mode 100644
index 21cac6b5..00000000
--- a/includes/test-utils.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "libsoup/soup-types.h"
-
-void test_init    (int argc, char **argv, GOptionEntry *entries);
-void test_cleanup (void);
-
-extern int debug_level, errors;
-extern gboolean expect_warning;
-void debug_printf (int level, const char *format, ...) G_GNUC_PRINTF (2, 3);
-
-#ifdef HAVE_APACHE
-void apache_init    (void);
-void apache_cleanup (void);
-#endif
-
-SoupSession *soup_test_session_new         (GType type, ...);
-void         soup_test_session_abort_unref (SoupSession *session);
-
-SoupServer  *soup_test_server_new     (gboolean in_own_thread);
-SoupServer  *soup_test_server_new_ssl (gboolean in_own_thread);
-
diff --git a/includes/uidefs.h b/includes/uidefs.h
deleted file mode 100644
index 70d2de17..00000000
--- a/includes/uidefs.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __UIDEFS_H__
-#define __UIDEFS_H__
-
-#include "config.h"
-
-#if RELEASE
-#define DEBUG_TOOLBAR_ITEMS
-#else 		/* !RELEASE */
-#define DEBUG_TOOLBAR_ITEMS	"<separator/>" \
-                                "<toolitem name=\"ReportBug\" action=\"ReportBugAction\" />"
-#endif		/* !RELEASE */
-
-#ifdef HAS_LIBSOUP
-#define SYNC_MANAGER_ITEMS "		<separator/>" \
-"		<menuitem name=\"SyncManager\" action=\"SyncManagerAction\" />"
-
-#else		/* !HAS_LIBSOUP */
-#define SYNC_MANAGER_ITEMS
-#endif		/* !HAS_LIBSOUP */
-
-char *uidefs_str = "<ui>" \
-"	<menubar>" \
-"	<menu name=\"InformationMenu\" action=\"InformationMenuAction\">" \
-"		<menuitem name=\"Report\" action=\"ReportAction\" />" \
-"		<menuitem name=\"Copy\" action=\"CopyAction\" />" \
-SYNC_MANAGER_ITEMS
-"		<separator/>" \
-"		<menuitem name=\"Quit\" action=\"QuitAction\" />" \
-"	</menu>" \
-"	<menu name=\"ViewMenu\" action=\"ViewMenuAction\">" \
-"		<menuitem name=\"SidePane\" action=\"SidePaneAction\"/>" \
-"		<menuitem name=\"Toolbar\" action=\"ToolbarAction\"/>" \
-"		<separator/>"\
-"		<separator name=\"LastSep\"/>" \
-"		<menuitem name=\"Refresh\" action=\"RefreshAction\"/>" \
-"	</menu>" \
-"	<menu name=\"HelpMenu\" action=\"HelpMenuAction\">" \
-"		<menuitem name=\"WebPage\" action=\"HomePageAction\"/>" \
-"		<menuitem name=\"ReportBug\" action=\"ReportBugAction\"/>" \
-"		<separator/>" \
-"		<menu name=\"HelpMenuModules\" action=\"HelpMenuModulesAction\">" \
-"			<separator name=\"LastSep\"/>" \
-"		</menu>" \
-"		<menuitem name=\"About\" action=\"AboutAction\"/>" \
-"	</menu>" \
-"	</menubar>" \
-"	<toolbar action=\"MainMenuBar\" action=\"MainMenuBarAction\">" \
-"		<placeholder name=\"ToolItems\">" \
-"			<toolitem name=\"Refresh\" action=\"RefreshAction\"/>" \
-"			<separator/>" \
-"			<toolitem name=\"Report\" action=\"ReportAction\"/>" \
-"			<toolitem name=\"Copy\" action=\"CopyAction\"/>" \
-"			<separator/>" \
-DEBUG_TOOLBAR_ITEMS \
-"		</placeholder>" \
-"	</toolbar>" \
-"</ui>";
-
-#endif	/* __UIDEFS_H__ */
diff --git a/includes/vendor.h b/includes/vendor.h
deleted file mode 100644
index 778e2ea3..00000000
--- a/includes/vendor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2007 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __VENDOR_H__
-#define __VENDOR_H__
-
-typedef struct _Vendor	Vendor;
-struct _Vendor {
-  char *id;
-  char *name;
-  char *url;
-};
-
-void  vendor_init(void);
-const gchar *vendor_get_name(const gchar *id);
-const gchar *vendor_get_url(const gchar *id);
-
-#endif	/* __VENDOR_H__ */
diff --git a/includes/x86/processor-platform.h b/includes/x86/processor-platform.h
deleted file mode 100644
index a89a831f..00000000
--- a/includes/x86/processor-platform.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __PROCESSOR_PLATFORM_H__
-#define __PROCESSOR_PLATFORM_H__
-
-#include "cpu_util.h"
-
-typedef struct _ProcessorCache ProcessorCache;
-
-struct _ProcessorCache {
-    gint level;
-    gint number_of_sets;
-    gint physical_line_partition;
-    gint size;
-    gchar *type;
-    gint ways_of_associativity;
-    gint uid; /* uid is unique among caches with the same (type, level) */
-    gchar *shared_cpu_list; /* some kernel's don't give a uid, so try shared_cpu_list */
-    gint phy_sock;
-};
-
-struct _Processor {
-    gchar *model_name;
-    gchar *vendor_id;
-    gchar *flags;
-    gchar *bugs;
-    gchar *pm;             /* power management features */
-    gint cache_size;
-    gfloat bogomips;
-    gchar *microcode;
-
-    gint id;
-    gfloat cpu_mhz; /* for devices.c, identical to cpukhz_max/1000 */
-    cpu_topology_data *cputopo;
-    cpufreq_data *cpufreq;
-
-    gchar *has_fpu;
-    gchar *bug_fdiv, *bug_hlt, *bug_f00f, *bug_coma;
-
-    gint model, family, stepping;
-    gchar *strmodel;
-
-    GSList *cache;
-
-};
-
-#endif	/* __PROCESSOR_PLATFORM_H__ */
diff --git a/includes/xmlrpc-client.h b/includes/xmlrpc-client.h
deleted file mode 100644
index 32fad08c..00000000
--- a/includes/xmlrpc-client.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *    XMLRPC Client
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef __XMLRPC_CLIENT_H__
-#define __XMLRPC_CLIENT_H__
-
-#include "config.h"
-
-#ifdef HAS_LIBSOUP
-#include <libsoup/soup.h>
-
-void xmlrpc_init(void);
-gint xmlrpc_get_integer(gchar *addr,
-                        gchar *method,
-                        const gchar *param_types,
-                        ...);
-gchar *xmlrpc_get_string(gchar *addr,
-                         gchar *method,
-                         const gchar *param_types,
-                         ...);
-GValueArray *xmlrpc_get_array(gchar *addr,
-                              gchar *method,
-                              const gchar *param_types,
-                              ...);
-#endif /* HAS_LIBSOUP */
-
-#endif	/* __XMLRPC_CLIENT_H__ */
diff --git a/includes/xmlrpc-server.h b/includes/xmlrpc-server.h
deleted file mode 100644
index e608b711..00000000
--- a/includes/xmlrpc-server.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2009 Leandro A. F. Pereira <leandro@hardinfo.org>
- *
- *    This program 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, version 2.
- *
- *    This program 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 this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-#ifndef __XMLRPC_SERVER_H__
-#define __XMLRPC_SERVER_H__
-
-void xmlrpc_server_start(GMainLoop *main_loop);
-void xmlrpc_server_init(void);
-
-#endif	/* __XMLRPC_SERVER_H__ */
-