diff --git a/interface/wx/aboutdlg.h b/interface/wx/aboutdlg.h
index 4d3bf6340f..41719ec269 100644
--- a/interface/wx/aboutdlg.h
+++ b/interface/wx/aboutdlg.h
@@ -45,7 +45,7 @@
     }
     @endcode
 
-    @library{wxadv}
+    @library{wxcore}
     @category{cmndlg,data}
 
     @see wxAboutDialogInfo::SetArtists
diff --git a/interface/wx/activityindicator.h b/interface/wx/activityindicator.h
index 09af16896a..26f9253021 100644
--- a/interface/wx/activityindicator.h
+++ b/interface/wx/activityindicator.h
@@ -15,7 +15,7 @@
 
     @since 3.1.0
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{activityindicator}
  */
diff --git a/interface/wx/addremovectrl.h b/interface/wx/addremovectrl.h
index 67d37fb73c..763d9885b6 100644
--- a/interface/wx/addremovectrl.h
+++ b/interface/wx/addremovectrl.h
@@ -21,7 +21,7 @@
 
     @since 3.1.0
 
-    @library{wxadv}
+    @library{wxcore}
  */
 class wxAddRemoveAdaptor
 {
@@ -134,7 +134,7 @@ public:
 
     @since 3.1.0
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
  */
 class wxAddRemoveCtrl : public wxPanel
diff --git a/interface/wx/animate.h b/interface/wx/animate.h
index f4376a3e29..d8d5e13edb 100644
--- a/interface/wx/animate.h
+++ b/interface/wx/animate.h
@@ -48,7 +48,7 @@ enum wxAnimationType
            flag is given, the control will not change its size
     @endStyleTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
 
     @nativeimpl{wxgtk,wxmsw}
@@ -191,7 +191,7 @@ public:
     On other platforms wxAnimation is always capable of loading both GIF and ANI
     formats (i.e. both @c wxANIMATION_TYPE_GIF and @c wxANIMATION_TYPE_ANI).
 
-    @library{wxadv}
+    @library{wxcore}
     @category{gdi}
 
     @stdobjects
diff --git a/interface/wx/bannerwindow.h b/interface/wx/bannerwindow.h
index 924d422070..ca5454610a 100644
--- a/interface/wx/bannerwindow.h
+++ b/interface/wx/bannerwindow.h
@@ -42,7 +42,7 @@
     This class is currently implemented generically and so looks the same under
     all platforms.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
     @genericAppearance{bannerwindow}
 
diff --git a/interface/wx/bmpcbox.h b/interface/wx/bmpcbox.h
index a11249ea9e..13641fd4e2 100644
--- a/interface/wx/bmpcbox.h
+++ b/interface/wx/bmpcbox.h
@@ -46,7 +46,7 @@
            the combobox.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{bitmapcombobox}
 
diff --git a/interface/wx/calctrl.h b/interface/wx/calctrl.h
index a756e458e3..7c4c579884 100644
--- a/interface/wx/calctrl.h
+++ b/interface/wx/calctrl.h
@@ -40,7 +40,7 @@ enum
 
     The wxCalendarEvent class is used together with wxCalendarCtrl.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 
     @see wxCalendarCtrl
@@ -90,7 +90,7 @@ enum wxCalendarDateBorder
     wxCalendarDateAttr is a custom attributes for a calendar date. The objects
     of this class are used with wxCalendarCtrl.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{data}
 
     @see wxCalendarCtrl
@@ -296,7 +296,7 @@ enum wxCalendarHitTestResult
     @note Changing the selected date will trigger an EVT_CALENDAR_DAY, MONTH or
           YEAR event as well as an EVT_CALENDAR_SEL_CHANGED event.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{calendarctrl}
 
diff --git a/interface/wx/commandlinkbutton.h b/interface/wx/commandlinkbutton.h
index 3ec07d0556..16f56d5a64 100644
--- a/interface/wx/commandlinkbutton.h
+++ b/interface/wx/commandlinkbutton.h
@@ -37,7 +37,7 @@
 
     @since 2.9.2
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{commandlinkbutton}
 
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 161ff7372c..e3e10e25fc 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -90,7 +90,7 @@
     @endcode
 
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewModel : public wxRefCounter
@@ -428,7 +428,7 @@ protected:
     Base class with abstract API for wxDataViewIndexListModel and
     wxDataViewVirtualListModel.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewListModel : public wxDataViewModel
@@ -528,7 +528,7 @@ public:
 
     @see wxDataViewListModel for the API.
     
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 
@@ -603,7 +603,7 @@ public:
 
     @see wxDataViewListModel for the API.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 
@@ -677,7 +677,7 @@ public:
 
     Attributes are currently only supported by wxDataViewTextRendererText.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewItemAttr
@@ -789,7 +789,7 @@ public:
     the invisible root. Examples for this are wxDataViewModel::GetParent and
     wxDataViewModel::GetChildren.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewItem
@@ -990,7 +990,7 @@ wxEventType wxEVT_DATAVIEW_ITEM_DROP;
     you can call wxSystemThemedControl::EnableSystemTheme with @c false
     argument to disable this.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl,dvc}
     @appearance{dataviewctrl}
 */
