diff --git a/CoreText/CTFeatureSetting.ml b/CoreText/CTFeatureSetting.ml
index 6403dfa4..84fe02ad 100644
--- a/CoreText/CTFeatureSetting.ml
+++ b/CoreText/CTFeatureSetting.ml
@@ -5,12 +5,12 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctfeaturesetting?language=objc}CTFeatureSetting} *)
 
+let self = get_class "CTFeatureSetting"
+
 let count self = msg_send ~self ~cmd:(selector "count") ~typ:(returning ullong)
 let dealloc self = msg_send ~self ~cmd:(selector "dealloc") ~typ:(returning void)
 let initWithDictionary x self = msg_send ~self ~cmd:(selector "initWithDictionary:") ~typ:(id @-> returning id) x
diff --git a/CoreText/CTFeatureSettingClass.ml b/CoreText/CTFeatureSettingClass.ml
deleted file mode 100644
index 38c0852c..00000000
--- a/CoreText/CTFeatureSettingClass.ml
+++ /dev/null
@@ -1,15 +0,0 @@
-(* auto-generated, do not modify *)
-
-open Runtime
-open Objc
-
-[@@@ocaml.warning "-33"]
-open CoreFoundation
-open CoreFoundation_globals
-open CoreGraphics
-open CoreGraphics_globals
-
-(** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctfeaturesetting?language=objc}CTFeatureSetting} *)
-
-let self = get_class "CTFeatureSetting"
-
diff --git a/CoreText/CTFont.ml b/CoreText/CTFont.ml
index ff67b9dc..99490429 100644
--- a/CoreText/CTFont.ml
+++ b/CoreText/CTFont.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTFont] structure typ = structure "CTFont"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctfont?language=objc}CTFont} *)
\ No newline at end of file
diff --git a/CoreText/CTFontCollection.ml b/CoreText/CTFontCollection.ml
index 99d7ce2e..63eeb57f 100644
--- a/CoreText/CTFontCollection.ml
+++ b/CoreText/CTFontCollection.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTFontCollection] structure typ = structure "CTFontCollection"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctfontcollection?language=objc}CTFontCollection} *)
\ No newline at end of file
diff --git a/CoreText/CTFontDescriptor.ml b/CoreText/CTFontDescriptor.ml
index bd8b75c2..0876935a 100644
--- a/CoreText/CTFontDescriptor.ml
+++ b/CoreText/CTFontDescriptor.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTFontDescriptor] structure typ = structure "CTFontDescriptor"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctfontdescriptor?language=objc}CTFontDescriptor} *)
\ No newline at end of file
diff --git a/CoreText/CTFrame.ml b/CoreText/CTFrame.ml
index 384e6a38..2f524a68 100644
--- a/CoreText/CTFrame.ml
+++ b/CoreText/CTFrame.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTFrame] structure typ = structure "CTFrame"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctframe?language=objc}CTFrame} *)
\ No newline at end of file
diff --git a/CoreText/CTFramesetter.ml b/CoreText/CTFramesetter.ml
index c06f4f0f..93599f78 100644
--- a/CoreText/CTFramesetter.ml
+++ b/CoreText/CTFramesetter.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTFramesetter] structure typ = structure "CTFramesetter"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctframesetter?language=objc}CTFramesetter} *)
\ No newline at end of file
diff --git a/CoreText/CTGlyphInfo.ml b/CoreText/CTGlyphInfo.ml
index d95d48bd..6933feb7 100644
--- a/CoreText/CTGlyphInfo.ml
+++ b/CoreText/CTGlyphInfo.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTGlyphInfo] structure typ = structure "CTGlyphInfo"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctglyphinfo?language=objc}CTGlyphInfo} *)
\ No newline at end of file
diff --git a/CoreText/CTGlyphStorageInterface.ml b/CoreText/CTGlyphStorageInterface.ml
index 66cd9c77..d615669d 100644
--- a/CoreText/CTGlyphStorageInterface.ml
+++ b/CoreText/CTGlyphStorageInterface.ml
@@ -5,12 +5,12 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctglyphstorageinterface?language=objc}CTGlyphStorageInterface} *)
 
+let self = get_class "CTGlyphStorageInterface"
+
 let createCopy x self = msg_send ~self ~cmd:(selector "createCopy:") ~typ:(void @-> returning (ptr void)) x
 let disposeGlyphStack self = msg_send ~self ~cmd:(selector "disposeGlyphStack") ~typ:(returning void)
 let getCustomAdvance x ~forIndex self = msg_send ~self ~cmd:(selector "getCustomAdvance:forIndex:") ~typ:((ptr CGSize.t) @-> llong @-> returning void) x (LLong.of_int forIndex)
