--- ./common/queue.h.orig	2020-12-25 14:28:38.964740689 -0500
+++ ./common/queue.h	2020-12-25 14:30:07.029365739 -0500
@@ -24,16 +24,14 @@
 #include <sys/time.h>
 #include <semaphore.h>
 
-struct _unicap_queue
+typedef struct _unicap_queue
 {
       sem_t sema;
       sem_t *psema;
 
       void * data;
       struct _unicap_queue *next;
-} unicap_queue;
-
-typedef struct _unicap_queue unicap_queue_t;
+} unicap_queue_t;
 
 __HIDDEN__ void ucutil_insert_back_queue( unicap_queue_t *queue, unicap_queue_t *entry );
 __HIDDEN__ void ucutil_insert_front_queue( unicap_queue_t *queue, unicap_queue_t *entry );
--- ./cpi/euvccam/queue.h.orig	2020-12-25 14:38:10.371271598 -0500
+++ ./cpi/euvccam/queue.h	2020-12-25 14:42:51.931180130 -0500
@@ -24,7 +24,7 @@
 #include <sys/time.h>
 #include <semaphore.h>
 
-struct _unicap_queue
+typedef struct _unicap_queue
 {
 		sem_t sema;
 		sem_t *psema;
@@ -34,9 +34,7 @@
 
 		void * data;
 		struct _unicap_queue *next;
-} unicap_queue;
-
-typedef struct _unicap_queue unicap_queue_t;
+} unicap_queue_t;
 
 void _init_queue( struct _unicap_queue *queue );
 void _destroy_queue( struct _unicap_queue *queue );