From ee9aa550831adb83f4bb60053ad68b57e860b760 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 13 May 2017 20:06:46 +0100
Subject: [PATCH] Fix more warnings

---
 src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp | 2 +-
 src/openrct2/audio/AudioMixer.cpp                              | 2 --
 src/openrct2/audio/AudioMixer.h                                | 2 ++
 src/openrct2/common.h                                          | 1 +
 src/openrct2/localisation/localisation.c                       | 2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
index daff9fa039..7cc0657692 100644
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
@@ -18,7 +18,7 @@
 
 #include <unordered_map>
 #include <vector>
-#include <SDL_platform.h>
+#include <SDL.h>
 
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Console.hpp>
diff --git a/src/openrct2/audio/AudioMixer.cpp b/src/openrct2/audio/AudioMixer.cpp
index 3594c4a151..ec4c060dbf 100644
--- a/src/openrct2/audio/AudioMixer.cpp
+++ b/src/openrct2/audio/AudioMixer.cpp
@@ -28,8 +28,6 @@ extern "C"
     #include "../rct2.h"
 }
 
-#define SDL_MIX_MAXVOLUME 128
-
 using namespace OpenRCT2;
 using namespace OpenRCT2::Audio;
 
diff --git a/src/openrct2/audio/AudioMixer.h b/src/openrct2/audio/AudioMixer.h
index 51c65d3db3..1a9bbd2d3b 100644
--- a/src/openrct2/audio/AudioMixer.h
+++ b/src/openrct2/audio/AudioMixer.h
@@ -18,6 +18,8 @@
 
 #include "../common.h"
 
+#define SDL_MIX_MAXVOLUME 128
+
 #define MIXER_LOOP_NONE         0
 #define MIXER_LOOP_INFINITE     -1
 
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 14209e0ef3..2aae3fbad9 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -31,6 +31,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c
index 61da4a4b13..51211875b1 100644
--- a/src/openrct2/localisation/localisation.c
+++ b/src/openrct2/localisation/localisation.c
@@ -16,6 +16,8 @@
 
 #include "../common.h"
 
+#include <ctype.h>
+
 #ifdef __WINDOWS__
 #include <windows.h>
 #else