Index: vim/syntax/objc.vim
==================================================================
--- vim/syntax/objc.vim
+++ vim/syntax/objc.vim
@@ -30,13 +30,13 @@
 
 " ObjC keywords, types, type qualifiers etc.
 syn keyword objcStatement	self super _cmd
 syn keyword objcType		id Class SEL IMP BOOL nonnull nullable
 syn keyword objcTypeModifier	bycopy in out inout oneway OF_GENERIC OF_INLINE
-syn keyword objcTypeModifier	OF_CONST_FUNC OF_NO_RETURN OF_KINDOF
-syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER OF_NONNULL
-syn keyword objcTypeModifier	OF_NULLABLE OF_NULLABLE_PROPERTY
+syn keyword objcTypeModifier	OF_CONST_FUNC OF_NO_RETURN
+syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER
+syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
 syn keyword objcConstant	nil Nil
 
 " Match the ObjC #import directive (like C's #include)
 syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
 syn match  objcImported display contained "<[-_0-9a-zA-Z.\/]*>"
@@ -124,11 +124,12 @@
 syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t
 syn keyword objcType of_byte_order_t of_range_t of_point_t of_dimension_t
 syn keyword objcType of_mutex_t of_rectangle_t of_string_encoding_t
 syn keyword objcType of_time_interval_t of_resolver_result_t
 syn keyword objcType of_udp_socket_address_t of_offset_t of_stat_t of_socket_t
-syn keyword objcType of_spinlock_t
+syn keyword objcType of_spinlock_t of_options_parser_option_t
+syn keyword objcType of_http_request_method_t of_http_request_protocol_version_t
 syn keyword objcConstant YES NO TRUE FALSE
 
 syn region objcImp start='@implementation' end='@end' transparent
 syn region objcHeader start='@interface' end='@end' transparent