diff --git a/src/php_cairo_internal.h b/src/php_cairo_internal.h
index 9cc5b785..8383e012 100644
--- a/src/php_cairo_internal.h
+++ b/src/php_cairo_internal.h
@@ -117,9 +117,12 @@ extern cairo_status_t php_cairo_read_func(void *closure, const unsigned char *da
 /* Font + FontFace */
 typedef struct _cairo_font_face_object {
 	cairo_font_face_t *font_face;
-        stream_closure *closure;
+	#if defined(CAIRO_HAS_QUARTZ_FONT)
+	CGFontRef quartzref;
+	#endif
+	stream_closure *closure;
 	cairo_user_data_key_t key;
-        zend_object std;
+	zend_object std;
 } cairo_font_face_object;
 
 extern zend_object* cairo_font_face_create_object(zend_class_entry *ce);
diff --git a/src/quartz_font.c b/src/quartz_font.c
index 13b4f8a3..ec758a20 100644
--- a/src/quartz_font.c
+++ b/src/quartz_font.c
@@ -16,6 +16,8 @@
 #endif
 
 #include <cairo.h>
+#include <cairo-quartz.h>
+#include <ApplicationServices/ApplicationServices.h>
 #include <php.h>
 #include <zend_exceptions.h>
 
@@ -115,7 +117,7 @@ PHP_METHOD(CairoQuartzFontFace, createForCgfont)
 /* {{{ cairo_quartz_font_methods[] */
 const zend_function_entry cairo_quartz_font_methods[] = {
 	PHP_ME(CairoQuartzFontFace, createForCgfont, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	PHP_ME(CairoQuartzFontFace, createForAtsuiFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	PHP_ME(CairoQuartzFontFace, createForAtsuFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };
 /* }}} */
diff --git a/src/region.c b/src/region.c
index 627bd129..1f058c81 100644
--- a/src/region.c
+++ b/src/region.c
@@ -23,7 +23,7 @@
 #include "php_cairo.h"
 
 zend_class_entry *ce_cairo_region;
-zend_class_entry *ce_cairo_rectangle;
+extern zend_class_entry *ce_cairo_rectangle;
 zend_class_entry *ce_cairo_region_overlap;
 
 static zend_object_handlers cairo_region_object_handlers;