@@ -1728,7 +1728,7 @@ public:
     its notification interface.
     See the documentation of that class for further information.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewModelNotifier
@@ -1911,7 +1911,7 @@ enum wxDataViewCellRenderState
     by the constructors respectively controls what actions the cell data allows
     and how the renderer should display its contents in a cell.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewRenderer : public wxObject
@@ -2083,7 +2083,7 @@ protected:
     wxDataViewTextRenderer is used for rendering text.
     It supports in-place editing if desired.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewTextRenderer : public wxDataViewRenderer
@@ -2160,7 +2160,7 @@ public:
     shift operator.
 
     @see wxDataViewCheckIconTextRenderer
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewIconTextRenderer : public wxDataViewRenderer
@@ -2196,7 +2196,7 @@ public:
     in the corresponding sample.
 
     @see wxDataViewIconTextRenderer, wxDataViewToggleRenderer
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
     @since 3.1.1
  */
@@ -2240,7 +2240,7 @@ public:
 
     This class is used by wxDataViewCtrl to render progress bars.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewProgressRenderer : public wxDataViewRenderer
@@ -2271,7 +2271,7 @@ public:
     It supports modifying the values in-place by using a wxSpinCtrl.
     The renderer only support variants of type @e long.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewSpinRenderer : public wxDataViewCustomRenderer
@@ -2297,7 +2297,7 @@ public:
     radio buttons.
 
     @see wxDataViewCheckIconTextRenderer
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewToggleRenderer : public wxDataViewRenderer
@@ -2347,7 +2347,7 @@ public:
 
     @see wxDataViewChoiceByIndexRenderer
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 
@@ -2380,7 +2380,7 @@ public:
     index, i.e. an @c int, in the variant used by its SetValue() and
     GetValue().
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewChoiceByIndexRenderer : public wxDataViewChoiceRenderer
@@ -2400,7 +2400,7 @@ public:
 
     This class is used by wxDataViewCtrl to render calendar controls.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewDateRenderer : public wxDataViewRenderer
@@ -2442,7 +2442,7 @@ public:
     Note that a special event handler will be pushed onto that editor control
     which handles @e \<ENTER\> and focus out events in order to end the editing.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewCustomRenderer : public wxDataViewRenderer
@@ -2655,7 +2655,7 @@ protected:
 
     This class is used by wxDataViewCtrl to render bitmap controls.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewBitmapRenderer : public wxDataViewRenderer
@@ -2698,7 +2698,7 @@ enum wxDataViewColumnFlags
 
     An instance of wxDataViewRenderer is used by this class to render its data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewColumn : public wxSettableHeaderColumn
