8 files changed, 10 insertions, 12 deletions
diff --git a/hardinfo2/arch/linux/common/battery.h b/hardinfo2/arch/linux/common/battery.h
index dc003459..8be133ee 100644
--- a/hardinfo2/arch/linux/common/battery.h
+++ b/hardinfo2/arch/linux/common/battery.h
@@ -17,7 +17,7 @@
  */
 
 static void
-scan_battery(void)
+__scan_battery(void)
 {
     gchar *acpi_path;
 
diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h
index e9deffa7..0742bb3b 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/hardinfo2/arch/linux/common/inputdevices.h
@@ -42,7 +42,7 @@ static struct {
 };
 
 void
-scan_inputdevices(void)
+__scan_input_devices(void)
 {
     FILE *dev;
     gchar buffer[128];
diff --git a/hardinfo2/arch/linux/common/modules.h b/hardinfo2/arch/linux/common/modules.h
index 3acf4aba..9b895ee8 100644
--- a/hardinfo2/arch/linux/common/modules.h
+++ b/hardinfo2/arch/linux/common/modules.h
@@ -34,14 +34,12 @@ remove_module_devices(gpointer key, gpointer value, gpointer data)
     return FALSE;
 }
 
-void
-scan_modules(void)
+static void
+scan_modules_do(void)
 {
     FILE *lsmod;
     gchar buffer[1024];
 
-    shell_status_update("Getting loaded modules information...");
-    
     if (module_list) {
         g_free(module_list);
         module_list = NULL;
diff --git a/hardinfo2/arch/linux/common/pci.h b/hardinfo2/arch/linux/common/pci.h
index 5f48ba44..e50691d0 100644
--- a/hardinfo2/arch/linux/common/pci.h
+++ b/hardinfo2/arch/linux/common/pci.h
@@ -17,7 +17,7 @@
  */
 
 void
-scan_pci(void)
+__scan_pci(void)
 {
     FILE *lspci;
     gchar buffer[256], *buf, *strhash = NULL, *strdevice = NULL;
diff --git a/hardinfo2/arch/linux/common/sensors.h b/hardinfo2/arch/linux/common/sensors.h
index 246c53e7..3303d5d2 100644
--- a/hardinfo2/arch/linux/common/sensors.h
+++ b/hardinfo2/arch/linux/common/sensors.h
@@ -355,7 +355,7 @@ static void read_sensors_hddtemp(void)
     }
 }
 
-static void read_sensors(void)
+static void __scan_sensors(void)
 {
     if (sensors)
 	g_free(sensors);
diff --git a/hardinfo2/arch/linux/common/storage.h b/hardinfo2/arch/linux/common/storage.h
index 3397570d..8e248d3b 100644
--- a/hardinfo2/arch/linux/common/storage.h
+++ b/hardinfo2/arch/linux/common/storage.h
@@ -31,7 +31,7 @@ remove_scsi_devices(gpointer key, gpointer value, gpointer data)
 
 /* SCSI support by Pascal F.Martin <pascalmartin@earthlink.net> */
 void
-scan_scsi(void)
+__scan_scsi_devices(void)
 {
     FILE *proc_scsi;
     gchar buffer[256], *buf;
@@ -160,7 +160,7 @@ remove_ide_devices(gpointer key, gpointer value, gpointer data)
 
 
 void
-scan_ide(void)
+__scan_ide_devices(void)
 {
     FILE *proc_ide;
     gchar *device, iface, *model, *media, *pgeometry = NULL, *lgeometry =
diff --git a/hardinfo2/arch/linux/common/usb.h b/hardinfo2/arch/linux/common/usb.h
index 286d9380..606bb0fb 100644
--- a/hardinfo2/arch/linux/common/usb.h
+++ b/hardinfo2/arch/linux/common/usb.h
@@ -32,7 +32,7 @@ remove_usb_devices(gpointer key, gpointer value, gpointer data)
 
 static gchar *usb_list = NULL;
 void
-scan_usb(void)
+__scan_usb(void)
 {
     FILE *dev;
     gchar buffer[128];
diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h
index 4e4a2646..a756a958 100644
--- a/hardinfo2/arch/linux/x86/processor.h
+++ b/hardinfo2/arch/linux/x86/processor.h
@@ -132,7 +132,7 @@ static void get_processor_strfamily(Processor * processor)
     }
 }
 
-static GSList *computer_get_processors(void)
+static GSList *__scan_processors(void)
 {
     GSList *procs = NULL;
     Processor *processor = NULL;