diff --git a/interface/dynarray.h b/interface/dynarray.h
index cb5bdb6462..f538fa4b23 100644
--- a/interface/dynarray.h
+++ b/interface/dynarray.h
@@ -7,7 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /**
-    @class wxArrayT
     @wxheader{dynarray.h}
 
     This section describes the so called @e dynamic arrays. This is a C
@@ -149,7 +148,7 @@
     @library{wxbase}
     @category{FIXME}
 
-    @see @ref overview_wxcontaineroverview, wxListT(), wxVectorT()
+    @see @ref overview_container, wxList<T>, wxVector<T>
 */
 class wxArray<T>
 {
diff --git a/interface/list.h b/interface/list.h
index 6988f7feb8..3d491d35b3 100644
--- a/interface/list.h
+++ b/interface/list.h
@@ -7,7 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /**
-    @class wxListT
     @wxheader{list.h}
 
     The wxListT class provides linked list functionality. It has been rewritten
diff --git a/interface/msgqueue.h b/interface/msgqueue.h
index c506eeb576..2b23de8b9a 100644
--- a/interface/msgqueue.h
+++ b/interface/msgqueue.h
@@ -7,7 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /**
-    @class wxMessageQueueT
     @wxheader{msgqueue.h}
 
     wxMessageQueue allows passing messages between threads.
diff --git a/interface/object.h b/interface/object.h
index 6f5d346565..b8795b34a7 100644
--- a/interface/object.h
+++ b/interface/object.h
@@ -302,7 +302,6 @@ public:
 
 
 /**
-    @class wxObjectDataPtrT
     @wxheader{object.h}
 
     This is helper template class primarily written to avoid memory
diff --git a/interface/ptr_scpd.h b/interface/ptr_scpd.h
index 830ede02a3..340242a0da 100644
--- a/interface/ptr_scpd.h
+++ b/interface/ptr_scpd.h
@@ -173,7 +173,6 @@ public:
 
 
 /**
-    @class wxScopedPtrT
     @wxheader{ptr_scpd.h}
 
     A scoped pointer template class. It is the template version of
diff --git a/interface/weakref.h b/interface/weakref.h
index c72bd896e4..02decd556f 100644
--- a/interface/weakref.h
+++ b/interface/weakref.h
@@ -7,7 +7,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /**
-    @class wxWeakRefDynamicT
     @wxheader{weakref.h}
 
     wxWeakRefDynamicT is a template class for weak references that is used in
@@ -40,7 +39,6 @@ public:
 
 
 /**
-    @class wxWeakRefT
     @wxheader{weakref.h}
 
     wxWeakRef is a template class for weak references to wxWidgets objects,