diff --git a/src/WIN/win.c b/src/WIN/win.c
index 292c446df..09d271da5 100644
--- a/src/WIN/win.c
+++ b/src/WIN/win.c
@@ -10,12 +10,11 @@
*
* Version: @(#)win.c 1.0.0 2017/05/30
*
- * Author: Sarah Walker,
+ * Authors: Sarah Walker,
* Miran Grca,
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
-
#include
#include
#include
@@ -60,8 +59,6 @@
#include
#include
-#include "resource.h"
-
#ifndef MAPVK_VK_TO_VSC
#define MAPVK_VK_TO_VSC 0
diff --git a/src/WIN/win_d3d.cc b/src/WIN/win_d3d.cc
index 04720448a..f090465b3 100644
--- a/src/WIN/win_d3d.cc
+++ b/src/WIN/win_d3d.cc
@@ -10,18 +10,16 @@
*
* Version: @(#)win_d3d.cc 1.0.0 2017/05/30
*
- * Author: Sarah Walker,
+ * Authors: Sarah Walker,
* Miran Grca,
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
-
#include
#include "../video/video.h"
#include "win.h"
#include "win_d3d.h"
#include "win_cgapal.h"
-#include "resource.h"
extern "C" void fatal(const char *format, ...);
diff --git a/src/WIN/win_d3d_fs.cc b/src/WIN/win_d3d_fs.cc
index 91c420132..fb58c8c3a 100644
--- a/src/WIN/win_d3d_fs.cc
+++ b/src/WIN/win_d3d_fs.cc
@@ -10,12 +10,11 @@
*
* Version: @(#)win_d3d_fs.cc 1.0.0 2017/05/30
*
- * Author: Sarah Walker,
+ * Authors: Sarah Walker,
* Miran Grca,
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
-
#include
#include
#include "../86box.h"
@@ -23,7 +22,6 @@
#include "win.h"
#include "win_d3d.h"
#include "win_cgapal.h"
-#include "resource.h"
extern "C" void fatal(const char *format, ...);
diff --git a/src/WIN/win_deviceconfig.c b/src/WIN/win_deviceconfig.c
index 1dc548278..1b1f994ce 100644
--- a/src/WIN/win_deviceconfig.c
+++ b/src/WIN/win_deviceconfig.c
@@ -10,16 +10,14 @@
*
* Version: @(#)win_deviceconfig.c 1.0.0 2017/05/30
*
- * Author: Sarah Walker,
+ * Authors: Sarah Walker,
* Miran Grca,
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
-
#include "../ibm.h"
#include "../config.h"
#include "../device.h"
-#include "resource.h"
#define NO_UNICODE /*FIXME: not Unicode? */
#include "win.h"
#include
diff --git a/src/WIN/win_iodev.c b/src/WIN/win_iodev.c
index 56d5d5df8..c2c2de9db 100644
--- a/src/WIN/win_iodev.c
+++ b/src/WIN/win_iodev.c
@@ -13,7 +13,6 @@
* Author: Miran Grca,
* Copyright 2016-2017 Miran Grca.
*/
-
#define UNICODE
#define _WIN32_WINNT 0x0501
#define BITMAP WINDOWS_BITMAP
@@ -38,9 +37,9 @@
#include "../cdrom_null.h"
#include "../scsi_disk.h"
#include "plat_iodev.h"
-#include "resource.h"
#include "win.h"
+
void cdrom_eject(uint8_t id)
{
int part;
diff --git a/src/WIN/win_joystickconfig.c b/src/WIN/win_joystickconfig.c
index 8962366d6..3cd5a0c68 100644
--- a/src/WIN/win_joystickconfig.c
+++ b/src/WIN/win_joystickconfig.c
@@ -11,14 +11,15 @@
#include "../device.h"
#include "../gameport.h"
#include "plat_joystick.h"
-#include "resource.h"
#include "win.h"
+
static int joystick_nr;
static int joystick_config_type;
#define AXIS_STRINGS_MAX 3
static char *axis_strings[AXIS_STRINGS_MAX] = {"X Axis", "Y Axis", "Z Axis"};
+
static void rebuild_axis_button_selections(HWND hdlg)
{
int id = IDC_CONFIG_BASE + 2;
diff --git a/src/WIN/win_language.c b/src/WIN/win_language.c
index 00cb70482..6279e2da6 100644
--- a/src/WIN/win_language.c
+++ b/src/WIN/win_language.c
@@ -10,12 +10,11 @@
*
* Version: @(#)win_language.c 1.0.0 2017/05/30
*
- * Author: Sarah Walker,
+ * Authors: Sarah Walker,
* Miran Grca,
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
-
#include
#define UNICODE
#define BITMAP WINDOWS_BITMAP
@@ -28,10 +27,10 @@
#include "../ibm.h"
#include "../device.h"
#include "../ide.h"
-#include "resource.h"
#include "win.h"
#include "win_language.h"
+
LCID dwLanguage;
uint32_t dwLangID, dwSubLangID;
diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c
index 1d6c475d9..73fc90ed1 100644
--- a/src/WIN/win_settings.c
+++ b/src/WIN/win_settings.c
@@ -13,7 +13,6 @@
* Author: Miran Grca,
* Copyright 2016-2017 Miran Grca.
*/
-
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include
@@ -45,7 +44,6 @@
#include "plat_midi.h"
#include "win.h"
#include "win_language.h"
-#include "resource.h"
/* Machine category */
diff --git a/src/WIN/win_status.c b/src/WIN/win_status.c
index 59a7a5947..32012cb75 100644
--- a/src/WIN/win_status.c
+++ b/src/WIN/win_status.c
@@ -11,7 +11,6 @@
#include "../cpu/x86_ops.h"
#include "../cpu/codegen.h"
#include "../device.h"
-#include "resource.h"
#include "win.h"