diff --git a/AppKit/NSFontDescriptor.m b/AppKit/NSFontDescriptor.m
index 7ddd4ce3d0..ada243a9a9 100644
--- a/AppKit/NSFontDescriptor.m
+++ b/AppKit/NSFontDescriptor.m
@@ -41,6 +41,9 @@ this software and associated documentation files (the "Software"), to deal in
 NSString *const NSFontWidthTrait = @"NSFontWidthTrait";
 NSString *const NSFontSlantTrait = @"NSFontSlantTrait";
 
+NSString *const NSFontFeatureSelectorIdentifierKey = @"NSFontFeatureSelectorIdentifier";
+NSString *const NSFontFeatureTypeIdentifierKey = @"NSFontFeatureTypeIdentifierKey";
+
 const NSFontWeight NSFontWeightThin = 0xbfe3333340000000;
 const NSFontWeight NSFontWeightLight = 0xbfd99999a0000000;
 const NSFontWeight NSFontWeightUltraLight = 0xbfe99999a0000000;
diff --git a/CoreGraphics/CGFont.m b/CoreGraphics/CGFont.m
index a072d2b758..59f26f7145 100644
--- a/CoreGraphics/CGFont.m
+++ b/CoreGraphics/CGFont.m
@@ -20,6 +20,15 @@ this software and associated documentation files (the "Software"), to deal in
 #import <CoreGraphics/CGFont.h>
 #import <Onyx2D/O2Font.h>
 
+const CFStringRef kCGFontNameKeyCopyright = CFSTR("CGFontNameKeyCopyright");
+const CFStringRef kCGFontNameKeyFontFamily = CFSTR("CGFontNameKeyFontFamily");
+const CFStringRef kCGFontNameKeyFontSubfamily = CFSTR("CGFontNameKeyFontSubfamily");
+const CFStringRef kCGFontNameKeyFullName = CFSTR("CGFontNameKeyFullName");
+const CFStringRef kCGFontNameKeyPostScriptName = CFSTR("CGFontNameKeyPostScriptName");
+const CFStringRef kCGFontNameKeyPreferredFamily = CFSTR("CGFontNameKeyPreferredFamily");
+const CFStringRef kCGFontNameKeyPreferredSubfamily = CFSTR("CGFontNameKeyPreferredSubfamily");
+const CFStringRef kCGFontNameKeyVersion = CFSTR("CGFontNameKeyPreferredSubfamily");
+
 CGFontRef CGFontCreateWithFontName(CFStringRef name) {
     return O2FontCreateWithFontName((NSString *) name);
 }
diff --git a/CoreText/constants.c b/CoreText/constants.c
index 385ad3fa13..2c20a4d657 100644
--- a/CoreText/constants.c
+++ b/CoreText/constants.c
@@ -40,3 +40,8 @@ const CFStringRef kCTKernAttributeName = CFSTR("CTKernAttributeName");
 const CFStringRef kCTLanguageAttributeName = CFSTR("CTLanguageAttributeName");
 const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel = CFSTR("CTTypesetterOptionForcedEmbeddingLevel");
 const CFStringRef kCTVerticalFormsAttributeName = CFSTR("CTVerticalFormsAttributeName");
+const CFStringRef kCTFontFullNameKey = CFSTR("CTFontFullName");
+const CFStringRef kCTFontStyleNameKey = CFSTR("CTFontStyleName");
+const CFStringRef kCTFontUniqueNameKey = CFSTR("CTFontUniqueName");
+const CFStringRef kCTFontVersionNameKey = CFSTR("CTFontVersionName");
+const CFStringRef kCTFontFeaturesAttribute = CFSTR("CTFontFeaturesAttribute");