diff --git a/src/86box.c b/src/86box.c
index 2e49184ef..444fe1e81 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -405,7 +405,7 @@ pc_init(int argc, char *argv[])
 	int ng = 0, lvmp = 0;
 	uint32_t *uid, *shwnd;
 	uint32_t lang_init = 0;
-	
+
 	/* Grab the executable's full path. */
 	plat_get_exe_name(exe_path, sizeof(exe_path)-1);
 	p = plat_get_filename(exe_path);
@@ -421,7 +421,7 @@ pc_init(int argc, char *argv[])
 	 */
 	plat_getcwd(usr_path, sizeof(usr_path) - 1);
 	plat_getcwd(rom_path, sizeof(rom_path) - 1);
-	
+
 	memset(path, 0x00, sizeof(path));
 	memset(path2, 0x00, sizeof(path));
 
@@ -727,7 +727,7 @@ usage:
 
 	/* Load the configuration file. */
 	config_load();
-	
+
 	/* Load the desired language */
 	if (lang_init)
 		lang_id = lang_init;
@@ -1069,7 +1069,7 @@ pc_reset_hard_init(void)
 void update_mouse_msg()
 {
 	wchar_t wcpufamily[2048], wcpu[2048], wmachine[2048], *wcp;
-	
+
 	mbstowcs(wmachine, machine_getname(), strlen(machine_getname())+1);
 
 	if (!cpu_override)
diff --git a/src/acpi.c b/src/acpi.c
index af02aa692..bdb3ff7bc 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1806,8 +1806,8 @@ const device_t acpi_ali_device =
     "acpi_ali",
     DEVICE_PCI,
     VEN_ALI,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
@@ -1821,8 +1821,8 @@ const device_t acpi_intel_device =
     "acpi_intel",
     DEVICE_PCI,
     VEN_INTEL,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
@@ -1836,8 +1836,8 @@ const device_t acpi_sis_device =
     "acpi_sis",
     DEVICE_PCI,
     VEN_SIS,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
@@ -1851,8 +1851,8 @@ const device_t acpi_via_device =
     "acpi_via",
     DEVICE_PCI,
     VEN_VIA,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
@@ -1867,8 +1867,8 @@ const device_t acpi_via_596b_device =
     "acpi_via_596b",
     DEVICE_PCI,
     VEN_VIA_596B,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
@@ -1883,8 +1883,8 @@ const device_t acpi_smc_device =
     "acpi_smc",
     DEVICE_PCI,
     VEN_SMC,
-    acpi_init, 
-    acpi_close, 
+    acpi_init,
+    acpi_close,
     acpi_reset,
     { NULL },
     acpi_speed_changed,
diff --git a/src/apm.c b/src/apm.c
index 35c9a2a3c..def8db7bc 100644
--- a/src/apm.c
+++ b/src/apm.c
@@ -130,7 +130,7 @@ const device_t apm_device =
     0,
     0,
     apm_init,
-    apm_close, 
+    apm_close,
     NULL,
     { NULL },
     NULL,
@@ -146,7 +146,7 @@ const device_t apm_pci_device =
     DEVICE_PCI,
     0,
     apm_init,
-    apm_close, 
+    apm_close,
     apm_reset,
     { NULL },
     NULL,
@@ -162,7 +162,7 @@ const device_t apm_pci_acpi_device =
     DEVICE_PCI,
     1,
     apm_init,
-    apm_close, 
+    apm_close,
     apm_reset,
     { NULL },
     NULL,