diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33552a16a..e5a14fe1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,11 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 
 if(APPLE)
-   set(USE_QUARTZ ON)
+   set(__APPLE_QUARTZ__ 1)
+   set(HAVE_STRTOLL 1)
+   set(HAVE_STRCASECMP 1)
+   set(HAVE_DIRENT_H 1)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa -framework Carbon -framework AudioToolBox")
 endif(APPLE)
 
 if(WIN32)
diff --git a/configh.cmake.in b/configh.cmake.in
index f422ad548..5db4dbeab 100644
--- a/configh.cmake.in
+++ b/configh.cmake.in
@@ -117,19 +117,14 @@
 #define USE_XDBE HAVE_XDBE
 
 /*
- * USE_QUARTZ:
+ * __APPLE_QUARTZ__:
  *
- * Use Quartz instead of Quickdraw on Apple Mac OS X machines.
- * FLTK was originally ported to Quickdraw which is no longer 
- * supported by Apple. If USE_QUARTZ is defined, FLTK will be
- * compiled using Quartz instead. This flag has no meaning on
- * other operating systems.
+ * If __APPLE_QUARTZ__ is defined, FLTK will be
+ * compiled using Quartz. This flag has no meaning on
+ * other operating systems than Mac OS X.
  */
 
-#cmakedefine USE_QUARTZ
 #cmakedefine __APPLE_QUARTZ__ @__APPLE_QUARTZ__@
-#cmakedefine __APPLE_COCOA__ @__APPLE_COCOA__@
-#cmakedefine __APPLE_QD__ @__APPLE_QD__@
 
 
 /*