Index: libcfa/src/concurrency/alarm.cfa
===================================================================
--- libcfa/src/concurrency/alarm.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/alarm.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 67
 //
+
+#define __cforall_thread__
 
 extern "C" {
Index: libcfa/src/concurrency/coroutine.cfa
===================================================================
--- libcfa/src/concurrency/coroutine.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/coroutine.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "coroutine.hfa"
Index: libcfa/src/concurrency/invoke.c
===================================================================
--- libcfa/src/concurrency/invoke.c	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/invoke.c	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 5
 //
+
+#define __cforall_thread__
 
 #include <stdbool.h>
@@ -31,5 +33,5 @@
 extern void __finish_creation( struct thread_desc * );
 extern void __leave_thread_monitor( struct thread_desc * this );
-extern void disable_interrupts();
+extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 
Index: libcfa/src/concurrency/kernel.cfa
===================================================================
--- libcfa/src/concurrency/kernel.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/kernel.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 25
 //
+
+#define __cforall_thread__
 
 //C Includes
@@ -943,4 +945,10 @@
 	}
 )
+
+//-----------------------------------------------------------------------------
+// Debug
+bool threading_enabled(void) {
+	return true;
+}
 // Local Variables: //
 // mode: c //
Index: libcfa/src/concurrency/kernel_private.hfa
===================================================================
--- libcfa/src/concurrency/kernel_private.hfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/kernel_private.hfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -26,5 +26,5 @@
 
 extern "C" {
-	void disable_interrupts();
+	void disable_interrupts() OPTIONAL_THREAD;
 	void enable_interrupts_noPoll();
 	void enable_interrupts( __cfaabi_dbg_ctx_param );
Index: libcfa/src/concurrency/monitor.cfa
===================================================================
--- libcfa/src/concurrency/monitor.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/monitor.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "monitor.hfa"
Index: libcfa/src/concurrency/mutex.cfa
===================================================================
--- libcfa/src/concurrency/mutex.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/mutex.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -15,4 +15,6 @@
 // Update Count     : 0
 //
+
+#define __cforall_thread__
 
 #include "mutex.hfa"
Index: libcfa/src/concurrency/preemption.cfa
===================================================================
--- libcfa/src/concurrency/preemption.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/preemption.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 37
 //
+
+#define __cforall_thread__
 
 #include "preemption.hfa"
Index: libcfa/src/concurrency/thread.cfa
===================================================================
--- libcfa/src/concurrency/thread.cfa	(revision 3623f9d66220e5e484d994a12524cebac25bff9d)
+++ libcfa/src/concurrency/thread.cfa	(revision 2026bb680ed5d5d8295cce3291a89b31b8ec7de2)
@@ -13,4 +13,6 @@
 // Update Count     : 8
 //
+
+#define __cforall_thread__
 
 #include "thread.hfa"