diff --git a/std/room/comm.c b/std/room/comm.c
index 3f2516b..ae57bbe 100644
--- a/std/room/comm.c
+++ b/std/room/comm.c
@@ -1,8 +1,6 @@
 #pragma strict_types, save_types, pedantic, range_check
 #pragma no_clone
 
-inherit "/std/living/comm_structs";
-
 #include <thing/language.h>
 
 // Per Default nur an alle Items im Inventar weiterleiten.
@@ -32,7 +30,7 @@
 // Wrapper fuer ReceiveMsg()
 
 public varargs int* ReceiveSay(string msg, string prefix,
-  struct msg_s sense_blocked)
+  struct wave_s sense_blocked)
 {
   // Das muss schon hier passieren, damit previous_object() stimmt
   if(!prefix)
@@ -44,7 +42,7 @@
   return _minarr(res);
 }
 
-public varargs int* ReceiveMultisense(struct msg_s msgs,
+public varargs int* ReceiveMultisense(struct wave_s msgs,
   string action, int commontypes)
 {
   int** res = ({int**})all_inventory()->ReceiveMultisense(msgs, action, commontypes);