  
  /**
   * The NewGRF revision of OTTD:
-diff --git a/src/stringfilter.cpp b/src/stringfilter.cpp
-index 6045c19..6fc3f99 100644
---- a/src/stringfilter.cpp
-+++ b/src/stringfilter.cpp
-@@ -113,7 +113,7 @@ void StringFilter::AddLine(const char *str)
- 	const WordState *end = this->word_index.End();
- 	for (WordState *it = this->word_index.Begin(); it != end; ++it) {
- 		if (!it->match) {
--			if ((match_case ? strstr(str, it->start) : strcasestr(str, it->start)) != NULL) {
-+			if ((match_case ? strstr(str, it->start) : strstr(str, it->start)) != NULL) {
- 				it->match = true;
- 				this->word_matches++;
- 			}
+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);

 #endif
 
 #if defined(OPENBSD) || defined(__NetBSD__) || defined(__FreeBSD__)
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index b6bddea..499ec09 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -57,7 +57,7 @@ const char _openttd_build_date[] = __DATE__ " " __TIME__;
  * (compiling from sources without any version control software)
  * and 2 is for modified revision.
  */

 	fi
 
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
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>
