@@ -59,11 +59,11 @@
 #define NO  false
 
 typedef struct objc_class *Class;
 typedef struct objc_object *id;
 typedef const struct objc_selector *SEL;
-typedef struct objc_ivar *Ivar;
+typedef const struct objc_ivar *Ivar;
 #if !defined(__wii__) && !defined(__amigaos__)
 typedef bool BOOL;
 #endif
 typedef id _Nullable (*IMP)(id _Nonnull, SEL _Nonnull, ...);
 typedef void (*objc_uncaught_exception_handler_t)(id _Nullable);
@@ -269,11 +269,12 @@
  * Used by the compiler, but can also be called manually.
  *
  * These declarations are also required to prevent Clang's implicit
  * declarations which include __declspec(dllimport) on Windows.
  */
-extern void __objc_exec_class(void *_Nonnull module);
+struct objc_module;
+extern void __objc_exec_class(struct objc_module *_Nonnull module);
 extern IMP _Nonnull objc_msg_lookup(id _Nullable object, SEL _Nonnull selector);
 extern IMP _Nonnull objc_msg_lookup_stret(id _Nullable object,
     SEL _Nonnull selector);
 extern IMP _Nonnull objc_msg_lookup_super(struct objc_super *_Nonnull super,
     SEL _Nonnull selector);