diff --git a/src/Makefile b/src/Makefile
index 3401eb1b4..83188ce6d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,7 @@ ENAME=ClassiCube
 DEL=rm
 JOBS=1
 CC=cc
-CFLAGS=-g -pipe -rdynamic -fno-math-errno
+CFLAGS=-g -pipe -fno-math-errno
 LDFLAGS=-g -rdynamic
 
 ifndef $(PLAT)
@@ -50,8 +50,8 @@ LIBS=-lm -lsocket -lX11 -lXi -lGL
 endif
 
 ifeq ($(PLAT),mac_x32)
-LIBS=
 CFLAGS=-g -m32 -pipe -fno-math-errno
+LIBS=
 LDFLAGS=-rdynamic -framework Carbon -framework AGL -framework OpenGL -framework IOKit
 endif
 
diff --git a/src/Window_Carbon.c b/src/Window_Carbon.c
index bf102acb0..e03bf61f9 100644
--- a/src/Window_Carbon.c
+++ b/src/Window_Carbon.c
@@ -6,7 +6,7 @@
 #include "Bitmap.h"
 #include "Errors.h"
 #include <ApplicationServices/ApplicationServices.h>
-#include <Carbon/Carbon.h>
+#include <HIToolbox/HIToolbox.h>
 
 static int windowX, windowY;
 static WindowRef win_handle;