From 6eeb7aaf7025c506a78fd187cf0ef9737e1512db Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Tue, 22 Jul 2008 07:01:03 +0000
Subject: [PATCH] More targeted includes. It might be worth getting away from
 Carbon eventually; however, many of the replacement APIs are either in 10.4
 or 10.5 and we still target 10.3.9.

---
 stepmania/src/arch/ArchHooks/ArchHooks_MacOSX.cpp | 3 ++-
 stepmania/src/arch/Dialog/DialogDriver_MacOSX.cpp | 2 +-
 stepmania/src/archutils/Darwin/Crash.cpp          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_MacOSX.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
index 32b03732e9..c986b97854 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_MacOSX.cpp
@@ -5,7 +5,8 @@
 #include "archutils/Unix/CrashHandler.h"
 #include "archutils/Unix/SignalHandler.h"
 #include "ProductInfo.h"
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <mach/mach.h>
diff --git a/stepmania/src/arch/Dialog/DialogDriver_MacOSX.cpp b/stepmania/src/arch/Dialog/DialogDriver_MacOSX.cpp
index 41d2919b0f..bf1a72a4a7 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_MacOSX.cpp
+++ b/stepmania/src/arch/Dialog/DialogDriver_MacOSX.cpp
@@ -4,7 +4,7 @@
 #include "RageThreads.h"
 #include "ProductInfo.h"
 #include "InputFilter.h"
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 REGISTER_DIALOG_DRIVER_CLASS( MacOSX );
 
diff --git a/stepmania/src/archutils/Darwin/Crash.cpp b/stepmania/src/archutils/Darwin/Crash.cpp
index e27a1a88a4..a67f970bd4 100644
--- a/stepmania/src/archutils/Darwin/Crash.cpp
+++ b/stepmania/src/archutils/Darwin/Crash.cpp
@@ -2,7 +2,7 @@
 #include "Crash.h"
 #include "ProductInfo.h"
 #include "arch/ArchHooks/ArchHooks.h"
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/sysctl.h>