  	fi
  
  	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
-diff --git a/src/os/unix/crashlog_unix.cpp b/src/os/unix/crashlog_unix.cpp
-index 47de057..07a3b74 100644
---- a/src/os/unix/crashlog_unix.cpp
-+++ b/src/os/unix/crashlog_unix.cpp
-@@ -17,7 +17,7 @@
- 
- #include <errno.h>
- #include <signal.h>
--#include <sys/utsname.h>
-+//#include <sys/utsname.h>
- 
- #if defined(__GLIBC__)
- /* Execinfo (and thus making stacktraces) is a GNU extension */
-@@ -42,22 +42,22 @@ class CrashLogUnix : public CrashLog {
- 
- 	/* virtual */ char *LogOSVersion(char *buffer, const char *last) const
- 	{
--		struct utsname name;
--		if (uname(&name) < 0) {
-+		//struct utsname name;
-+		//if (uname(&name) < 0) {
- 			return buffer + seprintf(buffer, last, "Could not get OS version: %s\n", strerror(errno));
--		}
--
--		return buffer + seprintf(buffer, last,
--				"Operating system:\n"
--				" Name:     %s\n"
--				" Release:  %s\n"
--				" Version:  %s\n"
--				" Machine:  %s\n",
--				name.sysname,
--				name.release,
--				name.version,
--				name.machine
--		);
-+		//}
-+
-+		//return buffer + seprintf(buffer, last,
-+		//		"Operating system:\n"
-+		//		" Name:     %s\n"
-+		//		" Release:  %s\n"
-+		//		" Version:  %s\n"
-+		//		" Machine:  %s\n",
-+		//		name.sysname,
-+		//		name.release,
-+		//		name.version,
-+		//		name.machine
-+		//);
- 	}
- 
- 	/* virtual */ char *LogError(char *buffer, const char *last, const char *message) const
-diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
-index d7c2304..ed3c706 100644
---- a/src/os/unix/unix.cpp
-+++ b/src/os/unix/unix.cpp
+diff -rupNw source-original/src/os/unix/unix.cpp source/src/os/unix/unix.cpp
+--- source-original/src/os/unix/unix.cpp	2018-11-23 19:25:12.000000000 +0100
++++ source/src/os/unix/unix.cpp	2018-11-23 21:37:19.956620161 +0100
 @@ -28,7 +28,7 @@
  #ifdef __APPLE__
  	#include <sys/mount.h>

diff --git a/config.lib b/config.lib
index bc2224f..54290b1 100644
--- a/config.lib
+++ b/config.lib
@@ -1486,7 +1486,7 @@ make_cflags_and_ldflags() {
 	# Special CXXFlags for HOST
 	CXXFLAGS="$CXXFLAGS"

 
 /**
  * The NewGRF revision of OTTD:
diff -rupNw source-original/src/stdafx.h source/src/stdafx.h
--- source-original/src/stdafx.h	2018-11-23 19:25:12.000000000 +0100
+++ source/src/stdafx.h	2018-11-23 19:49:25.000000000 +0100
@@ -12,6 +12,9 @@
 #ifndef STDAFX_H
 #define STDAFX_H
 
+#include <strings.h>
+#include <alloca.h>
+
 #if defined(__APPLE__)
 	#include "os/macosx/osx_stdafx.h"
 #endif /* __APPLE__ */
diff -rupNw source-original/src/string.cpp source/src/string.cpp
--- source-original/src/string.cpp	2018-11-23 19:25:12.000000000 +0100
+++ source/src/string.cpp	2018-11-23 20:01:10.000000000 +0100
@@ -528,7 +528,7 @@ size_t Utf8TrimString(char *s, size_t ma
 	return length;
 }
 
-#ifdef DEFINE_STRCASESTR
+#if 0
 char *strcasestr(const char *haystack, const char *needle)
 {
 	size_t hay_len = strlen(haystack);
