diff -urN rtai-24.1.11/arch/i386/rtai.c trace-rtai-24.1.11/arch/i386/rtai.c
--- rtai-24.1.11/arch/i386/rtai.c	2003-02-06 11:22:54.000000000 -0500
+++ trace-rtai-24.1.11/arch/i386/rtai.c	2003-11-26 17:50:05.000000000 -0500
@@ -146,7 +146,7 @@
 the macros as-is. Otherwise the system crashes ... You've been warned. K.Y. */
 void trace_true_global_irq_entry(struct fill_t fill, int irq)
 {
-        TRACE_RTAI_GLOBAL_IRQ_ENTRY(irq,0);
+        TRACE_RTAI_GLOBAL_IRQ_ENTRY(irq);
 }
 void trace_true_global_irq_exit(void)
 {
@@ -162,7 +162,7 @@
 }
 void trace_true_trap_entry(int err)
 {
-        TRACE_RTAI_TRAP_ENTRY(err,0);
+        TRACE_RTAI_TRAP_ENTRY(err, 0);
 }
 void trace_true_trap_exit(void)
 {
diff -urN rtai-24.1.11/include/rtai_trace.h trace-rtai-24.1.11/include/rtai_trace.h
--- rtai-24.1.11/include/rtai_trace.h	2003-01-03 03:51:24.000000000 -0500
+++ trace-rtai-24.1.11/include/rtai_trace.h	2003-11-27 23:41:14.000000000 -0500
@@ -139,7 +139,7 @@
   uint8_t   trap_id;        /* Trap number */
   uint32_t  address;        /* Address where trap occured */
 } LTT_PACKED_STRUCT trace_rtai_trap_entry;
-#define TRACE_RTAI_TRAP_ENTRY(ID,ADDR) \
+#define TRACE_RTAI_TRAP_ENTRY(ID, ADDR) \
            do \
            {\
            trace_rtai_trap_entry trap_event;\
@@ -176,7 +176,7 @@
            } while(0)
 #endif
 #if CONFIG_PPC
-#define TRACE_RTAI_SRQ_ENTRY(ID,KERNEL) \
+#define TRACE_RTAI_SRQ_ENTRY(ID, KERNEL) \
            do \
            {\
            trace_rtai_srq_entry srq_entry;\
@@ -575,11 +575,11 @@
 #define RT_TRACE_EVENT(ID, DATA)
 #define TRACE_RTAI_MOUNT()
 #define TRACE_RTAI_UMOUNT()
-#define TRACE_RTAI_GLOBAL_IRQ_ENTRY(ID,X)
+#define TRACE_RTAI_GLOBAL_IRQ_ENTRY(ID)
 #define TRACE_RTAI_GLOBAL_IRQ_EXIT()
 #define TRACE_RTAI_OWN_IRQ_ENTRY(ID)
 #define TRACE_RTAI_OWN_IRQ_EXIT()
-#define TRACE_RTAI_TRAP_ENTRY(ID,ADDR)
+#define TRACE_RTAI_TRAP_ENTRY(ID, ADDR)
 #define TRACE_RTAI_TRAP_EXIT()
 #if CONFIG_PPC
 #define TRACE_RTAI_SRQ_ENTRY(ID,KERNEL)
diff -urN rtai-24.1.11/upscheduler/rtai_sched.c.ml trace-rtai-24.1.11/upscheduler/rtai_sched.c.ml
--- rtai-24.1.11/upscheduler/rtai_sched.c.ml	2003-03-03 06:17:56.000000000 -0500
+++ trace-rtai-24.1.11/upscheduler/rtai_sched.c.ml	2003-11-27 23:19:11.000000000 -0500
@@ -3083,7 +3083,9 @@
 
 	CHK_MBX_MAGIC;
 
+	/* Undeclared in rtai_trace.h
 	TRACE_RTAI_MBX(TRACE_RTAI_EV_MBX_OVRWR_SEND, mbx, msg_size, 0);
+	*/
 
 	hard_save_flags_and_cli(flags);
 	if (mbx->sndsem.count) {
diff -urN rtai-24.1.11/usposix/Makefile trace-rtai-24.1.11/usposix/Makefile
--- rtai-24.1.11/usposix/Makefile	2003-03-06 05:05:13.000000000 -0500
+++ trace-rtai-24.1.11/usposix/Makefile	2003-11-27 23:32:56.000000000 -0500
@@ -1,4 +1,4 @@
-EXTRA_USER_CFLAGS := -I
+EXTRA_USER_CFLAGS := -I$(LINUXDIR)/include
 EXTRA_USER_LIBS := -lpthread
 
 A_TARG  = condtest mqtest jepplin
diff -urN rtai-24.1.11/usposix/mqtest.c trace-rtai-24.1.11/usposix/mqtest.c
--- rtai-24.1.11/usposix/mqtest.c	2003-03-03 06:14:59.000000000 -0500
+++ trace-rtai-24.1.11/usposix/mqtest.c	2003-11-27 23:38:53.000000000 -0500
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
+#include <asm/atomic.h>
+
 #define KEEP_STATIC_INLINE
 #include <rtai_usp_posix.h>
 #include <rtai_pqueue.h>