diff --git a/CoreText/CTGlyphStorageInterfaceClass.ml b/CoreText/CTGlyphStorageInterfaceClass.ml
deleted file mode 100644
index 65ceeb35..00000000
--- a/CoreText/CTGlyphStorageInterfaceClass.ml
+++ /dev/null
@@ -1,15 +0,0 @@
-(* auto-generated, do not modify *)
-
-open Runtime
-open Objc
-
-[@@@ocaml.warning "-33"]
-open CoreFoundation
-open CoreFoundation_globals
-open CoreGraphics
-open CoreGraphics_globals
-
-(** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctglyphstorageinterface?language=objc}CTGlyphStorageInterface} *)
-
-let self = get_class "CTGlyphStorageInterface"
-
diff --git a/CoreText/CTLine.ml b/CoreText/CTLine.ml
index 724e3fc5..666d40b7 100644
--- a/CoreText/CTLine.ml
+++ b/CoreText/CTLine.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTLine] structure typ = structure "CTLine"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctline?language=objc}CTLine} *)
\ No newline at end of file
diff --git a/CoreText/CTParagraphStyle.ml b/CoreText/CTParagraphStyle.ml
index 24f7d90f..19c2f5cf 100644
--- a/CoreText/CTParagraphStyle.ml
+++ b/CoreText/CTParagraphStyle.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTParagraphStyle] structure typ = structure "CTParagraphStyle"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctparagraphstyle?language=objc}CTParagraphStyle} *)
\ No newline at end of file
diff --git a/CoreText/CTParagraphStyleSetting.ml b/CoreText/CTParagraphStyleSetting.ml
index 7fe4cb9c..152b8501 100644
--- a/CoreText/CTParagraphStyleSetting.ml
+++ b/CoreText/CTParagraphStyleSetting.ml
@@ -5,9 +5,7 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 let t : [`CTParagraphStyleSetting] structure typ = structure "CTParagraphStyleSetting"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctparagraphstylesetting?language=objc}CTParagraphStyleSetting} *)
@@ -18,6 +16,16 @@ let value = field t "value" (ptr void)
 
 let () = seal t
 
+let init
+    ~spec:spec_v
+    ~valueSize:valueSize_v
+    ?value:(value_v = from_voidp void null)
+    () =
+  let t = make t in
+  setf t spec spec_v;
+  setf t valueSize valueSize_v;
+  setf t value value_v;
+  t
 let spec t = getf t spec
 let valueSize t = getf t valueSize
 let value t = getf t value
diff --git a/CoreText/CTRubyAnnotation.ml b/CoreText/CTRubyAnnotation.ml
index 1b61bc57..43558d53 100644
--- a/CoreText/CTRubyAnnotation.ml
+++ b/CoreText/CTRubyAnnotation.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTRubyAnnotation] structure typ = structure "CTRubyAnnotation"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctrubyannotation?language=objc}CTRubyAnnotation} *)
\ No newline at end of file
diff --git a/CoreText/CTRun.ml b/CoreText/CTRun.ml
index d81f0070..76e6f1cc 100644
--- a/CoreText/CTRun.ml
+++ b/CoreText/CTRun.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTRun] structure typ = structure "CTRun"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctrun?language=objc}CTRun} *)
\ No newline at end of file
diff --git a/CoreText/CTRunDelegate.ml b/CoreText/CTRunDelegate.ml
index a8d5e035..68dd3805 100644
--- a/CoreText/CTRunDelegate.ml
+++ b/CoreText/CTRunDelegate.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTRunDelegate] structure typ = structure "CTRunDelegate"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/ctrundelegate?language=objc}CTRunDelegate} *)
\ No newline at end of file
diff --git a/CoreText/CTRunDelegateCallbacks.ml b/CoreText/CTRunDelegateCallbacks.ml
index e5741385..3f537f15 100644
--- a/CoreText/CTRunDelegateCallbacks.ml
+++ b/CoreText/CTRunDelegateCallbacks.ml
@@ -5,9 +5,7 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 let t : [`CTRunDelegateCallbacks] structure typ = structure "_CTRunDelegateCallbacks"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/_ctrundelegatecallbacks?language=objc}_CTRunDelegateCallbacks} *)
@@ -20,6 +18,20 @@ let getWidth = field t "getWidth" (ptr (ptr void))
 
 let () = seal t
 