@@ -2807,7 +2807,7 @@ public:
     See wxDataViewCtrl for the list of events emitted by this class.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl,dvc}
 
     @since 2.9.0
@@ -3131,7 +3131,7 @@ public:
     See wxDataViewCtrl for the list of events emitted by this class.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl,dvc}
 
     @since 2.9.0
@@ -3337,7 +3337,7 @@ public:
     used directly without having to derive any class from it, but it is
     mostly used from within wxDataViewListCtrl.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 
@@ -3491,7 +3491,7 @@ public:
     which they were added, or its Compare() function to compare the items using
     some other criterion, e.g. alphabetically.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewTreeStore : public wxDataViewModel
@@ -3630,7 +3630,7 @@ public:
     wxDataViewIconText is used by wxDataViewIconTextRenderer for data transfer.
     This class can be converted to and from a wxVariant.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewIconText : public wxObject
@@ -3714,7 +3714,7 @@ public:
            Process a @c wxEVT_DATAVIEW_CACHE_HINT event.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events,dvc}
 */
 class wxDataViewEvent : public wxNotifyEvent
@@ -3950,7 +3950,7 @@ public:
 
     @since 3.1.1
 
-    @library{wxadv}
+    @library{wxcore}
     @category{dvc}
 */
 class wxDataViewValueAdjuster
diff --git a/interface/wx/datectrl.h b/interface/wx/datectrl.h
index 3d516acee6..26ba06496f 100644
--- a/interface/wx/datectrl.h
+++ b/interface/wx/datectrl.h
@@ -74,7 +74,7 @@ enum
            control.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{pickers}
     @appearance{datepickerctrl}
 
diff --git a/interface/wx/dateevt.h b/interface/wx/dateevt.h
index 5ff704eabb..e17b829bd8 100644
--- a/interface/wx/dateevt.h
+++ b/interface/wx/dateevt.h
@@ -12,7 +12,7 @@
     with wxDatePickerCtrl. It also serves as a base class
     for wxCalendarEvent.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 */
 class wxDateEvent : public wxCommandEvent
diff --git a/interface/wx/editlbox.h b/interface/wx/editlbox.h
index b039c8a58a..4152c63ea2 100644
--- a/interface/wx/editlbox.h
+++ b/interface/wx/editlbox.h
@@ -32,7 +32,7 @@
 
     The control uses a wxListCtrl internally and emit its events.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
 
     @see wxListBox, wxListCtrl
diff --git a/interface/wx/generic/aboutdlgg.h b/interface/wx/generic/aboutdlgg.h
index c0fbab297b..a59ad33b0d 100644
--- a/interface/wx/generic/aboutdlgg.h
+++ b/interface/wx/generic/aboutdlgg.h
@@ -43,7 +43,7 @@
     }
     @endcode
 
-    @library{wxadv}
+    @library{wxcore}
     @category{cmndlg}
 
     @see wxAboutDialogInfo
diff --git a/interface/wx/generic/helpext.h b/interface/wx/generic/helpext.h
index 2ad0ebc377..2f0174f2ca 100644
--- a/interface/wx/generic/helpext.h
+++ b/interface/wx/generic/helpext.h
@@ -26,7 +26,7 @@
 
     Lines starting with ';' will be ignored.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{help}
 
     @see wxHelpController
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index c5926dbff0..955f7aa5ac 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -20,7 +20,7 @@
     This is an abstract class, and you will normally use one of the predefined
     derived classes or derive your own class from it.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellAutoWrapStringRenderer, wxGridCellBoolRenderer,
@@ -101,7 +101,7 @@ protected:
     This class may be used to format string data in a cell. The too
     long lines are wrapped to be shown entirely at word boundaries.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellBoolRenderer,
