  	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
  #ifdef __MACOS__
  	_macruby_init();
-@@ -1437,6 +1426,8 @@
+@@ -1437,6 +1428,8 @@
  static int thread_set_raised();
  static int thread_reset_raised();
  

 static void scope_dup _((struct SCOPE *));
 
 #define POP_SCOPE() 			\
@@ -1391,8 +1380,8 @@
 	rb_call_inits();
 	ruby_class = rb_cObject;
 	ruby_frame->self = ruby_top_self;

 #define WAIT_FD		(1<<0)
 #define WAIT_SELECT	(1<<1)
 #define WAIT_TIME	(1<<2)
@@ -9781,70 +9769,10 @@
 # endif
 #endif
 
-/* typedef struct thread * rb_thread_t; */
-
-struct thread {
-    struct thread *next, *prev;
-    rb_jmpbuf_t context;
