diff --git a/src/kacceleratormanager.h b/src/kacceleratormanager.h
--- a/src/kacceleratormanager.h
+++ b/src/kacceleratormanager.h
@@ -27,6 +27,8 @@
 class QStringList;
 
 /**
+ * @class KAcceleratorManager kacceleratormanager.h KAcceleratorManager
+ *
  * KDE Accelerator manager.
  *
  * This class can be used to find a valid and working set of
diff --git a/src/kactionmenu.h b/src/kactionmenu.h
--- a/src/kactionmenu.h
+++ b/src/kactionmenu.h
@@ -34,6 +34,8 @@
 class QMenu;
 
 /**
+ * @class KActionMenu kactionmenu.h KActionMenu
+ *
  * A KActionMenu is an action that has several properties specific to holding a
  * sub-menu of other actions.
  *
diff --git a/src/kactionselector.h b/src/kactionselector.h
--- a/src/kactionselector.h
+++ b/src/kactionselector.h
@@ -31,6 +31,8 @@
 class KActionSelectorPrivate;
 
 /**
+    @class KActionSelector kactionselector.h KActionSelector
+
     @short A widget for selecting and arranging actions/objects
 
     This widget allows the user to select from a set of objects and arrange
@@ -72,7 +74,7 @@
     users actions if you need to. See addedToSelection(), removedFromSelection(),
     movedUp() and movedDown()
 
-    \image html kactionselector.png "KDE Action Selector"
+    \image html kactionselector.png "KActionSelector Widget"
 
     @author Anders Lund <anders@alweb.dk>
 */
diff --git a/src/kanimatedbutton.h b/src/kanimatedbutton.h
--- a/src/kanimatedbutton.h
+++ b/src/kanimatedbutton.h
@@ -23,6 +23,8 @@
 #include <QToolButton>
 
 /**
+ * @class KAnimatedButton kanimatedbutton.h KAnimatedButton
+ *
  * @short An extended version of QToolButton which can display an animation.
  *
  * This widget extends QToolButton with the ability to display an animation.
diff --git a/src/kassistantdialog.h b/src/kassistantdialog.h
--- a/src/kassistantdialog.h
+++ b/src/kassistantdialog.h
@@ -24,6 +24,8 @@
 #include <kwidgetsaddons_export.h>
 
 /**
+ * @class KAssistantDialog kassistantdialog.h KAssistantDialog
+ *
  * This class provides a framework for assistant dialogs.
  *
  * An assistant dialog consists of a sequence of pages.
@@ -38,7 +40,7 @@
  * The functions next() and back() are virtual and may be reimplemented to
  * override the default actions of the next and back buttons.
  *
- * \image html kassistantdialog.png "KDE Assistant Dialog"
+ * \image html kassistantdialog.png "KAssistantDialog"
  *
  * @author Olivier Goffart <ogoffart at kde.org>
  */
diff --git a/src/kcapacitybar.h b/src/kcapacitybar.h
--- a/src/kcapacitybar.h
+++ b/src/kcapacitybar.h
@@ -28,6 +28,8 @@
 class QPaintEvent;
 
 /**
+  * @class KCapacityBar kcapacitybar.h KCapacityBar
+  *
   * @brief This widget shows a bar which is filled to show the level of usage of
   *        a certain device.
   *
@@ -37,7 +39,7 @@
   *
   * @since 4.2
   *
-  * \image html kcapacitybar.png "KDE Capacity Bar"
+  * \image html kcapacitybar.png "KCapacityBar Widget"
   *
   * @author Rafael Fernández López <ereslibre@kde.org>
   */
