Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision 7ab28b697c1c3460fce45f2159a8445203638b34)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 038110a589408bf46d4605add1b1379fca5d94af)
@@ -34,5 +34,5 @@
 extern "C" {
 	//--------------------
-	// Basic thread managenemt
+	// Basic thread management
 	CRunner * cfathread_create( void (*main)( CRunner * ) ) {
 		return new( main );
Index: libcfa/src/concurrency/clib/cfathread.h
===================================================================
--- libcfa/src/concurrency/clib/cfathread.h	(revision 7ab28b697c1c3460fce45f2159a8445203638b34)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision 038110a589408bf46d4605add1b1379fca5d94af)
@@ -17,5 +17,5 @@
 #include "invoke.h"
 
-#if defined(__cforall) || defined(__cpluplus)
+#if defined(__cforall) || defined(__cplusplus)
 extern "C" {
 #endif
@@ -39,5 +39,5 @@
 
 
-#if defined(__cforall) || defined(__cpluplus)
+#if defined(__cforall) || defined(__cplusplus)
 }
 #endif
Index: libcfa/src/concurrency/invoke.h
===================================================================
--- libcfa/src/concurrency/invoke.h	(revision 7ab28b697c1c3460fce45f2159a8445203638b34)
+++ libcfa/src/concurrency/invoke.h	(revision 038110a589408bf46d4605add1b1379fca5d94af)
@@ -93,4 +93,6 @@
 
 	};
+	// Wrapper for gdb
+	struct cfathread_coroutine_t { $coroutine debug; };
 
 	static inline struct __stack_t * __get_stack( struct $coroutine * cor ) {
@@ -129,4 +131,6 @@
 		struct __condition_node_t * dtor_node;
 	};
+	// Wrapper for gdb
+	struct cfathread_monitor_t { $monitor debug; };
 
 	struct __monitor_group_t {
@@ -198,4 +202,6 @@
 		#endif
 	};
+	// Wrapper for gdb
+	struct cfathread_thread_t { $thread debug; };
 
 	#ifdef __CFA_DEBUG__