diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
index 2f7ec02b3..59c96ff1d 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -12,7 +12,7 @@
 	IMP         imp;
 }
 -initWithResponder: (id) responder :(SEL)message;
--(void) respond: (id) caller;
+-(void) respond: (void *) caller_data;
 -(BOOL) matchResponder: (id) responder :(SEL)message;
 @end
 
@@ -23,7 +23,7 @@
 -init;
 -addListener: (id) responder :(SEL)message;
 -removeListener: (id) responder :(SEL)message;
--(void) respond: (id) caller;
+-(void) respond: (void *) caller_data;
 @end
 
 #endif//__qwaq_listener_h
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 26e6f28c5..12d786de3 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -16,9 +16,9 @@
 	return self;
 }
 
--(void)respond: (id) caller
+-(void)respond: (void *) caller_data
 {
-	imp (responder, message, caller);
+	imp (responder, message, caller_data);
 }
 
 -(BOOL) matchResponder: (id) responder :(SEL)message
@@ -58,9 +58,9 @@
 	return self;
 }
 
--(void)respond: (id) caller
+-(void)respond: (void *) caller_data
 {
 	[listeners makeObjectsPerformSelector: @selector (respond:)
-							   withObject: caller];
+							   withObject: caller_data];
 }
 @end