diff --git a/RootHelper/Makefile b/RootHelper/Makefile
index b9c936f..d13b04f 100644
--- a/RootHelper/Makefile
+++ b/RootHelper/Makefile
@@ -1,4 +1,4 @@
-TARGET := iphone:clang:16.4:14.0
+TARGET := iphone:clang:16.5:14.0
 ARCHS = arm64
 
 TARGET_CODESIGN = ../Exploits/fastPathSign/fastPathSign
diff --git a/RootHelper/devmode.m b/RootHelper/devmode.m
index 241ad0e..0281947 100644
--- a/RootHelper/devmode.m
+++ b/RootHelper/devmode.m
@@ -1,16 +1,11 @@
 @import Foundation;
 
+#ifndef __XPC_H__
 // Types
 typedef NSObject* xpc_object_t;
 typedef xpc_object_t xpc_connection_t;
 typedef void (^xpc_handler_t)(xpc_object_t object);
 
-// Serialization
-extern CFTypeRef _CFXPCCreateCFObjectFromXPCObject(xpc_object_t xpcattrs);
-extern xpc_object_t _CFXPCCreateXPCObjectFromCFObject(CFTypeRef attrs);
-extern xpc_object_t _CFXPCCreateXPCMessageWithCFObject(CFTypeRef obj);
-extern CFTypeRef _CFXPCCreateCFObjectFromXPCMessage(xpc_object_t obj);
-
 // Communication
 extern xpc_connection_t xpc_connection_create_mach_service(const char* name, dispatch_queue_t targetq, uint64_t flags);
 extern void xpc_connection_set_event_handler(xpc_connection_t connection, xpc_handler_t handler);
@@ -18,6 +13,14 @@ extern void xpc_connection_resume(xpc_connection_t connection);
 extern void xpc_connection_send_message_with_reply(xpc_connection_t connection, xpc_object_t message, dispatch_queue_t replyq, xpc_handler_t handler);
 extern xpc_object_t xpc_connection_send_message_with_reply_sync(xpc_connection_t connection, xpc_object_t message);
 extern xpc_object_t xpc_dictionary_get_value(xpc_object_t xdict, const char *key);
+#endif
+
+// Serialization
+extern CFTypeRef _CFXPCCreateCFObjectFromXPCObject(xpc_object_t xpcattrs);
+extern xpc_object_t _CFXPCCreateXPCObjectFromCFObject(CFTypeRef attrs);
+extern xpc_object_t _CFXPCCreateXPCMessageWithCFObject(CFTypeRef obj);
+extern CFTypeRef _CFXPCCreateCFObjectFromXPCMessage(xpc_object_t obj);
+
 
 typedef enum {
     kAMFIActionArm = 0,     // Trigger a prompt asking the user to enable developer mode on the next reboot
diff --git a/TrollHelper/Makefile b/TrollHelper/Makefile
index 812e4e3..af6c001 100644
--- a/TrollHelper/Makefile
+++ b/TrollHelper/Makefile
@@ -1,7 +1,7 @@
 export EMBEDDED_ROOT_HELPER ?= 0
 export LEGACY_CT_BUG ?= 0
 
-TARGET := iphone:clang:16.4:14.0
+TARGET := iphone:clang:16.5:14.0
 INSTALL_TARGET_PROCESSES = TrollStorePersistenceHelper
 
 ifdef CUSTOM_ARCHS
diff --git a/TrollStore/Makefile b/TrollStore/Makefile
index 8bf3ab7..216041a 100644
--- a/TrollStore/Makefile
+++ b/TrollStore/Makefile
@@ -1,4 +1,4 @@
-TARGET := iphone:clang:16.4:14.0
+TARGET := iphone:clang:16.5:14.0
 INSTALL_TARGET_PROCESSES = TrollStore
 ARCHS = arm64