+let init
+    ~version:version_v
+    ?dealloc:(dealloc_v = from_voidp (ptr void) null)
+    ?getAscent:(getAscent_v = from_voidp (ptr void) null)
+    ?getDescent:(getDescent_v = from_voidp (ptr void) null)
+    ?getWidth:(getWidth_v = from_voidp (ptr void) null)
+    () =
+  let t = make t in
+  setf t version version_v;
+  setf t dealloc dealloc_v;
+  setf t getAscent getAscent_v;
+  setf t getDescent getDescent_v;
+  setf t getWidth getWidth_v;
+  t
 let version t = getf t version
 let dealloc t = getf t dealloc
 let getAscent t = getf t getAscent
diff --git a/CoreText/CTTextTab.ml b/CoreText/CTTextTab.ml
index a222cdad..8401e827 100644
--- a/CoreText/CTTextTab.ml
+++ b/CoreText/CTTextTab.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTTextTab] structure typ = structure "CTTextTab"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/cttexttab?language=objc}CTTextTab} *)
\ No newline at end of file
diff --git a/CoreText/CTTypesetter.ml b/CoreText/CTTypesetter.ml
index dbfe7f5a..abf0ec8d 100644
--- a/CoreText/CTTypesetter.ml
+++ b/CoreText/CTTypesetter.ml
@@ -3,5 +3,9 @@
 open Runtime
 open Objc
 
