diff --git a/aos/common/queue.h b/aos/common/queue.h
index f1d9f82..9f6bc9d 100644
--- a/aos/common/queue.h
+++ b/aos/common/queue.h
@@ -11,9 +11,6 @@
 
 #include "aos/common/time.h"
 #include "aos/common/macros.h"
-#ifndef SWIG
-#include "aos/common/queue_types.h"
-#endif  // SWIG
 #ifndef USE_UNSAFE
 #include "aos/linux_code/ipc_lib/queue.h"
 #endif  // USE_UNSAFE
@@ -21,6 +18,8 @@
 
 namespace aos {
 
+class MessageType;
+
 // This class is a base class for all messages sent over queues.
 class Message {
  public:
@@ -50,9 +49,7 @@
   // Writes the contents of the message to the provided buffer.
   size_t Print(char *buffer, int length) const;
 
-#ifndef SWIG
-  const MessageType &GetType() const;
-#endif  // SWIG
+  const MessageType *GetType() const;
 };
 
 template <class T> class Queue;