-/* Kludge alert! Making this visible outside io-layer is broken, but I
- * can't find any w32 call that will let me do this.
- */
-extern void _wapi_thread_signal_self (guint32 exitstatus);
+void wapi_interrupt_thread (gpointer handle);
+void wapi_clear_interruption (void);
+gboolean wapi_thread_set_wait_handle (gpointer handle);
+void wapi_thread_clear_wait_handle (gpointer handle);
+void wapi_self_interrupt (void);
+
+gpointer wapi_prepare_interrupt_thread (gpointer thread_handle);
+void wapi_finish_interrupt_thread (gpointer wait_handle);
+
+gpointer wapi_create_thread_handle (void);
+void wapi_thread_handle_set_exited (gpointer handle, guint32 exitstatus);
+void wapi_ref_thread_handle (gpointer handle);
+gpointer wapi_get_current_thread_handle (void);
+
+char* wapi_current_thread_desc (void);