diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index b4d4e0921376cdcf1572d207bbc03c277f2e2510..5807c32f9d539076419d9c23802b0babd3a1fe7b 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -296,12 +296,6 @@ target_link_libraries(
     ${RT_LIBRARY}
     )
 
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(CARBON_LIBRARY Carbon)
-  target_link_libraries(llcommon PUBLIC ${CARBON_LIBRARY})
-endif (DARWIN)
-
 add_dependencies(llcommon stage_third_party_libs)
 
 if (LL_TESTS)
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 550b67eb09ce576d39381b8f114f58ef244e598a..2171deed348f20fd2d1859a8eca7448201121e63 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -71,7 +71,7 @@ target_link_libraries(SLPlugin
 )
 
 if (DARWIN)
-  # Mac version needs to link against Carbon
+  # Mac version needs to link against Cocoa
   target_link_libraries(SLPlugin ${COCOA_LIBRARY})
   # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)
   add_custom_command(
diff --git a/indra/llplugin/slplugin/slplugin-objc.mm b/indra/llplugin/slplugin/slplugin-objc.mm
index a5ab1d95c890f6bcbaf95b802c4f5c5eae3ca1d7..0ef6d5f74d041c8c4f5c1c2621c289f3b3372787 100644
--- a/indra/llplugin/slplugin/slplugin-objc.mm
+++ b/indra/llplugin/slplugin/slplugin-objc.mm
@@ -49,9 +49,6 @@ void LLCocoaPlugin::setupCocoa()
 		// when init'ing the Cocoa App window.		
 		[[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
 		
-		// This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor":
-		//   http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html
-		
 		//	Needed for Carbon based applications which call into Cocoa
 		NSApplicationLoad();
 
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 2604a23c85107a5aaffa11373938ec4c547e4275..72c55aff2eda94ad4dd319a5f4bdd6a9f0635f9e 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -39,7 +39,6 @@
 #include "indra_constants.h"
 
 #include <OpenGL/OpenGL.h>
-#include <Carbon/Carbon.h>
 #include <CoreServices/CoreServices.h>
 
 extern BOOL gDebugWindowProc;
@@ -1815,6 +1814,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
 
 BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
 {
+#if 0
 	BOOL	retval = FALSE;
 	OSErr	error = noErr;
 	NColorPickerInfo	info;
@@ -1839,6 +1839,8 @@ BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
 	}
 
 	return (retval);
+#endif
+    return FALSE;
 }
 
 void *LLWindowMacOSX::getPlatformWindow()
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b974b8c7d0c1184a1cb2d5c4e651cd1a445c118f..ff50d8c767ea33bec502384ba28785d880ce5fa9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1457,16 +1457,17 @@ if (DARWIN)
     COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness"
     )
 
-  find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COCOA_LIBRARY Cocoa)
   find_library(IOKIT_LIBRARY IOKit)
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   find_library(COREAUDIO_LIBRARY CoreAudio)
 
   set(viewer_LIBRARIES
     ${COCOA_LIBRARY}
-    ${AGL_LIBRARY}
+    ${APPKIT_LIBRARY}
     ${IOKIT_LIBRARY}
+    ${COREFOUNDATION_LIBRARY}
     ${COREAUDIO_LIBRARY}
     )
 
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index b1a4385a913667c9efb3c7f7ff5849e24452666f..1fbc6b3a0dec1836714bca469c2d8c0c66324542 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -30,8 +30,6 @@
 	#error "Use only with Mac OS X"
 #endif
 
-#define LL_CARBON_CRASH_HANDLER 1
-
 #include "llwindowmacosx.h"
 #include "llappviewermacosx-objc.h"
 
@@ -49,9 +47,6 @@
 #include "llerrorcontrol.h"
 #include "llvoavatarself.h"         // for gAgentAvatarp->getFullname()
 #include <ApplicationServices/ApplicationServices.h>
-#ifdef LL_CARBON_CRASH_HANDLER
-#include <Carbon/Carbon.h>
-#endif
 #include <vector>
 #include <exception>
 #include <fstream>
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 632ca014d16cf879ac834b00aba2b1ad79d6d348..947f31146a3248b258a40b969ad0f803f61ebb4c 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -36,7 +36,6 @@
 #include "stdtypes.h"
 
 #if LL_DARWIN
-#include <Carbon/Carbon.h>
 
 // AssertMacros.h does bad things.
 #undef verify
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 6872b2f1f703032def28d8f4add6e30f2ef5569b..0396841521627d417547bff16b2bc9e75f09673f 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -72,7 +72,7 @@
 #include <map>
 
 #if LL_DARWIN
-#include <CoreFoundation/CFURL.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 // Static initialization