From 418e9f4158cd0697b141d17050fb7009d009df22 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sun, 19 Feb 2017 13:55:31 +0000
Subject: [PATCH 1/2] Remove assert.h include from btree.h, as this overrides
 OpenTTD's assert

---
 src/3rdparty/cpp-btree/btree.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/3rdparty/cpp-btree/btree.h b/src/3rdparty/cpp-btree/btree.h
index 618bc7ffd8..066999c91c 100644
--- a/src/3rdparty/cpp-btree/btree.h
+++ b/src/3rdparty/cpp-btree/btree.h
@@ -100,7 +100,6 @@
 #ifndef UTIL_BTREE_BTREE_H__
 #define UTIL_BTREE_BTREE_H__
 
-#include <assert.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/types.h>

From e459ebe2ad701bbba4ab349d082ace7310c17062 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Sun, 19 Feb 2017 13:57:02 +0000
Subject: [PATCH 2/2] Remove assert.h include from progsig, as this overrides
 OpenTTD's assert

---
 src/programmable_signals.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/programmable_signals.cpp b/src/programmable_signals.cpp
index 6bdb23545c..654bb22ecb 100644
--- a/src/programmable_signals.cpp
+++ b/src/programmable_signals.cpp
@@ -17,7 +17,6 @@
 #include "window_func.h"
 #include "company_func.h"
 #include "cmd_helper.h"
-#include <assert.h>
 
 ProgramList _signal_programs;