From 68dc3c4f2daf80ef043ad6f7d1ff5b49b81a15e6 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edward.san.dev@gmail.com>
Date: Wed, 23 Nov 2016 16:24:56 +0100
Subject: [PATCH] - Preventive fix for future include conflicts.

basicinlines.h is only included in m_fixed.h, while basictypes.h is included only in headers, so it's better to respect this convention. OSX compiles fine also without m_fixed.h, even better.
---
 src/posix/cocoa/i_timer.cpp | 2 --
 src/posix/sdl/i_timer.cpp   | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/posix/cocoa/i_timer.cpp b/src/posix/cocoa/i_timer.cpp
index 901657eb95..5141f8750c 100644
--- a/src/posix/cocoa/i_timer.cpp
+++ b/src/posix/cocoa/i_timer.cpp
@@ -37,8 +37,6 @@
 #include <pthread.h>
 #include <libkern/OSAtomic.h>
 
-#include "basictypes.h"
-#include "basicinlines.h"
 #include "doomdef.h"
 #include "i_system.h"
 #include "templates.h"
diff --git a/src/posix/sdl/i_timer.cpp b/src/posix/sdl/i_timer.cpp
index cad3000ba4..84108f3b77 100644
--- a/src/posix/sdl/i_timer.cpp
+++ b/src/posix/sdl/i_timer.cpp
@@ -7,8 +7,7 @@
 
 #include <SDL.h>
 
-#include "basictypes.h"
-#include "basicinlines.h"
+#include "m_fixed.h"
 #include "hardware.h"
 #include "i_system.h"
 #include "templates.h"