diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 89e82ab07a5ace4c0314149e45572f52e01817aa..de2181d3d4d2ac7d6470fb542f92c73f2ea6f886 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -273,7 +273,7 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef -Wno-deprecated-declarations")
+  set(DARWIN_extra_cstar_flags "-gdwarf-2 -Wno-unused-local-typedef")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
   # NOTE: it's critical that the optimization flag is put in front.
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index b058f5f1b688662074b5cf7e82f4830f5ebe4c33..89204cbb147e9e946e12972d2b821583dd958909 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -118,14 +118,6 @@ if (DARWIN)
     llopenglview-objc.h
     llappdelegate-objc.h
     )
-
-  # We use a bunch of deprecated system APIs.
-  set_source_files_properties(
-      llkeyboardmacosx.cpp
-      llwindowmacosx.cpp
-      PROPERTIES
-      COMPILE_FLAGS "-Wno-deprecated-declarations -fpascal-strings"
-      )
 endif (DARWIN)
 
 
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 947f31146a3248b258a40b969ad0f803f61ebb4c..be66a448b9d4bc2ed26e63fdc58681b3d05dfc87 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -54,19 +54,12 @@
 #endif
 
 #if LL_GTK
-#if LL_GNUC
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 extern "C" {
 // mostly for Linux, possible on others
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 }
-#if LL_GNUC
-#pragma GCC diagnostic pop
-#endif // LL_GNUC
 #endif // LL_GTK
 
 class LLFilePicker