Merge branch 'master' into jgrpp

# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp

src/driver.cpp

@@ -20,12 +20,6 @@
 #include <string>
 #include <sstream>
 
-#ifdef _WIN32
-# include <windows.h>
-#else
-# include <unistd.h>
-#endif /* _WIN32 */
-
 #include "safeguards.h"
 
 std::string _ini_videodriver;        ///< The video driver a stored in the configuration file.
@@ -130,7 +124,7 @@ bool DriverFactoryBase::SelectDriverImpl(const std::string &name, Driver::Type t
 					 * hardware acceleration. */
 					auto filename = FioFindFullPath(BASE_DIR, HWACCELERATION_TEST_FILE);
 					if (!filename.empty()) {
-						unlink(filename.c_str());
+						FioRemove(filename);
 
 						Debug(driver, 1, "Probing {} driver '{}' skipped due to earlier crash", GetDriverTypeName(type), d->name);
 
@@ -217,7 +211,7 @@ void DriverFactoryBase::MarkVideoDriverOperational()
 	 * and as we are operational now, remove the hardware acceleration
 	 * test-file. */
 	auto filename = FioFindFullPath(BASE_DIR, HWACCELERATION_TEST_FILE);
-	if (!filename.empty()) unlink(filename.c_str());
+	if (!filename.empty()) FioRemove(filename);
 }
 
 /**