diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 2a6882955f..23ffc3c06a 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -33,7 +33,7 @@
 #define QUEUE_LENGTH 16 /* MUST be a power of 2 */
 #define QUEUE_LENGTH_MASK (QUEUE_LENGTH - 1)
 
-/* System defined message ID's, occupying the top 8 bits of the event ID */
+/* System defined message ID's, occupying the top 5 bits of the event ID */
 #define SYS_EVENT                 (long)0x80000000 /* SYS events are negative */
 #define SYS_USB_CONNECTED         ((SYS_EVENT | ((long)1 << 27)))
 #define SYS_USB_CONNECTED_ACK     ((SYS_EVENT | ((long)2 << 27)))
@@ -77,7 +77,9 @@ struct event_queue
     struct thread_entry *thread;
     unsigned int read;
     unsigned int write;
+#ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
     struct queue_sender_list *send;
+#endif
 };
 
 struct mutex
@@ -107,12 +109,12 @@ int tick_add_task(void (*f)(void));
 int tick_remove_task(void (*f)(void));
 
 extern void queue_init(struct event_queue *q, bool register_queue);
-extern void queue_enable_queue_send(struct event_queue *q, struct queue_sender_list *send);
 extern void queue_delete(struct event_queue *q);
 extern void queue_wait(struct event_queue *q, struct event *ev);
 extern void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks);
 extern void queue_post(struct event_queue *q, long id, void *data);
 #ifdef HAVE_EXTENDED_MESSAGING_AND_NAME
+extern void queue_enable_queue_send(struct event_queue *q, struct queue_sender_list *send);
 extern void * queue_send(struct event_queue *q, long id, void *data);
 extern void queue_reply(struct event_queue *q, void *retval);
 extern bool queue_in_queue_send(struct event_queue *q);