diff --git a/src/kcharselect.h b/src/kcharselect.h
--- a/src/kcharselect.h
+++ b/src/kcharselect.h
@@ -30,12 +30,14 @@
 class QUrl;
 
 /**
+ * @class KCharSelect kcharselect.h KCharSelect
+ *
  * @short Character selection widget
  *
  * This widget allows the user to select a character of a
  * specified font and to browse Unicode information
  *
- * \image html kcharselect.png "Character Selection Widget"
+ * \image html kcharselect.png "KCharSelect Widget"
  *
  * You can specify the font whose characters should be displayed via
  * setCurrentFont(). Using the Controls argument in the contructor
diff --git a/src/kcollapsiblegroupbox.h b/src/kcollapsiblegroupbox.h
--- a/src/kcollapsiblegroupbox.h
+++ b/src/kcollapsiblegroupbox.h
@@ -28,7 +28,7 @@
 class KCollapsibleGroupBoxPrivate;
 
 /**
- * @class KCollapsibleGroupBox
+ * @class KCollapsibleGroupBox kcollapsiblegroupbox.h KCollapsibleGroupBox
  *
  * A groupbox featuring a clickable header and arrow indicator that can be
  * expanded and collapsed to reveal the contents.
diff --git a/src/kcolorbutton.h b/src/kcolorbutton.h
--- a/src/kcolorbutton.h
+++ b/src/kcolorbutton.h
@@ -26,13 +26,15 @@
 
 class KColorButtonPrivate;
 /**
+* @class KColorButton kcolorbutton.h KColorButton
+*
 * @short A pushbutton to display or allow user selection of a color.
 *
 * This widget can be used to display or allow user selection of a color.
 *
 * @see QColorDialog
 *
-* \image html kcolorbutton.png "KDE Color Button"
+* \image html kcolorbutton.png "KColorButton Widget"
 */
 class KWIDGETSADDONS_EXPORT KColorButton : public QPushButton
 {
diff --git a/src/kcolorcombo.h b/src/kcolorcombo.h
--- a/src/kcolorcombo.h
+++ b/src/kcolorcombo.h
@@ -34,12 +34,14 @@
 class KColorComboPrivate;
 
 /**
+ * @class KColorCombo kcolorcombo.h KColorCombo
+ *
  * Combobox for colors.
  *
  * The combobox provides some preset colors to be selected, and an entry to
  * select a custom color using a color dialog.
  *
- * \image html kcolorcombo.png "KDE Color Combo Box"
+ * \image html kcolorcombo.png "KColorCombo Widget"
  */
 class KWIDGETSADDONS_EXPORT KColorCombo : public QComboBox
 {
diff --git a/src/kcolumnresizer.h b/src/kcolumnresizer.h
--- a/src/kcolumnresizer.h
+++ b/src/kcolumnresizer.h
@@ -33,6 +33,8 @@
 class KColumnResizerPrivate;
 
 /**
+ * @class KColumnResizer kcolumnresizer.h KColumnResizer
+ *
  * @short Maintains consistent column sizes across layouts
  *
  * KColumnResizer is a helper class which can force columns of different layouts
diff --git a/src/kcursor.h b/src/kcursor.h
--- a/src/kcursor.h
+++ b/src/kcursor.h
@@ -27,6 +27,8 @@
 class QWidget;
 
 /**
+ * @class KCursor kcursor.h KCursor
+ *
  * The KCursor class provides a set of static
  * convenience methods for auto-hiding cursors on widgets.
  */
diff --git a/src/kdatecombobox.h b/src/kdatecombobox.h
--- a/src/kdatecombobox.h
+++ b/src/kdatecombobox.h
@@ -27,6 +27,9 @@
 
 class KDateComboBoxPrivate;
 
+/**
+ * @class KDateComboBox kdatecombobox.h KDateComboBox
+ */
 class KWIDGETSADDONS_EXPORT KDateComboBox : public QComboBox
 {
     Q_OBJECT
diff --git a/src/kdatepicker.h b/src/kdatepicker.h
--- a/src/kdatepicker.h
+++ b/src/kdatepicker.h
@@ -31,6 +31,8 @@
 class KDateTable;
 
 /**
+ * @class KDatePicker kdatepicker.h KDatePicker
+ *
  * @short A date selection widget.
  *
  * Provides a widget for calendar date input.
@@ -44,7 +46,7 @@
  *     to select a date directly by entering numbers like 19990101
  *     or 990101.
  *
- * \image html kdatepicker.png "KDE Date Widget"
+ * \image html kdatepicker.png "KDatePicker Widget"
  *
  *     @author Tim Gilman, Mirko Boehm
  *
diff --git a/src/kdatetimeedit.h b/src/kdatetimeedit.h
--- a/src/kdatetimeedit.h
+++ b/src/kdatetimeedit.h
@@ -28,6 +28,9 @@
 
 class KDateTimeEditPrivate;
 
+/**
+ * @class KDateTimeEdit kdatetimeedit.h KDateTimeEdit
+ */
 class KWIDGETSADDONS_EXPORT KDateTimeEdit : public QWidget
 {
     Q_OBJECT
diff --git a/src/kdragwidgetdecorator.h b/src/kdragwidgetdecorator.h
--- a/src/kdragwidgetdecorator.h
+++ b/src/kdragwidgetdecorator.h
@@ -93,6 +93,8 @@
 };
 
 /**
+ * @class KDragWidgetDecorator kdragwidgetdecorator.h KDragWidgetDecorator
+ *
  * @brief A decorator which adds drag-support to widgets
  *
  * This is a decorator using an event filter to implement drag-support
diff --git a/src/kdualaction.h b/src/kdualaction.h
--- a/src/kdualaction.h
+++ b/src/kdualaction.h
@@ -28,6 +28,8 @@
 class KGuiItem;
 
 /**
+ * @class KDualAction kdualaction.h KDualAction
+ *
  * @short An action which can alternate between two texts/icons when triggered.
  *
  * KDualAction should be used when you want to create an action which alternate
diff --git a/src/keditlistwidget.h b/src/keditlistwidget.h
--- a/src/keditlistwidget.h
+++ b/src/keditlistwidget.h
@@ -33,14 +33,16 @@
 
 class KEditListWidgetPrivate;
 /**
+ * @class KEditListWidget keditlistwidget.h KEditListWidget
+ *
  * An editable listbox
  *
  * This class provides an editable listbox, this means
  * a listbox which is accompanied by a line edit to enter new
  * items into the listbox and pushbuttons to add and remove
  * items from the listbox and two buttons to move items up and down.
  *
- * \image html keditlistbox.png "KDE Edit List Box Widget"
+ * \image html keditlistbox.png "KEditListWidget"
  *
  * @since 4.6
  */
diff --git a/src/kfontaction.h b/src/kfontaction.h
--- a/src/kfontaction.h
+++ b/src/kfontaction.h
@@ -30,6 +30,8 @@
 #include <kselectaction.h>
 
 /**
+ * @class KFontAction kfontaction.h KFontAction
+ *
  * An action to select a font family.
  * On a toolbar this will show a combobox with all the fonts on the system.
  */
diff --git a/src/kfontchooser.h b/src/kfontchooser.h
--- a/src/kfontchooser.h
+++ b/src/kfontchooser.h
@@ -31,14 +31,16 @@
 class QStringList;
 
 /**
+ * @class KFontChooser kfontchooser.h KFontChooser
+ *
  * @short A font selection widget.
  *
  * While KFontChooser as an ordinary widget can be embedded in
  * custom dialogs and therefore is very flexible, in most cases
  * it is preferable to use the convenience functions in
  * QFontDialog.
  *
- * \image html kfontchooser.png "KDE Font Chooser Widget"
+ * \image html kfontchooser.png "KFontChooser Widget"
  *
  * @see KFontRequester
  *
diff --git a/src/kfontrequester.h b/src/kfontrequester.h
--- a/src/kfontrequester.h
+++ b/src/kfontrequester.h
@@ -30,13 +30,15 @@
 class QPushButton;
 
 /**
+ * @class KFontRequester kfontrequester.h KFontRequester
+ *
  * This class provides a widget with a lineedit and a button, which invokes
  * a font dialog (QFontDialog).
  *
  * The lineedit provides a preview of the selected font. The preview text can
  * be customized. You can also have the font dialog show only the fixed fonts.
  *
- * \image html kfontrequester.png "KDE Font Requester"
+ * \image html kfontrequester.png "KFontRequester"
  *
  * @author Nadeem Hasan <nhasan@kde.org>
  *
diff --git a/src/kfontsizeaction.h b/src/kfontsizeaction.h
--- a/src/kfontsizeaction.h
+++ b/src/kfontsizeaction.h
@@ -30,6 +30,8 @@
 #include <kselectaction.h>
 
 /**
+ * @class KFontSizeAction kfontsizeaction.h KFontSizeAction
+ *
  * An action to allow changing of the font size.
  * This action will be shown as a combobox on a toolbar with a proper set of font sizes.
  */
diff --git a/src/kguiitem.h b/src/kguiitem.h
--- a/src/kguiitem.h
+++ b/src/kguiitem.h
@@ -31,6 +31,8 @@
 class QPushButton;
 
 /**
+ * @class KGuiItem kguiitem.h KGuiItem
+ *
  * @short An abstract class for GUI data such as ToolTip and Icon.
  *
  * @author Holger Freyther <freyher@yahoo.com>
diff --git a/src/kled.h b/src/kled.h
--- a/src/kled.h
+++ b/src/kled.h
@@ -27,6 +27,8 @@
 class QColor;
 
 /**
+ * @class KLed kled.h KLed
+ *
  * @short An LED widget.
  *
  * Displays a round or rectangular light emitting diode.
@@ -37,7 +39,7 @@
  * It may display itself in a performant flat view, a round view with
  * light spot or a round view sunken in the screen.
  *
- * \image html kled.png "KDE LED Widget"
+ * \image html kled.png "KLed Widget"
  *
  * @author Joerg Habenicht, Richard J. Moore (rich@kde.org) 1998, 1999
  */
diff --git a/src/kmessagebox.h b/src/kmessagebox.h
--- a/src/kmessagebox.h
+++ b/src/kmessagebox.h
@@ -48,7 +48,7 @@
  * be plaintext or richtext. If the text is plaintext, a newline-character
  * may be used to indicate the end of a paragraph.
  *
- * \image html kmessagebox.png "KDE Message Box (using questionYesNo())"
+ * \image html kmessagebox.png "KMessageBox (using questionYesNo())"
  *
  * @author Waldo Bastian (bastian@kde.org)
  */
diff --git a/src/kmessagewidget.h b/src/kmessagewidget.h
--- a/src/kmessagewidget.h
+++ b/src/kmessagewidget.h
@@ -28,6 +28,8 @@
 class KMessageWidgetPrivate;
 
 /**
+ * @class KMessageWidget kmessagewidget.h KMessageWidget
+ *
  * @short A widget to provide feedback or propose opportunistic interactions.
  *
  * KMessageWidget can be used to provide inline positive or negative
diff --git a/src/kmimetypechooser.h b/src/kmimetypechooser.h
--- a/src/kmimetypechooser.h
+++ b/src/kmimetypechooser.h
@@ -26,6 +26,8 @@
 class QTreeWidgetItem;
 
 /**
+ * @class KMimeTypeChooser kmimetypechooser.h KMimeTypeChooser
+ *
  * This widget provides a checkable list of all available mimetypes,
  * and a list of selected ones, as well as a corresponding list of file
  * extensions, an optional text and an optional edit button (not working yet).
@@ -87,6 +89,8 @@
 };
 
 /**
+  * @class KMimeTypeChooserDialog kmimetypechooser.h KMimeTypeChooserDialog
+  *
   * @short A Dialog to choose some mimetypes.
   * Provides a checkable tree list of mimetypes, with icons and optinally
   * comments and patterns, and an (optional) button to display the KDE mimetype
diff --git a/src/kmultitabbar.h b/src/kmultitabbar.h
--- a/src/kmultitabbar.h
+++ b/src/kmultitabbar.h
@@ -43,14 +43,16 @@
 class KMultiTabBarInternal;
 
 /**
+ * @class KMultiTabBar kmultitabbar.h KMultiTabBar
+ *
  * A Widget for horizontal and vertical tabs.
  * (Note that in Qt4, QTabBar can be vertical as well)
  *
  * It is possible to add normal buttons to the top/left
  * The handling if only one tab at a time or multiple tabs
  * should be raisable is left to the "user".
  *
- * \image html kmultitabbar.png "KDE Multi Tab Bar Widget"
+ * \image html kmultitabbar.png "KMultiTabBar Widget"
  *
  * @author Joseph Wenninger
  */
@@ -190,6 +192,8 @@
 };
 
 /**
+ * @class KMultiTabBarButton kmultitabbar.h KMultiTabBarButton
+ *
  * Use KMultiTabBar::appendButton to append a button, which creates a KMultiTabBarButton instance
  */
 class KWIDGETSADDONS_EXPORT KMultiTabBarButton: public QPushButton
@@ -231,6 +235,8 @@
 };
 
 /**
+ * @class KMultiTabBarTab kmultitabbar.h KMultiTabBarTab
+ *
  * Use KMultiTabBar::appendTab to append a tab, which creates a KMultiTabBarTab instance
  */
 class KWIDGETSADDONS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
diff --git a/src/knewpassworddialog.h b/src/knewpassworddialog.h
--- a/src/knewpassworddialog.h
+++ b/src/knewpassworddialog.h
@@ -29,6 +29,8 @@
 class QWidget;
 
 /**
+ * @class KNewPasswordDialog knewpassworddialog.h KNewPasswordDialog
+ *
  * @short A password input dialog.
  *
  * This dialog asks the user to enter a new password.
@@ -57,7 +59,7 @@
  *      setPassword( dlg.password() );
  * \endcode
  *
- * \image html knewpassworddialog.png "KDE New Password Dialog"
+ * \image html knewpassworddialog.png "KNewPasswordDialog"
  *
  * @author Geert Jansen <jansen@kde.org>
  * @author Olivier Goffart <ogoffart@kde.org>
diff --git a/src/knewpasswordwidget.h b/src/knewpasswordwidget.h
--- a/src/knewpasswordwidget.h
+++ b/src/knewpasswordwidget.h
@@ -28,6 +28,8 @@
 #include <kwidgetsaddons_export.h>
 
 /**
+ * @class KNewPasswordWidget knewpasswordwidget.h KNewPasswordWidget
+ *
  * @short A password input widget.
  *
  * This widget allows the user to enter a new password.
diff --git a/src/kpagedialog.h b/src/kpagedialog.h
--- a/src/kpagedialog.h
+++ b/src/kpagedialog.h
@@ -32,6 +32,8 @@
 class KPageDialogPrivate;
 
 /**
+ * @class KPageDialog kpagedialog.h KPageDialog
+ *
  * @short A dialog base class which can handle multiple pages.
  *
  * This class provides a dialog base class which handles multiple
diff --git a/src/kpagemodel.h b/src/kpagemodel.h
--- a/src/kpagemodel.h
+++ b/src/kpagemodel.h
@@ -29,6 +29,8 @@
 class KPageModelPrivate;
 
 /**
+ *  @class KPageModel kpagemodel.h KPageModel
+ *
  *  @short A base class for a model used by KPageView.
  *
  *  This class is an abstract base class which must be used to
diff --git a/src/kpageview.h b/src/kpageview.h
--- a/src/kpageview.h
+++ b/src/kpageview.h
@@ -35,6 +35,8 @@
 class QAbstractItemModel;
 
 /**
+ * @class KPageView kpageview.h KPageView
+ *
  * @short A base class which can handle multiple pages.
  *
  * This class provides a widget base class which handles multiple
diff --git a/src/kpagewidget.h b/src/kpagewidget.h
--- a/src/kpagewidget.h
+++ b/src/kpagewidget.h
@@ -28,6 +28,8 @@
 
 class KPageWidgetPrivate;
 /**
+ * @class KPageWidget kpagewidget.h KPageWidget
+ *
  * @short Page widget with many layouts (faces).
  * @see KPageView with hierarchical page model.
  *
diff --git a/src/kpagewidgetmodel.h b/src/kpagewidgetmodel.h
--- a/src/kpagewidgetmodel.h
+++ b/src/kpagewidgetmodel.h
@@ -27,6 +27,8 @@
 class QWidget;
 
 /**
+ * @class KPageWidgetItem kpagewidgetmodel.h KPageWidgetItem
+ *
  * KPageWidgetItem is used by @ref KPageWidget and represents
  * a page.
  *
@@ -180,6 +182,8 @@
 class KPageWidgetModelPrivate;
 
 /**
+ * @class KPageWidgetModel kpagewidgetmodel.h KPageWidgetModel
+ *
  * This page model is used by @see KPageWidget to provide
  * a hierarchical layout of pages.
  */
diff --git a/src/kpassworddialog.h b/src/kpassworddialog.h
--- a/src/kpassworddialog.h
+++ b/src/kpassworddialog.h
@@ -28,6 +28,8 @@
 #include <kwidgetsaddons_export.h>
 
 /**
+ * @class KPasswordDialog kpassworddialog.h KPasswordDialog
+ *
  * A dialog for requesting a password and optionaly a login from the end user.
  *
  * \section usage Usage Example
@@ -52,7 +54,7 @@
  *  use( dlg.username() , dlg.password() );
  * \endcode
  *
- * \image html kpassworddialog.png "KDE Password Dialog"
+ * \image html kpassworddialog.png "KPasswordDialog"
  *
  * @short dialog for requesting login and password from the end user
  */
diff --git a/src/kpixmapregionselectordialog.h b/src/kpixmapregionselectordialog.h
--- a/src/kpixmapregionselectordialog.h
+++ b/src/kpixmapregionselectordialog.h
@@ -29,6 +29,8 @@
 class QImage;
 
 /**
+ * @class KPixmapRegionSelectorDialog kpixmapregionselectordialog.h KPixmapRegionSelectorDialog
+ *
  * A dialog that uses a KPixmapRegionSelectorWidget to allow the user
  * to select a region of an image. If you want to use special features
  * like forcing the selected area to have a fixed aspect ratio, you can use
@@ -39,7 +41,7 @@
  * for the user to select a region of an image, and just care about the selected
  * image.
  *
- * \image html kpixmapregionselectordialog.png "KDE Pixmap Region Selector Dialog"
+ * \image html kpixmapregionselectordialog.png "KPixmapRegionSelectorDialog"
  *
  * @author Antonio Larrosa <larrosa@kde.org>
  */
diff --git a/src/kpixmapregionselectorwidget.h b/src/kpixmapregionselectorwidget.h
--- a/src/kpixmapregionselectorwidget.h
+++ b/src/kpixmapregionselectorwidget.h
@@ -28,15 +28,17 @@
 class QMenu;
 
 /**
+ * @class KPixmapRegionSelectorWidget kpixmapregionselectorwidget.h KPixmapRegionSelectorWidget
+ *
  * KPixmapRegionSelectorWidget is a widget that shows a picture and provides the
  * user with a friendly way to select a rectangular subregion of the pixmap.
  *
  * NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
  * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
  * This is because kdepim has to remain backwards compatible.  Any changes
  * to either file should be made to the other.
  *
- * \image html kpixmapregionselectorwidget.png "KDE Pixmap Region Selector"
+ * \image html kpixmapregionselectorwidget.png "KPixmapRegionSelectorWidget"
  *
  * @author Antonio Larrosa <larrosa@kde.org>
  */
diff --git a/src/kpopupframe.h b/src/kpopupframe.h
--- a/src/kpopupframe.h
+++ b/src/kpopupframe.h
@@ -27,6 +27,8 @@
 #include <QFrame>
 
 /**
+ * @class KPopupFrame kpopupframe.h KPopupFrame
+ *
  * Frame with popup menu behavior.
  * @author Tim Gilman, Mirko Boehm
  */
diff --git a/src/kratingpainter.h b/src/kratingpainter.h
--- a/src/kratingpainter.h
+++ b/src/kratingpainter.h
@@ -32,6 +32,8 @@
 class QRect;
 
 /**
+ * \class KRatingPainter kratingpainter.h KRatingPainter
+ *
  * \brief Utility class that draws a row of stars for a rating value.
  *
  * The KRatingPainter also allows to determine a rating value from
diff --git a/src/kratingwidget.h b/src/kratingwidget.h
--- a/src/kratingwidget.h
+++ b/src/kratingwidget.h
@@ -26,7 +26,7 @@
 #include <kwidgetsaddons_export.h>
 
 /**
- * \class KRatingWidget kratingwidget.h KDE/KRatingWidget
+ * \class KRatingWidget kratingwidget.h KRatingWidget
  *
  * \brief Displays a rating value as a row of pixmaps.
  *
diff --git a/src/kruler.h b/src/kruler.h
--- a/src/kruler.h
+++ b/src/kruler.h
@@ -26,6 +26,8 @@
 #include <QAbstractSlider>
 
 /**
+ * @class KRuler kruler.h KRuler
+ *
  * A ruler widget.
  *
  * The vertical ruler looks similar to this:
@@ -54,7 +56,7 @@
  *
  * To receive mouse clicks or mouse moves, the class has to be overloaded.
  *
- * \image html kruler.png "KDE Ruler Widget"
+ * \image html kruler.png "KRuler Widget"
  *
  * @short A ruler widget.
  * @author Jörg Habenicht
diff --git a/src/kselectaction.h b/src/kselectaction.h
--- a/src/kselectaction.h
+++ b/src/kselectaction.h
@@ -39,6 +39,8 @@
 class KSelectActionPrivate;
 
 /**
+ *  @class KSelectAction kselectaction.h KSelectAction
+ *
  *  @short Action for selecting one of several items
  *
  *  Action for selecting one of several items.
diff --git a/src/kselector.h b/src/kselector.h
--- a/src/kselector.h
+++ b/src/kselector.h
@@ -30,6 +30,8 @@
 #include <QWidget>
 
 /**
+ * @class KSelector kselector.h KSelector
+ *
  * KSelector is the base class for other widgets which
  * provides the ability to choose from a one-dimensional
  * range of values. An example is the KGradientSelector
@@ -121,11 +123,13 @@
 };
 
 /**
+ * @class KGradientSelector kselector.h KGradientSelector
+ *
  * The KGradientSelector widget allows the user to choose
  * from a one-dimensional range of colors which is given as a
  * gradient between two colors provided by the programmer.
  *
- * \image html kgradientselector.png "KDE Gradient Selector Widget"
+ * \image html kgradientselector.png "KGradientSelector Widget"
  *
  **/
 class KWIDGETSADDONS_EXPORT KGradientSelector : public KSelector
diff --git a/src/kseparator.h b/src/kseparator.h
--- a/src/kseparator.h
+++ b/src/kseparator.h
@@ -24,10 +24,12 @@
 #include <QFrame>
 
 /**
+ * @class KSeparator kseparator.h KSeparator
+ *
  * Standard horizontal or vertical separator.
  *
- * \image html kseparator-horizontal.png "KDE Separator with horizontal orientation"
- * \image html kseparator-vertical.png "KDE Separator with vertical orientation"
+ * \image html kseparator-horizontal.png "KSeparator Widget with horizontal orientation"
+ * \image html kseparator-vertical.png "KSeparator Widget with vertical orientation"
  *
  * @author Michael Roth <mroth@wirlweb.de>
  */
diff --git a/src/ksplittercollapserbutton.h b/src/ksplittercollapserbutton.h
--- a/src/ksplittercollapserbutton.h
+++ b/src/ksplittercollapserbutton.h
@@ -30,6 +30,8 @@
 class QSplitter;
 
 /**
+ * @class KSplitterCollapserButton ksplittercollapserbutton.h KSplitterCollapserButton
+ *
  * A button which appears on the side of a splitter handle and allows easy
  * collapsing of the widget on the opposite side
  * @since 5.5
diff --git a/src/ksqueezedtextlabel.h b/src/ksqueezedtextlabel.h
--- a/src/ksqueezedtextlabel.h
+++ b/src/ksqueezedtextlabel.h
@@ -25,6 +25,8 @@
 class KSqueezedTextLabelPrivate;
 
 /**
+ * @class KSqueezedTextLabel ksqueezedtextlabel.h KSqueezedTextLabel
+ *
  * @short A replacement for QLabel that squeezes its text
  *
  * A label class that squeezes its text into the label
diff --git a/src/ktimecombobox.h b/src/ktimecombobox.h
--- a/src/ktimecombobox.h
+++ b/src/ktimecombobox.h
@@ -27,6 +27,9 @@
 
 class KTimeComboBoxPrivate;
 
+/**
+ * @class KTimeComboBox ktimecombobox.h KTimeComboBox
+ */
 class KWIDGETSADDONS_EXPORT KTimeComboBox : public QComboBox
 {
     Q_OBJECT
diff --git a/src/ktitlewidget.h b/src/ktitlewidget.h
--- a/src/ktitlewidget.h
+++ b/src/ktitlewidget.h
@@ -24,6 +24,8 @@
 #include <QWidget>
 
 /**
+ * @class KTitleWidget ktitlewidget.h KTitleWidget
+ *
  * @short Standard title widget.
  *
  * This class provides a widget often used for dialog titles.
diff --git a/src/ktoggleaction.h b/src/ktoggleaction.h
--- a/src/ktoggleaction.h
+++ b/src/ktoggleaction.h
@@ -34,6 +34,8 @@
 class KGuiItem;
 
 /**
+ *  @class KToggleAction ktoggleaction.h KToggleAction
+ *
  *  @short Checkbox like action.
  *
  *  This action provides two states: checked or not.
diff --git a/src/ktogglefullscreenaction.h b/src/ktogglefullscreenaction.h
--- a/src/ktogglefullscreenaction.h
+++ b/src/ktogglefullscreenaction.h
@@ -30,6 +30,8 @@
 #include <ktoggleaction.h>
 
 /**
+ * @class KToggleFullScreenAction ktogglefullscreenaction.h KToggleFullScreenAction
+ *
  * An action for switching between to/from full screen mode. Note that
  * QWidget::isFullScreen() may reflect the new or the old state
  * depending on how the action was triggered (by the application or
diff --git a/src/ktoolbarlabelaction.h b/src/ktoolbarlabelaction.h
--- a/src/ktoolbarlabelaction.h
+++ b/src/ktoolbarlabelaction.h
@@ -24,6 +24,8 @@
 #include <kwidgetsaddons_export.h>
 
 /**
+ * @class KToolBarLabelAction ktoolbarlabelaction.h KToolBarLabelAction
+ *
  * @short Class to display a label in a toolbar.
  *
  * KToolBarLabelAction is a convenience class for displaying a label in a
diff --git a/src/ktoolbarpopupaction.h b/src/ktoolbarpopupaction.h
--- a/src/ktoolbarpopupaction.h
+++ b/src/ktoolbarpopupaction.h
@@ -34,6 +34,8 @@
 class QMenu;
 
 /**
+ * @class KToolBarPopupAction ktoolbarpopupaction.h KToolBarPopupAction
+ *
  * This action is a normal action everywhere, except in a toolbar
  * where it also has a popupmenu (optionally delayed). This action is designed
  * for history actions (back/forward, undo/redo) and for any other action
diff --git a/src/ktoolbarspaceraction.h b/src/ktoolbarspaceraction.h
--- a/src/ktoolbarspaceraction.h
+++ b/src/ktoolbarspaceraction.h
@@ -24,6 +24,8 @@
 #include <kwidgetsaddons_export.h>
 
 /**
+ * @class KToolBarSpacerAction ktoolbarspaceraction.h KToolBarSpacerAction
+ *
  * An extension to KAction which allows for adding a spacer item into a
  * QToolBar / KToolBar.
  *
diff --git a/src/ktooltipwidget.h b/src/ktooltipwidget.h
--- a/src/ktooltipwidget.h
+++ b/src/ktooltipwidget.h
@@ -24,6 +24,8 @@
 #include <QWidget>
 
 /**
+ * @class KToolTipWidget ktooltipwidget.h KToolTipWidget
+ *
  * @brief A tooltip that contains a QWidget.
  *
  * This widget allows to show a tooltip that contains another widget.
diff --git a/src/kurllabel.h b/src/kurllabel.h
--- a/src/kurllabel.h
+++ b/src/kurllabel.h
@@ -30,6 +30,8 @@
 class QCursor;
 
 /**
+ * @class KUrlLabel kurllabel.h KUrlLabel
+ *
  * @short A drop-in replacement for QLabel that displays hyperlinks.
  *
  * KUrlLabel is a drop-in replacement for QLabel that handles text
@@ -61,7 +63,7 @@
  * signal leftClickedUrl() would be emitted with "http://www.home.com/~me"
  * as its argument.
  *
- * \image html kurllabel.png "KDE URL Label"
+ * \image html kurllabel.png "KUrlLabel Widget"
  *
  * @author Kurt Granroth <granroth@kde.org> (Interface)
  * @author Peter Putzer <putzer@kde.org> (Rewrite)
diff --git a/src/kviewstateserializer.h b/src/kviewstateserializer.h
--- a/src/kviewstateserializer.h
+++ b/src/kviewstateserializer.h
@@ -37,6 +37,8 @@
 class KViewStateSerializerPrivate;
 
 /**
+  @class KViewStateSerializer kviewstateserializer.h KViewStateSerializer
+
   @brief Object for saving and restoring state in QTreeViews and QItemSelectionModels
 
   Implement the indexFromConfigString and indexToConfigString methods to
diff --git a/src/kxyselector.h b/src/kxyselector.h
--- a/src/kxyselector.h
+++ b/src/kxyselector.h
@@ -26,6 +26,8 @@
 #include <QPixmap>
 
 /**
+ * @class KXYSelector kxyselector.h KXYSelector
+ *
  * KXYSelector is the base class for other widgets which
  * provides the ability to choose from a two-dimensional
  * range of values. The currently chosen value is indicated
diff --git a/src/lineediturldropeventfilter.h b/src/lineediturldropeventfilter.h
--- a/src/lineediturldropeventfilter.h
+++ b/src/lineediturldropeventfilter.h
@@ -26,6 +26,8 @@
 #include <QObject>
 
 /**
+ * @class LineEditUrlDropEventFilter lineediturldropeventfilter.h LineEditUrlDropEventFilter
+ *
  * This class provides an event filter that can be installed on a QLineEdit
  * or a subclass of it (KLineEdit) to make it handle url drop events so
  * when a url is dropped it replaces the existing content.