diff --git a/includes/rts/storage/TSO.h b/includes/rts/storage/TSO.h
index 744ab2b519169054ff8a11831040cb2a6fe2cb46..9bddfcafbd1a9dfc6b69355bb49b5132e5ad2cbe 100644
--- a/includes/rts/storage/TSO.h
+++ b/includes/rts/storage/TSO.h
@@ -230,7 +230,7 @@ void dirty_STACK (Capability *cap, StgStack *stack);
         ----------------------------------------------------------------------
         NotBlocked             END_TSO_QUEUE        runnable_queue, or running
 
-        BlockedOnBlackHole     the BLACKHOLE        blackhole_queue
+        BlockedOnBlackHole     MessageBlackHole *   TSO->bq
 
         BlockedOnMVar          the MVAR             the MVAR's queue
 
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
index dff129b94836b4392575f5b4d66787ddffcc3eec..5f5e0d6a1da648044946c20246461f20f4f7d9d5 100644
--- a/includes/stg/MiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -462,7 +462,6 @@ extern StgWord rts_breakpoint_io_action[];
 // Schedule.c
 extern StgWord RTS_VAR(blocked_queue_hd), RTS_VAR(blocked_queue_tl);
 extern StgWord RTS_VAR(sleeping_queue);
-extern StgWord RTS_VAR(blackhole_queue);
 extern StgWord RTS_VAR(sched_mutex);
 
 // Apply.cmm
diff --git a/rts/Schedule.h b/rts/Schedule.h
index 67e2fdc011442cb0c3ff10262eaa142312fbd1d7..b6fbed48e3814eea0da2aa5d8afd73a5201dc7b5 100644
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -97,7 +97,6 @@ extern volatile StgWord recent_activity;
 /* Thread queues.
  * Locks required  : sched_mutex
  */
-extern  StgTSO *blackhole_queue;
 #if !defined(THREADED_RTS)
 extern  StgTSO *blocked_queue_hd, *blocked_queue_tl;
 extern  StgTSO *sleeping_queue;
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index c815b9993ed256126e1adf1f9d8754fd82827721..45bb54ca65c41e8952e92cf2f1442d8358db8b61 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -1046,7 +1046,6 @@ dirty_TVAR(Capability *cap, StgTVar *p)
 // Setting a TSO's link field with a write barrier.
 // It is *not* necessary to call this function when
 //    * setting the link field to END_TSO_QUEUE
-//    * putting a TSO on the blackhole_queue
 //    * setting the link field of the currently running TSO, as it
 //      will already be dirty.
 void