@@ -125,7 +125,7 @@ public:
 
     This class may be used to format boolean data in a cell.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -149,7 +149,7 @@ public:
     The class wxDateTime is used internally to display the local date/time
     or to parse the string date entered in the cell thanks to the defined format.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -193,7 +193,7 @@ public:
     example, if this string is @c "John,Fred,Bob" the cell will be rendered as
     "John", "Fred" or "Bob" if its contents is 0, 1 or 2 respectively.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -251,7 +251,7 @@ enum wxGridCellFloatFormat
 
     This class may be used to format floating point data in a cell.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -328,7 +328,7 @@ public:
 
     This class may be used to format integer data in a cell.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -351,7 +351,7 @@ public:
     This class may be used to format string data in a cell; it is the default
     for string cells.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellRenderer, wxGridCellAutoWrapStringRenderer,
@@ -378,7 +378,7 @@ public:
     the cell attributes for individual cells, rows, columns, or even for the
     entire grid.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellAutoWrapStringEditor, wxGridCellBoolEditor,
@@ -527,7 +527,7 @@ protected:
 
     Grid cell editor for wrappable string/text data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellBoolEditor, wxGridCellChoiceEditor,
@@ -545,7 +545,7 @@ public:
 
     Grid cell editor for boolean data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -584,7 +584,7 @@ public:
     Grid cell editor for string data providing the user a choice from a list of
     strings.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -635,7 +635,7 @@ public:
     (e.g. data in cell is 0,1,2 ... n the cell could be displayed as
     "John","Fred"..."Bob" in the combo choice box).
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -660,7 +660,7 @@ public:
 
     Grid cell editor for string/text data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -699,7 +699,7 @@ public:
 
     The editor for floating point numbers data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -737,7 +737,7 @@ public:
 
     Grid cell editor for numeric integer data.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see wxGridCellEditor, wxGridCellAutoWrapStringEditor,
@@ -784,7 +784,7 @@ protected:
     changing their attributes from the defaults. An object of this class may be
     returned by wxGridTableBase::GetAttr().
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 */
 class wxGridCellAttr : public wxClientDataContainer, public wxRefCounter
@@ -1488,7 +1488,7 @@ public:
 
     @see wxGridStringTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 */
 class wxGridTableBase : public wxObject
@@ -1921,7 +1921,7 @@ enum wxGridTableRequest
     This structure is particularly useful for serializing the sizes of all
     wxGrid elements at once.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
  */
 struct wxGridSizesInfo
@@ -2061,7 +2061,7 @@ enum wxGridRenderStyle
     wxGridEditorCreatedEvent for the documentation of all event types you can
     use with wxGrid.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 
     @see @ref overview_grid, wxGridUpdateLocker
@@ -4700,7 +4700,7 @@ protected:
     wxGrid::EndBatch() because you don't risk missing the call the latter (due
     to an exception for example).
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid}
 */
 class wxGridUpdateLocker
@@ -4824,7 +4824,7 @@ public:
         wxWidgets 2.9.5.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid,events}
 */
 class wxGridEvent : public wxNotifyEvent
@@ -4918,7 +4918,7 @@ public:
         Same as EVT_GRID_CMD_ROW_SIZE() but uses `wxID_ANY` id.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid,events}
 */
 class wxGridSizeEvent : public wxNotifyEvent
@@ -4980,7 +4980,7 @@ public:
         identifier. Processes a @c wxEVT_GRID_RANGE_SELECT event type.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid,events}
 */
 class wxGridRangeSelectEvent : public wxNotifyEvent
@@ -5069,7 +5069,7 @@ public:
         Processes a @c wxEVT_GRID_EDITOR_CREATED event type.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{grid,events}
 */
 class wxGridEditorCreatedEvent : public wxCommandEvent
diff --git a/interface/wx/hyperlink.h b/interface/wx/hyperlink.h
index 57f5595e92..ff0f136654 100644
--- a/interface/wx/hyperlink.h
+++ b/interface/wx/hyperlink.h
@@ -21,7 +21,7 @@
         User clicked on a hyperlink.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 */
 class wxHyperlinkEvent : public wxCommandEvent
