diff --git a/simon/midi.cpp b/simon/midi.cpp
index c4acc1390a0..c599e34700b 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -23,8 +23,13 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mididrv.h"
 #include "../sound/mixer.h"
+#else
+#include "mididrv.h"
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 void MidiPlayer::read_from_file(void *dst, uint size) {
diff --git a/simon/simon.cpp b/simon/simon.cpp
index c490b6b1c74..b7e7dc3f771 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -23,7 +23,11 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mixer.h"
+#else
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 
@@ -34,7 +38,11 @@
 #ifdef WIN32
 #include <malloc.h>
 #endif
+#ifndef macintosh
 #include <sys/stat.h>
+#else
+#include <stat.h>
+#endif
 
 int sdl_mouse_x, sdl_mouse_y;
 
@@ -6529,8 +6537,8 @@ void SimonState::o_pathfind(int x,int y,uint var_1,uint var_2) {
 		if (!p)
 			continue;
 		for(j=0; READ_BE_UINT16_UNALIGNED(&p[0]) != 999; j++,p+=2) { /* 0xE703 = byteswapped 999 */
-			x_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[0]) - x));
-			y_diff = abs((int)(READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
+			x_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[0]) - x));
+			y_diff = abs((int) (READ_BE_UINT16_UNALIGNED(&p[1]) - 12 - y));
 
 			if (x_diff < y_diff) {
 				x_diff >>= 2;
diff --git a/simon/simon.h b/simon/simon.h
index 6ad6a8c0f2c..9f8801b6a62 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -220,7 +220,7 @@ struct VgaFile1Struct0x6 {
 };
 
 /* dummy typedefs to make it compile in *nix */
-#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(__APPLE__CW)
+#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(macintosh)
 typedef void* HMIDISTRM;
 typedef void* HMIDIOUT;
 typedef uint32 UINT;
diff --git a/simon/simonsys.cpp b/simon/simonsys.cpp
index cb7f34bc9ee..8d29ad22146 100644
--- a/simon/simonsys.cpp
+++ b/simon/simonsys.cpp
@@ -23,7 +23,11 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
+#ifndef macintosh
 #include "../sound/mixer.h"
+#else
+#include "mixer.h"
+#endif
 #include "simon.h"
 
 #include <stdarg.h>