+[@@@ocaml.warning "-33"]
+open CoreFoundation
+open CoreGraphics
+
 let t : [`CTTypesetter] structure typ = structure "CTTypesetter"
 (** Apple docs: {{:https://developer.apple.com/documentation/coretext/cttypesetter?language=objc}CTTypesetter} *)
\ No newline at end of file
diff --git a/CoreText/CoreText.ml b/CoreText/CoreText.ml
new file mode 100644
index 00000000..f28277f1
--- /dev/null
+++ b/CoreText/CoreText.ml
@@ -0,0 +1,20 @@
+include CoreText_globals
+include CoreText_fn
+
+module CTFeatureSetting = CTFeatureSetting
+module CTFont = CTFont
+module CTFontCollection = CTFontCollection
+module CTFontDescriptor = CTFontDescriptor
+module CTFrame = CTFrame
+module CTFramesetter = CTFramesetter
+module CTGlyphInfo = CTGlyphInfo
+module CTGlyphStorageInterface = CTGlyphStorageInterface
+module CTLine = CTLine
+module CTParagraphStyle = CTParagraphStyle
+module CTParagraphStyleSetting = CTParagraphStyleSetting
+module CTRubyAnnotation = CTRubyAnnotation
+module CTRun = CTRun
+module CTRunDelegate = CTRunDelegate
+module CTRunDelegateCallbacks = CTRunDelegateCallbacks
+module CTTextTab = CTTextTab
+module CTTypesetter = CTTypesetter
diff --git a/CoreText/CoreText_fn.ml b/CoreText/CoreText_fn.ml
index b159214b..ca8814ef 100644
--- a/CoreText/CoreText_fn.ml
+++ b/CoreText/CoreText_fn.ml
@@ -5,9 +5,7 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 let _CTFontCollectionCopyExclusionDescriptors = Foreign.foreign "CTFontCollectionCopyExclusionDescriptors" ((ptr CTFontCollection.t) @-> returning (ptr CFArray.t))
 let _CTFontCollectionCopyFontAttribute = Foreign.foreign "CTFontCollectionCopyFontAttribute" ((ptr CTFontCollection.t) @-> (ptr CFString.t) @-> uint @-> returning (ptr CFArray.t))
@@ -17,7 +15,7 @@ let _CTFontCollectionCreateCopyWithFontDescriptors = Foreign.foreign "CTFontColl
 let _CTFontCollectionCreateFromAvailableFonts = Foreign.foreign "CTFontCollectionCreateFromAvailableFonts" ((ptr CFDictionary.t) @-> returning (ptr CTFontCollection.t))
 let _CTFontCollectionCreateMatchingFontDescriptors = Foreign.foreign "CTFontCollectionCreateMatchingFontDescriptors" ((ptr CTFontCollection.t) @-> returning (ptr CFArray.t))
 let _CTFontCollectionCreateMatchingFontDescriptorsForFamily = Foreign.foreign "CTFontCollectionCreateMatchingFontDescriptorsForFamily" ((ptr CTFontCollection.t) @-> (ptr CFString.t) @-> (ptr CFDictionary.t) @-> returning (ptr CFArray.t))
-let _CTFontCollectionCreateMatchingFontDescriptorsSortedWithCallback = Foreign.foreign "CTFontCollectionCreateMatchingFontDescriptorsSortedWithCallback" ((ptr CTFontCollection.t) @-> (ptr (ptr void)) @-> (ptr CTFontDescriptor.t) @-> (ptr CTFontDescriptor.t) @-> (ptr void) @-> (ptr void) @-> returning llong)
+let _CTFontCollectionCreateMatchingFontDescriptorsSortedWithCallback = Foreign.foreign "CTFontCollectionCreateMatchingFontDescriptorsSortedWithCallback" ((ptr CTFontCollection.t) @-> Foreign.funptr ((ptr CTFontDescriptor.t) @-> (ptr CTFontDescriptor.t) @-> (ptr void) @-> returning llong) @-> (ptr void) @-> returning (ptr CFArray.t))
 let _CTFontCollectionCreateMatchingFontDescriptorsWithOptions = Foreign.foreign "CTFontCollectionCreateMatchingFontDescriptorsWithOptions" ((ptr CTFontCollection.t) @-> (ptr CFDictionary.t) @-> returning (ptr CFArray.t))
 let _CTFontCollectionCreateMutableCopy = Foreign.foreign "CTFontCollectionCreateMutableCopy" ((ptr CTFontCollection.t) @-> returning (ptr CTFontCollection.t))
 let _CTFontCollectionCreateWithFontDescriptors = Foreign.foreign "CTFontCollectionCreateWithFontDescriptors" ((ptr CFArray.t) @-> (ptr CFDictionary.t) @-> returning (ptr CTFontCollection.t))
@@ -71,7 +69,7 @@ let _CTFontDescriptorCreateMatchingFontDescriptors = Foreign.foreign "CTFontDesc
 let _CTFontDescriptorCreateWithAttributes = Foreign.foreign "CTFontDescriptorCreateWithAttributes" ((ptr CFDictionary.t) @-> returning (ptr CTFontDescriptor.t))
 let _CTFontDescriptorCreateWithNameAndSize = Foreign.foreign "CTFontDescriptorCreateWithNameAndSize" ((ptr CFString.t) @-> double @-> returning (ptr CTFontDescriptor.t))
 let _CTFontDescriptorGetTypeID = Foreign.foreign "CTFontDescriptorGetTypeID" (void @-> returning ullong)
-let _CTFontDescriptorMatchFontDescriptorsWithProgressHandler = Foreign.foreign "CTFontDescriptorMatchFontDescriptorsWithProgressHandler" ((ptr CFArray.t) @-> (ptr CFSet.t) @-> (ptr void) @-> uint @-> (ptr CFDictionary.t) @-> returning bool)
+let _CTFontDescriptorMatchFontDescriptorsWithProgressHandler = Foreign.foreign "CTFontDescriptorMatchFontDescriptorsWithProgressHandler" ((ptr CFArray.t) @-> (ptr CFSet.t) @-> Foreign.funptr (uint @-> (ptr CFDictionary.t) @-> returning bool) @-> returning bool)
 let _CTFontDrawGlyphs = Foreign.foreign "CTFontDrawGlyphs" ((ptr CTFont.t) @-> (ptr ushort) @-> (ptr CGPoint.t) @-> ullong @-> (ptr CGContext.t) @-> returning void)
 let _CTFontGetAdvancesForGlyphs = Foreign.foreign "CTFontGetAdvancesForGlyphs" ((ptr CTFont.t) @-> uint @-> (ptr ushort) @-> (ptr CGSize.t) @-> llong @-> returning double)
 let _CTFontGetAscent = Foreign.foreign "CTFontGetAscent" ((ptr CTFont.t) @-> returning double)
@@ -105,21 +103,21 @@ let _CTFontManagerCopyRegisteredFontDescriptors = Foreign.foreign "CTFontManager
 let _CTFontManagerCreateFontDescriptorFromData = Foreign.foreign "CTFontManagerCreateFontDescriptorFromData" ((ptr CFData.t) @-> returning (ptr CTFontDescriptor.t))
 let _CTFontManagerCreateFontDescriptorsFromData = Foreign.foreign "CTFontManagerCreateFontDescriptorsFromData" ((ptr CFData.t) @-> returning (ptr CFArray.t))
 let _CTFontManagerCreateFontDescriptorsFromURL = Foreign.foreign "CTFontManagerCreateFontDescriptorsFromURL" ((ptr CFURL.t) @-> returning (ptr CFArray.t))
-let _CTFontManagerCreateFontRequestRunLoopSource = Foreign.foreign "CTFontManagerCreateFontRequestRunLoopSource" (llong @-> (ptr void) @-> (ptr CFDictionary.t) @-> int @-> returning (ptr CFArray.t))
+let _CTFontManagerCreateFontRequestRunLoopSource = Foreign.foreign "CTFontManagerCreateFontRequestRunLoopSource" (llong @-> Foreign.funptr ((ptr CFDictionary.t) @-> int @-> returning (ptr CFArray.t)) @-> returning (ptr CFRunLoopSource.t))
 let _CTFontManagerEnableFontDescriptors = Foreign.foreign "CTFontManagerEnableFontDescriptors" ((ptr CFArray.t) @-> bool @-> returning void)
 let _CTFontManagerGetAutoActivationSetting = Foreign.foreign "CTFontManagerGetAutoActivationSetting" ((ptr CFString.t) @-> returning uint)
 let _CTFontManagerGetScopeForURL = Foreign.foreign "CTFontManagerGetScopeForURL" ((ptr CFURL.t) @-> returning uint)
 let _CTFontManagerIsSupportedFont = Foreign.foreign "CTFontManagerIsSupportedFont" ((ptr CFURL.t) @-> returning bool)
-let _CTFontManagerRegisterFontDescriptors = Foreign.foreign "CTFontManagerRegisterFontDescriptors" ((ptr CFArray.t) @-> uint @-> bool @-> (ptr void) @-> (ptr CFArray.t) @-> bool @-> returning bool)
-let _CTFontManagerRegisterFontURLs = Foreign.foreign "CTFontManagerRegisterFontURLs" ((ptr CFArray.t) @-> uint @-> bool @-> (ptr void) @-> (ptr CFArray.t) @-> bool @-> returning bool)
+let _CTFontManagerRegisterFontDescriptors = Foreign.foreign "CTFontManagerRegisterFontDescriptors" ((ptr CFArray.t) @-> uint @-> bool @-> Foreign.funptr ((ptr CFArray.t) @-> bool @-> returning bool) @-> returning void)
+let _CTFontManagerRegisterFontURLs = Foreign.foreign "CTFontManagerRegisterFontURLs" ((ptr CFArray.t) @-> uint @-> bool @-> Foreign.funptr ((ptr CFArray.t) @-> bool @-> returning bool) @-> returning void)
 let _CTFontManagerRegisterFontsForURL = Foreign.foreign "CTFontManagerRegisterFontsForURL" ((ptr CFURL.t) @-> uint @-> (ptr (ptr CFError.t)) @-> returning bool)
 let _CTFontManagerRegisterFontsForURLs = Foreign.foreign "CTFontManagerRegisterFontsForURLs" ((ptr CFArray.t) @-> uint @-> (ptr (ptr CFArray.t)) @-> returning bool)
-let _CTFontManagerRegisterFontsWithAssetNames = Foreign.foreign "CTFontManagerRegisterFontsWithAssetNames" ((ptr CFArray.t) @-> (ptr CFBundle.t) @-> uint @-> bool @-> (ptr void) @-> (ptr CFArray.t) @-> bool @-> returning bool)
+let _CTFontManagerRegisterFontsWithAssetNames = Foreign.foreign "CTFontManagerRegisterFontsWithAssetNames" ((ptr CFArray.t) @-> (ptr CFBundle.t) @-> uint @-> bool @-> Foreign.funptr ((ptr CFArray.t) @-> bool @-> returning bool) @-> returning void)
 let _CTFontManagerRegisterGraphicsFont = Foreign.foreign "CTFontManagerRegisterGraphicsFont" ((ptr CGFont.t) @-> (ptr (ptr CFError.t)) @-> returning bool)
-let _CTFontManagerRequestFonts = Foreign.foreign "CTFontManagerRequestFonts" ((ptr CFArray.t) @-> (ptr void) @-> (ptr CFArray.t) @-> returning void)
+let _CTFontManagerRequestFonts = Foreign.foreign "CTFontManagerRequestFonts" ((ptr CFArray.t) @-> Foreign.funptr ((ptr CFArray.t) @-> returning void) @-> returning void)
 let _CTFontManagerSetAutoActivationSetting = Foreign.foreign "CTFontManagerSetAutoActivationSetting" ((ptr CFString.t) @-> uint @-> returning void)
-let _CTFontManagerUnregisterFontDescriptors = Foreign.foreign "CTFontManagerUnregisterFontDescriptors" ((ptr CFArray.t) @-> uint @-> (ptr void) @-> (ptr CFArray.t) @-> bool @-> returning bool)
-let _CTFontManagerUnregisterFontURLs = Foreign.foreign "CTFontManagerUnregisterFontURLs" ((ptr CFArray.t) @-> uint @-> (ptr void) @-> (ptr CFArray.t) @-> bool @-> returning bool)
+let _CTFontManagerUnregisterFontDescriptors = Foreign.foreign "CTFontManagerUnregisterFontDescriptors" ((ptr CFArray.t) @-> uint @-> Foreign.funptr ((ptr CFArray.t) @-> bool @-> returning bool) @-> returning void)
+let _CTFontManagerUnregisterFontURLs = Foreign.foreign "CTFontManagerUnregisterFontURLs" ((ptr CFArray.t) @-> uint @-> Foreign.funptr ((ptr CFArray.t) @-> bool @-> returning bool) @-> returning void)
 let _CTFontManagerUnregisterFontsForURL = Foreign.foreign "CTFontManagerUnregisterFontsForURL" ((ptr CFURL.t) @-> uint @-> (ptr (ptr CFError.t)) @-> returning bool)
 let _CTFontManagerUnregisterFontsForURLs = Foreign.foreign "CTFontManagerUnregisterFontsForURLs" ((ptr CFArray.t) @-> uint @-> (ptr (ptr CFArray.t)) @-> returning bool)
 let _CTFontManagerUnregisterGraphicsFont = Foreign.foreign "CTFontManagerUnregisterGraphicsFont" ((ptr CGFont.t) @-> (ptr (ptr CFError.t)) @-> returning bool)
@@ -150,7 +148,7 @@ let _CTLineCreateJustifiedLine = Foreign.foreign "CTLineCreateJustifiedLine" ((p
 let _CTLineCreateTruncatedLine = Foreign.foreign "CTLineCreateTruncatedLine" ((ptr CTLine.t) @-> double @-> uint @-> (ptr CTLine.t) @-> returning (ptr CTLine.t))
 let _CTLineCreateWithAttributedString = Foreign.foreign "CTLineCreateWithAttributedString" ((ptr CFAttributedString.t) @-> returning (ptr CTLine.t))
 let _CTLineDraw = Foreign.foreign "CTLineDraw" ((ptr CTLine.t) @-> (ptr CGContext.t) @-> returning void)
-let _CTLineEnumerateCaretOffsets = Foreign.foreign "CTLineEnumerateCaretOffsets" ((ptr CTLine.t) @-> (ptr void) @-> double @-> llong @-> bool @-> (ptr bool) @-> returning void)
+let _CTLineEnumerateCaretOffsets = Foreign.foreign "CTLineEnumerateCaretOffsets" ((ptr CTLine.t) @-> Foreign.funptr (double @-> llong @-> bool @-> (ptr bool) @-> returning void) @-> returning void)
 let _CTLineGetBoundsWithOptions = Foreign.foreign "CTLineGetBoundsWithOptions" ((ptr CTLine.t) @-> ullong @-> returning CGRect.t)
 let _CTLineGetGlyphCount = Foreign.foreign "CTLineGetGlyphCount" ((ptr CTLine.t) @-> returning llong)
 let _CTLineGetGlyphRuns = Foreign.foreign "CTLineGetGlyphRuns" ((ptr CTLine.t) @-> returning (ptr CFArray.t))
diff --git a/CoreText/CoreText_globals.ml b/CoreText/CoreText_globals.ml
index bfb47409..fff3fa1c 100644
--- a/CoreText/CoreText_globals.ml
+++ b/CoreText/CoreText_globals.ml
@@ -5,9 +5,7 @@ open Objc
 
 [@@@ocaml.warning "-33"]
 open CoreFoundation
-open CoreFoundation_globals
 open CoreGraphics
-open CoreGraphics_globals
 
 module CTFontCollectionRef = struct
   let t = (ptr CTFontCollection.t)