@@ -90,7 +90,7 @@ wxEventType wxEVT_HYPERLINK;
     Currently this class is implemented using native support in wxGTK and wxMSW
     and a generic version is used by the other ports.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{hyperlinkctrl}
 
diff --git a/interface/wx/joystick.h b/interface/wx/joystick.h
index c2c227606a..3f198c9772 100644
--- a/interface/wx/joystick.h
+++ b/interface/wx/joystick.h
@@ -10,7 +10,7 @@
 
     wxJoystick allows an application to control one or more joysticks.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{misc}
 
     @see wxJoystickEvent
diff --git a/interface/wx/laywin.h b/interface/wx/laywin.h
index 15bc84a699..dc86f99c20 100644
--- a/interface/wx/laywin.h
+++ b/interface/wx/laywin.h
@@ -102,7 +102,7 @@ enum wxLayoutAlignment
     previous events in order to calculate window sizes.
 
 
-    @library{wxadv}
+    @library{wxcore}
     @category{winlayout}
 
     @see wxSashEvent, wxSashLayoutWindow, @ref overview_events
@@ -165,7 +165,7 @@ public:
     for you. However, if you use sashes, see wxSashWindow for relevant event information.
     See also wxLayoutAlgorithm for information about the layout events.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
 
     @see wxLayoutAlgorithm, wxSashWindow, @ref overview_events
@@ -297,7 +297,7 @@ public:
         from a window.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 
     @see wxCalculateLayoutEvent, wxSashLayoutWindow, wxLayoutAlgorithm.
@@ -386,7 +386,7 @@ wxEventType wxEVT_QUERY_LAYOUT_INFO;
         'bite' out of a rectangle provided by the algorithm.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 
     @see wxQueryLayoutInfoEvent, wxSashLayoutWindow, wxLayoutAlgorithm.
diff --git a/interface/wx/notifmsg.h b/interface/wx/notifmsg.h
index 6d2a031d27..7608a84cc9 100644
--- a/interface/wx/notifmsg.h
+++ b/interface/wx/notifmsg.h
@@ -51,7 +51,7 @@
     @endEventTable
     
     @since 2.9.0
-    @library{wxadv}
+    @library{wxcore}
     @category{misc}
 */
 class wxNotificationMessage : public wxEvtHandler
diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h
index 0cc98c3903..9d4eb13b50 100644
--- a/interface/wx/odcombo.h
+++ b/interface/wx/odcombo.h
@@ -74,7 +74,7 @@ enum
 
     @see Events emitted by wxComboCtrl.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
     @appearance{ownerdrawncombobox}
 
diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index 9593e88a4f..8ccdc1ca8b 100644
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -101,7 +101,7 @@ enum wxPropertySheetDialogFlags
 
     For more about layout adaptation, see @ref overview_dialog_autoscrolling.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{managedwnd}
 */
 class wxPropertySheetDialog : public wxDialog
diff --git a/interface/wx/richtooltip.h b/interface/wx/richtooltip.h
index e88c5bbdca..a4e48648ff 100644
--- a/interface/wx/richtooltip.h
+++ b/interface/wx/richtooltip.h
@@ -84,7 +84,7 @@ enum wxTipKind
     The images below show some examples of rich tooltips on different
     platforms, with various customizations applied.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
     @appearance{richtooltip}
 
diff --git a/interface/wx/sashwin.h b/interface/wx/sashwin.h
index 2310448dc7..28d48f8e7e 100644
--- a/interface/wx/sashwin.h
+++ b/interface/wx/sashwin.h
@@ -68,7 +68,7 @@ enum wxSashDragStatus
            with ids in the given range have their sashes dragged.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
 
     @see wxSashEvent, wxSashLayoutWindow, @ref overview_events
@@ -241,7 +241,7 @@ public:
         the given range have their sashes dragged.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 
     @see wxSashWindow, @ref overview_events
diff --git a/interface/wx/sound.h b/interface/wx/sound.h
index 69756cc91d..691be67a72 100644
--- a/interface/wx/sound.h
+++ b/interface/wx/sound.h
@@ -23,7 +23,7 @@
     Linux systems in 2017 and osspd (OSS Proxy Daemon) package typically needs
     to be installed to make it work.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{media}
 */
 class wxSound : public wxObject
diff --git a/interface/wx/splash.h b/interface/wx/splash.h
index 2e09981951..61cbe25a7c 100644
--- a/interface/wx/splash.h
+++ b/interface/wx/splash.h
@@ -35,7 +35,7 @@
       wxYield();
     @endcode
 
-    @library{wxadv}
+    @library{wxcore}
     @category{managedwnd}
 */
 class wxSplashScreen : public wxFrame
diff --git a/interface/wx/taskbar.h b/interface/wx/taskbar.h
index adced76077..909b603255 100644
--- a/interface/wx/taskbar.h
+++ b/interface/wx/taskbar.h
@@ -25,7 +25,7 @@ enum wxTaskBarIconType
     For a list of the event macros meant to be used with wxTaskBarIconEvent,
     please look at wxTaskBarIcon description.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 */
 class wxTaskBarIconEvent : public wxEvent
@@ -84,7 +84,7 @@ public:
         in the menu being displayed on the current platform.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{misc}
 */
 class wxTaskBarIcon : public wxEvtHandler
diff --git a/interface/wx/timectrl.h b/interface/wx/timectrl.h
index 619eda5d22..6e189513b0 100644
--- a/interface/wx/timectrl.h
+++ b/interface/wx/timectrl.h
@@ -12,7 +12,7 @@
 
     Currently no special styles are defined for this object.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{pickers}
 
     @since 2.9.3
@@ -42,7 +42,7 @@ enum
            control.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{pickers}
     @appearance{timepickerctrl}
 
diff --git a/interface/wx/tipdlg.h b/interface/wx/tipdlg.h
index f59fac4388..a7f4a8e778 100644
--- a/interface/wx/tipdlg.h
+++ b/interface/wx/tipdlg.h
@@ -17,7 +17,7 @@
     simple text file, you will want to derive a new class from wxTipProvider and
     use it instead of the one returned by wxCreateFileTipProvider().
 
-    @library{wxadv}
+    @library{wxcore}
     @category{misc}
 
     @see @ref overview_tips, ::wxShowTip
diff --git a/interface/wx/treelist.h b/interface/wx/treelist.h
index e66d5b7247..8eb78fc46e 100644
--- a/interface/wx/treelist.h
+++ b/interface/wx/treelist.h
@@ -50,7 +50,7 @@ enum
 
     @see wxTreeListCtrl
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
 
     @since 2.9.3
@@ -79,7 +79,7 @@ public:
 
     @see wxTreeListCtrl
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
 
     @since 2.9.3
@@ -252,7 +252,7 @@ extern const wxTreeListItem wxTLI_LAST;
         if you need to know it.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{ctrl}
 
     @since 2.9.3
diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h
index 9c29f7e642..3fe2eda151 100644
--- a/interface/wx/wizard.h
+++ b/interface/wx/wizard.h
@@ -41,7 +41,7 @@
     wxWizardPage::GetBitmap() can also be overridden, but this should be very
     rarely needed.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
 
     @see wxWizard, @ref page_samples_wizard
@@ -142,7 +142,7 @@ public:
         The wizard finished button was pressed.
     @endEventTable
 
-    @library{wxadv}
+    @library{wxcore}
     @category{events}
 
     @see wxWizard, @ref page_samples_wizard
@@ -194,7 +194,7 @@ wxEventType wxEVT_WIZARD_BEFORE_PAGE_CHANGED;
     the pages order is known statically - on the other hand, if this is not the
     case you must derive your own class from wxWizardPage instead.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
 
     @see wxWizard, @ref page_samples_wizard
@@ -339,7 +339,7 @@ public:
 
     See also wxDialog for other extended styles.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{cmndlg}
 
     @see wxWizardEvent, wxWizardPage, @ref page_samples_wizard