From 954b8ae60391d18b87a604e7919c87c0c6ae208b Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 15 Feb 1999 20:41:29 +0000
Subject: [PATCH] Added 'Include files' section to class references

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/accel.tex    |   8 +
 docs/latex/wx/activevt.tex |   4 +
 docs/latex/wx/app.tex      |   4 +
 docs/latex/wx/autoobj.tex  |   4 +
 docs/latex/wx/bbutton.tex  |   4 +
 docs/latex/wx/bitmap.tex   |   8 +
 docs/latex/wx/bmpdatob.tex |   4 +
 docs/latex/wx/brush.tex    |   8 +
 docs/latex/wx/busycurs.tex |   4 +
 docs/latex/wx/button.tex   |   4 +
 docs/latex/wx/calclevt.tex |   4 +
 docs/latex/wx/checkbox.tex |   4 +
 docs/latex/wx/checklst.tex |   4 +
 docs/latex/wx/choice.tex   |   4 +
 docs/latex/wx/clasinfo.tex |   4 +
 docs/latex/wx/clientdc.tex |   4 +
 docs/latex/wx/clipbrd.tex  |   4 +
 docs/latex/wx/closeevt.tex |   4 +
 docs/latex/wx/cmdevent.tex |   4 +
 docs/latex/wx/cmdproc.tex  |   4 +
 docs/latex/wx/colordlg.tex |   4 +
 docs/latex/wx/colour.tex   |  12 ++
 docs/latex/wx/combobox.tex |   4 +
 docs/latex/wx/command.tex  |   4 +
 docs/latex/wx/conditn.tex  |   4 +
 docs/latex/wx/config.tex   |   8 +
 docs/latex/wx/control.tex  |   4 +
 docs/latex/wx/critsect.tex |   4 +
 docs/latex/wx/crtslock.tex |   4 +
 docs/latex/wx/cursor.tex   |   4 +
 docs/latex/wx/database.tex |   9 +-
 docs/latex/wx/dataobj.tex  |   4 +
 docs/latex/wx/date.tex     |  10 +-
 docs/latex/wx/datstrm.tex  |   4 +
 docs/latex/wx/dc.tex       |   4 +
 docs/latex/wx/ddeclint.tex |   4 +
 docs/latex/wx/ddeconn.tex  |   4 +
 docs/latex/wx/ddeservr.tex |   4 +
 docs/latex/wx/debugcxt.tex |   8 +
 docs/latex/wx/dialog.tex   |   4 +
 docs/latex/wx/dirdlg.tex   |   4 +
 docs/latex/wx/docchfrm.tex |   4 +
 docs/latex/wx/docmanag.tex |   4 +
 docs/latex/wx/docmdich.tex |   4 +
 docs/latex/wx/docmdipr.tex |   4 +
 docs/latex/wx/docprfrm.tex |   4 +
 docs/latex/wx/doctempl.tex |   4 +
 docs/latex/wx/document.tex |   4 +
 docs/latex/wx/dropevt.tex  |   4 +
 docs/latex/wx/dropsrc.tex  |   4 +
 docs/latex/wx/droptrgt.tex |   4 +
 docs/latex/wx/eraseevt.tex |   4 +
 docs/latex/wx/event.tex    |   4 +
 docs/latex/wx/evthand.tex  |   4 +
 docs/latex/wx/expr.tex     |   4 +
 docs/latex/wx/fildatob.tex |   4 +
 docs/latex/wx/fildrptg.tex |   4 +
 docs/latex/wx/file.tex     |   4 +
 docs/latex/wx/filedlg.tex  |   4 +
 docs/latex/wx/filehist.tex |   4 +
 docs/latex/wx/filetype.tex |   8 +-
 docs/latex/wx/fltinstr.tex |   4 +
 docs/latex/wx/fltoutst.tex |   4 +
 docs/latex/wx/focusevt.tex |   4 +
 docs/latex/wx/font.tex     |   4 +
 docs/latex/wx/fontdlg.tex  |   8 +
 docs/latex/wx/fontlist.tex |   4 +
 docs/latex/wx/frame.tex    |   4 +
 docs/latex/wx/ftp.tex      |   4 +
 docs/latex/wx/function.tex | 332 ++++++++++++++++++++++++++++++++++---
 docs/latex/wx/gauge.tex    |   4 +
 docs/latex/wx/gdiobj.tex   |   4 +
 docs/latex/wx/grid.tex     |   4 +
 docs/latex/wx/hash.tex     |   4 +
 docs/latex/wx/helpinst.tex |   6 +-
 docs/latex/wx/icon.tex     |   4 +
 docs/latex/wx/idleevt.tex  |   4 +
 docs/latex/wx/ilayout.tex  |   4 +
 docs/latex/wx/image.tex    |  11 +-
 docs/latex/wx/imaglist.tex |   4 +
 docs/latex/wx/indlgevt.tex |   4 +
 docs/latex/wx/inputstr.tex |   4 +
 docs/latex/wx/joyevent.tex |   4 +
 docs/latex/wx/joystick.tex |   4 +
 docs/latex/wx/keyevent.tex |   4 +
 docs/latex/wx/layalgor.tex |   4 +
 docs/latex/wx/layout.tex   |   4 +
 docs/latex/wx/list.tex     |   4 +
 docs/latex/wx/listbox.tex  |   4 +
 docs/latex/wx/listctrl.tex |   4 +
 docs/latex/wx/listevt.tex  |   4 +
 docs/latex/wx/log.tex      |   4 +
 docs/latex/wx/mask.tex     |   4 +
 docs/latex/wx/mdi.tex      |  12 ++
 docs/latex/wx/memorydc.tex |   4 +
 docs/latex/wx/menu.tex     |   8 +
 docs/latex/wx/menuevt.tex  |   4 +
 docs/latex/wx/menuitem.tex |   4 +
 docs/latex/wx/metafile.tex |   8 +
 docs/latex/wx/mimetype.tex |   8 +-
 docs/latex/wx/minifram.tex |   4 +
 docs/latex/wx/mltchdlg.tex |   6 +
 docs/latex/wx/module.tex   |   4 +
 docs/latex/wx/mouseevt.tex |   4 +
 docs/latex/wx/moveevt.tex  |   4 +
 docs/latex/wx/msgdlg.tex   |   4 +
 docs/latex/wx/mutex.tex    |   4 +
 docs/latex/wx/mutexlck.tex |   4 +
 docs/latex/wx/node.tex     |   4 +
 docs/latex/wx/notebook.tex |   4 +
 docs/latex/wx/noteevt.tex  |   4 +
 docs/latex/wx/outptstr.tex |   4 +
 docs/latex/wx/pagedlg.tex  |   8 +
 docs/latex/wx/paintdc.tex  |   4 +
 docs/latex/wx/paintevt.tex |   4 +
 docs/latex/wx/palette.tex  |   4 +
 docs/latex/wx/panel.tex    |   4 +
 docs/latex/wx/pantabv.tex  |   4 +
 docs/latex/wx/pathlist.tex |   4 +
 docs/latex/wx/pen.tex      |   9 +
 docs/latex/wx/point.tex    |   6 +-
 docs/latex/wx/postscpt.tex |   4 +
 docs/latex/wx/prevwin.tex  |  13 +-
 docs/latex/wx/print.tex    |  24 +++
 docs/latex/wx/process.tex  |   4 +
 docs/latex/wx/procevt.tex  |   4 +
 docs/latex/wx/protocol.tex |   4 +
 docs/latex/wx/prvdatob.tex |   4 +
 docs/latex/wx/prvtdrpt.tex |   4 +
 docs/latex/wx/query.tex    |   6 +-
 docs/latex/wx/qylayevt.tex |   4 +
 docs/latex/wx/radiobox.tex |   4 +
 docs/latex/wx/radiobut.tex |   4 +
 docs/latex/wx/realpoin.tex |   8 +-
 docs/latex/wx/recrdset.tex |   6 +-
 docs/latex/wx/rect.tex     |   4 +
 docs/latex/wx/region.tex   |   8 +
 docs/latex/wx/sashevt.tex  |   4 +
 docs/latex/wx/sashlayw.tex |   4 +
 docs/latex/wx/sashwin.tex  |   4 +
 docs/latex/wx/sckaddr.tex  |  10 +-
 docs/latex/wx/screendc.tex |   4 +
 docs/latex/wx/scrolbar.tex |   4 +
 docs/latex/wx/scrolevt.tex |   4 +
 docs/latex/wx/scrolwin.tex |   4 +
 docs/latex/wx/settings.tex |   4 +
 docs/latex/wx/size.tex     |   6 +-
 docs/latex/wx/sizeevt.tex  |   4 +
 docs/latex/wx/slider.tex   |   4 +
 docs/latex/wx/sngchdlg.tex |   4 +
 docs/latex/wx/socket.tex   |  20 +++
 docs/latex/wx/spinbutt.tex |   4 +
 docs/latex/wx/splitter.tex |   4 +
 docs/latex/wx/statbmp.tex  |   4 +
 docs/latex/wx/statbox.tex  |   4 +
 docs/latex/wx/stattext.tex |   4 +
 docs/latex/wx/statusbr.tex |  10 ++
 docs/latex/wx/stream.tex   |   4 +
 docs/latex/wx/strlist.tex  |   4 +
 docs/latex/wx/strmbase.tex |   4 +
 docs/latex/wx/strmfile.tex |  12 ++
 docs/latex/wx/strmmem.tex  |   8 +
 docs/latex/wx/strmsock.tex |   8 +
 docs/latex/wx/strmzlib.tex |   8 +
 docs/latex/wx/sysclevt.tex |   4 +
 docs/latex/wx/tab.tex      |  16 ++
 docs/latex/wx/tabctrl.tex  |   4 +
 docs/latex/wx/tabevent.tex |   4 +
 docs/latex/wx/taskbar.tex  |   4 +
 docs/latex/wx/tcpclint.tex |   4 +
 docs/latex/wx/tcpconn.tex  |   4 +
 docs/latex/wx/tcpservr.tex |   4 +
 docs/latex/wx/tempfile.tex |   4 +
 docs/latex/wx/text.tex     |   4 +
 docs/latex/wx/textdlg.tex  |   4 +
 docs/latex/wx/textfile.tex |   4 +
 docs/latex/wx/thread.tex   |   4 +
 docs/latex/wx/time.tex     |   8 +-
 docs/latex/wx/timer.tex    |   6 +-
 docs/latex/wx/tokenizr.tex |   4 +
 docs/latex/wx/toolbar.tex  |   8 +
 docs/latex/wx/treectrl.tex |   8 +
 docs/latex/wx/treeevt.tex  |   4 +
 docs/latex/wx/txtdatob.tex |   4 +
 docs/latex/wx/txtdrptg.tex |   4 +
 docs/latex/wx/upduievt.tex |   4 +
 docs/latex/wx/url.tex      |   4 +
 docs/latex/wx/valgen.tex   |   4 +
 docs/latex/wx/validatr.tex |   4 +
 docs/latex/wx/valtext.tex  |   4 +
 docs/latex/wx/variant.tex  |   8 +
 docs/latex/wx/view.tex     |   4 +
 docs/latex/wx/wave.tex     |   4 +
 docs/latex/wx/window.tex   |   4 +
 docs/latex/wx/windowdc.tex |   4 +
 docs/latex/wx/wxstring.tex |   4 +
 196 files changed, 1273 insertions(+), 49 deletions(-)

diff --git a/docs/latex/wx/accel.tex b/docs/latex/wx/accel.tex
index 14aacf7843..6466f512be 100644
--- a/docs/latex/wx/accel.tex
+++ b/docs/latex/wx/accel.tex
@@ -6,6 +6,10 @@ An object used by an application wishing to create an \helpref{accelerator table
 
 None
 
+\wxheading{Include files}
+
+<wx/accel.h>
+
 \wxheading{See also}
 
 \helpref{wxAcceleratorTable}{wxacceleratortable}, \helpref{wxWindow::SetAcceleratorTable}{wxwindowsetacceleratortable}
@@ -77,6 +81,10 @@ initial accelerator table for a window.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/accel.h>
+
 \wxheading{Example}
 
 {\small%
diff --git a/docs/latex/wx/activevt.tex b/docs/latex/wx/activevt.tex
index 3ce87607ee..515282ef28 100644
--- a/docs/latex/wx/activevt.tex
+++ b/docs/latex/wx/activevt.tex
@@ -8,6 +8,10 @@ or deactivated.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an activate event, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex
index 4581eabe5d..a9044b7132 100644
--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -22,6 +22,10 @@ a reference to your application object) to be visible to other files.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/app.h>
+
 \wxheading{See also}
 
 \helpref{wxApp overview}{wxappoverview}
diff --git a/docs/latex/wx/autoobj.tex b/docs/latex/wx/autoobj.tex
index 9f8795581e..35467e5315 100644
--- a/docs/latex/wx/autoobj.tex
+++ b/docs/latex/wx/autoobj.tex
@@ -22,6 +22,10 @@ Note that this class works under Windows only, and currently only for Visual C++
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/msw/ole/automtn.h>
+
 \wxheading{See also}
 
 \helpref{wxVariant}{wxvariant}
diff --git a/docs/latex/wx/bbutton.tex b/docs/latex/wx/bbutton.tex
index be4160c6a3..5466e1b2ce 100644
--- a/docs/latex/wx/bbutton.tex
+++ b/docs/latex/wx/bbutton.tex
@@ -12,6 +12,10 @@ almost any other window.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bmpbuttn.h>
+
 \wxheading{Remarks}
 
 A bitmap button can be supplied with a single bitmap, and wxWindows will draw
diff --git a/docs/latex/wx/bitmap.tex b/docs/latex/wx/bitmap.tex
index 0deb875036..0a77d186e2 100644
--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -10,6 +10,10 @@ either monochrome or colour.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bitmap.h>
+
 \wxheading{See also}
 
 \helpref{wxBitmap overview}{wxbitmapoverview}, 
@@ -539,6 +543,10 @@ application initialisation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bitmap.h>
+
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}, \helpref{wxIcon}{wxicon}, \helpref{wxCursor}{wxcursor}
diff --git a/docs/latex/wx/bmpdatob.tex b/docs/latex/wx/bmpdatob.tex
index bf5ba2d203..634794c0e1 100644
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -13,6 +13,10 @@ and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxDataObject}{wxdataobject}
diff --git a/docs/latex/wx/brush.tex b/docs/latex/wx/brush.tex
index 97ad9dfc1e..5fd3a60413 100644
--- a/docs/latex/wx/brush.tex
+++ b/docs/latex/wx/brush.tex
@@ -9,6 +9,10 @@ style.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/brush.h>
+
 \wxheading{Remarks}
 
 On a monochrome display, wxWindows shows
@@ -259,6 +263,10 @@ A brush list is a list containing all brushes which have been created.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{Remarks}
 
 There is only one instance of this class: {\bf wxTheBrushList}.  Use
diff --git a/docs/latex/wx/busycurs.tex b/docs/latex/wx/busycurs.tex
index 176f034e24..1036365275 100644
--- a/docs/latex/wx/busycurs.tex
+++ b/docs/latex/wx/busycurs.tex
@@ -20,6 +20,10 @@ and \helpref{wxEndBusyCursor}{wxendbusycursor} in the destructor.
 
 None
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \wxheading{See also}
 
 \helpref{wxBeginBusyCursor}{wxbeginbusycursor}, \helpref{wxEndBusyCursor}{wxendbusycursor}
diff --git a/docs/latex/wx/button.tex b/docs/latex/wx/button.tex
index 4b92248274..be87dacb31 100644
--- a/docs/latex/wx/button.tex
+++ b/docs/latex/wx/button.tex
@@ -12,6 +12,10 @@ almost any other window.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/button.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxButton.
diff --git a/docs/latex/wx/calclevt.tex b/docs/latex/wx/calclevt.tex
index d917db754f..75321f617a 100644
--- a/docs/latex/wx/calclevt.tex
+++ b/docs/latex/wx/calclevt.tex
@@ -9,6 +9,10 @@ occupy.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/laywin.h>
+
 \wxheading{Event table macros}
 
 \twocolwidtha{7cm}%
diff --git a/docs/latex/wx/checkbox.tex b/docs/latex/wx/checkbox.tex
index b12e416a44..0f76ec31f3 100644
--- a/docs/latex/wx/checkbox.tex
+++ b/docs/latex/wx/checkbox.tex
@@ -10,6 +10,10 @@ or off (no checkmark).
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/checkbox.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxCheckBox.
diff --git a/docs/latex/wx/checklst.tex b/docs/latex/wx/checklst.tex
index 9785a48601..a6f7163920 100644
--- a/docs/latex/wx/checklst.tex
+++ b/docs/latex/wx/checklst.tex
@@ -15,6 +15,10 @@ Only the new functions for this class are documented; see also \helpref{wxListBo
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/checklst.h>
+
 \wxheading{Window styles}
 
 See \helpref{wxListBox}{wxlistbox}.
diff --git a/docs/latex/wx/choice.tex b/docs/latex/wx/choice.tex
index 04dc877fc3..48f8d45e0e 100644
--- a/docs/latex/wx/choice.tex
+++ b/docs/latex/wx/choice.tex
@@ -11,6 +11,10 @@ menu of choices.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/choice.h>
+
 \wxheading{Window styles}
 
 There are no special styles for wxChoice.
diff --git a/docs/latex/wx/clasinfo.tex b/docs/latex/wx/clasinfo.tex
index f81149f271..bdb9e3fa75 100644
--- a/docs/latex/wx/clasinfo.tex
+++ b/docs/latex/wx/clasinfo.tex
@@ -8,6 +8,10 @@ of macros such as {\bf DECLARE\_DYNAMIC\_CLASS} and {\bf IMPLEMENT\_DYNAMIC\_CLA
 
 No parent class.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{wxclassinfooverview}, \helpref{wxObject}{wxobject}
diff --git a/docs/latex/wx/clientdc.tex b/docs/latex/wx/clientdc.tex
index 8101533aa0..5cd36a8f7b 100644
--- a/docs/latex/wx/clientdc.tex
+++ b/docs/latex/wx/clientdc.tex
@@ -14,6 +14,10 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \helpref{wxDC}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcclient.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPaintDC}{wxpaintdc},\rtfsp
diff --git a/docs/latex/wx/clipbrd.tex b/docs/latex/wx/clipbrd.tex
index 9c6bb2eb95..4a48ba13b9 100644
--- a/docs/latex/wx/clipbrd.tex
+++ b/docs/latex/wx/clipbrd.tex
@@ -40,6 +40,10 @@ For example:
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/clipbrd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDataObject}{wxdataobject}
diff --git a/docs/latex/wx/closeevt.tex b/docs/latex/wx/closeevt.tex
index fac2e156c2..781bc9b6b3 100644
--- a/docs/latex/wx/closeevt.tex
+++ b/docs/latex/wx/closeevt.tex
@@ -6,6 +6,10 @@ This event class contains information about window and session close events.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a close event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/cmdevent.tex b/docs/latex/wx/cmdevent.tex
index 8d4873fb1f..66fa145ec2 100644
--- a/docs/latex/wx/cmdevent.tex
+++ b/docs/latex/wx/cmdevent.tex
@@ -7,6 +7,10 @@ simple controls. More complex controls, such as \helpref{wxTreeCtrl}{wxtreectrl}
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a menu command event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/cmdproc.tex b/docs/latex/wx/cmdproc.tex
index 1164bccfe6..c4f7b4acce 100644
--- a/docs/latex/wx/cmdproc.tex
+++ b/docs/latex/wx/cmdproc.tex
@@ -8,6 +8,10 @@ if you want different behaviour.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxCommandProcessor overview}{wxcommandprocessoroverview}, \helpref{wxCommand}{wxcommand}
diff --git a/docs/latex/wx/colordlg.tex b/docs/latex/wx/colordlg.tex
index 332f344a02..98b10e3407 100644
--- a/docs/latex/wx/colordlg.tex
+++ b/docs/latex/wx/colordlg.tex
@@ -9,6 +9,10 @@ This class represents the colour chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/colordlg.h>
+
 \wxheading{See also}
 
 \helpref{wxColourDialog Overview}{wxcolourdialogoverview}, \helpref{wxColour}{wxcolour}, \helpref{wxColourData}{wxcolourdata}
diff --git a/docs/latex/wx/colour.tex b/docs/latex/wx/colour.tex
index 14163912c6..8896abf0ab 100644
--- a/docs/latex/wx/colour.tex
+++ b/docs/latex/wx/colour.tex
@@ -11,6 +11,10 @@ Valid RGB values are in the range 0 to 255.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/colour.h>
+
 \wxheading{See also}
 
 \helpref{wxColourDatabase}{wxcolourdatabase}, \helpref{wxPen}{wxpen}, \helpref{wxBrush}{wxbrush},\rtfsp
@@ -126,6 +130,10 @@ This class holds a variety of information related to colour dialogs.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cmndata.h>
+
 \wxheading{See also}
 
 \helpref{wxColour}{wxcolour}, \helpref{wxColourDialog}{wxcolourdialog}, \helpref{wxColourDialog overview}{wxcolourdialogoverview}
@@ -215,6 +223,10 @@ is only one instance of this class: {\bf wxTheColourDatabase}.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{Remarks}
 
 The colours in the standard database are as follows:
diff --git a/docs/latex/wx/combobox.tex b/docs/latex/wx/combobox.tex
index b503434fd5..36d68dbfcf 100644
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -14,6 +14,10 @@ A combobox permits a single selection only. Combobox items are numbered from zer
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/combo.h>
+
 \wxheading{Window styles}
 
 \begin{twocollist}\itemsep=0pt
diff --git a/docs/latex/wx/command.tex b/docs/latex/wx/command.tex
index 9bd25f2811..7a8552a453 100644
--- a/docs/latex/wx/command.tex
+++ b/docs/latex/wx/command.tex
@@ -9,6 +9,10 @@ change the data or view.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \overview{Overview}{wxcommandoverview}
diff --git a/docs/latex/wx/conditn.tex b/docs/latex/wx/conditn.tex
index f6b77506d0..e900499e26 100644
--- a/docs/latex/wx/conditn.tex
+++ b/docs/latex/wx/conditn.tex
@@ -6,6 +6,10 @@ TODO
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxThread}{wxthread}, \helpref{wxMutex}{wxmutex}
diff --git a/docs/latex/wx/config.tex b/docs/latex/wx/config.tex
index 8e74b3d429..d3994afe23 100644
--- a/docs/latex/wx/config.tex
+++ b/docs/latex/wx/config.tex
@@ -21,6 +21,14 @@ features of this class.
 
 No base class
 
+\wxheading{Include files}
+
+<wx/config.h> (to let wxWindows choose a wxConfig class for your platform)\\
+<wx/confbase.h> (base config class)\\
+<wx/fileconf.h> (wxFileconfig class)\\
+<wx/msw/regconf.h> (wxRegConfig class)\\
+<wx/msw/iniconf.h> (wxIniConfig class)
+
 \wxheading{Example}
 
 Here is how you would typically use this class:
diff --git a/docs/latex/wx/control.tex b/docs/latex/wx/control.tex
index 8419d9b81a..8cf69429ac 100644
--- a/docs/latex/wx/control.tex
+++ b/docs/latex/wx/control.tex
@@ -11,6 +11,10 @@ of data.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/control.h>
+
 \wxheading{See also}
 
 \helpref{wxValidator}{wxvalidator}
diff --git a/docs/latex/wx/critsect.tex b/docs/latex/wx/critsect.tex
index 2bc984a077..74c987e7f8 100644
--- a/docs/latex/wx/critsect.tex
+++ b/docs/latex/wx/critsect.tex
@@ -18,6 +18,10 @@ possible instead of directly using wxCriticalSection for the same reasons
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxThread}{wxthread}, \helpref{wxCondition}{wxcondition}, 
diff --git a/docs/latex/wx/crtslock.tex b/docs/latex/wx/crtslock.tex
index b4212b2577..a9515b8137 100644
--- a/docs/latex/wx/crtslock.tex
+++ b/docs/latex/wx/crtslock.tex
@@ -10,6 +10,10 @@ and difficult to debug problems).
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxCriticalSection}{wxcriticalsection}, 
diff --git a/docs/latex/wx/cursor.tex b/docs/latex/wx/cursor.tex
index 7d67eb6078..f32249a792 100644
--- a/docs/latex/wx/cursor.tex
+++ b/docs/latex/wx/cursor.tex
@@ -20,6 +20,10 @@ global \helpref{::wxSetCursor}{wxsetcursor} is also available for MS Windows use
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cursor.h>
+
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}, \helpref{wxIcon}{wxicon}, \helpref{wxWindow::SetCursor}{wxwindowsetcursor},\rtfsp
diff --git a/docs/latex/wx/database.tex b/docs/latex/wx/database.tex
index afc8b35035..cc884b99d2 100644
--- a/docs/latex/wx/database.tex
+++ b/docs/latex/wx/database.tex
@@ -1,11 +1,16 @@
 \section{\class{wxDatabase}}\label{wxdatabase}
 
-Every database object represents an ODBC connection. The connection may be closed and reopened.
+Every database object represents an ODBC connection.
+The connection may be closed and reopened.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/odbc.h>
+
 \wxheading{See also}
 
 \overview{wxDatabase overview}{wxdatabaseoverview}, \helpref{wxRecordSet}{wxrecordset}
diff --git a/docs/latex/wx/dataobj.tex b/docs/latex/wx/dataobj.tex
index 556384fc70..bec42f8c47 100644
--- a/docs/latex/wx/dataobj.tex
+++ b/docs/latex/wx/dataobj.tex
@@ -43,6 +43,10 @@ available data and the WriteData() methods in both classes.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxFileDataObject}{wxfiledataobject}, 
diff --git a/docs/latex/wx/date.tex b/docs/latex/wx/date.tex
index db4ce21197..a0d6d15239 100644
--- a/docs/latex/wx/date.tex
+++ b/docs/latex/wx/date.tex
@@ -2,14 +2,18 @@
 
 A class for manipulating dates.
 
-NOTE: this class should be
-used with caution, since it is not fully tested. It may be replaced
-with a new class in the near future.
+{\bf NOTE:} this class should be
+used with caution, since it is not fully tested. It will be replaced
+with a new wxDateTime class in the near future.
 
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/date.h>
+
 \wxheading{See also}
 
 \helpref{wxTime}{wxtime}
diff --git a/docs/latex/wx/datstrm.tex b/docs/latex/wx/datstrm.tex
index 3c0481935d..fffa327d04 100644
--- a/docs/latex/wx/datstrm.tex
+++ b/docs/latex/wx/datstrm.tex
@@ -10,6 +10,10 @@ Sparc or anything else.
 \helpref{wxInputStream}{wxinputstream}\\
 \helpref{wxStreamBase}{wxstreambase}
 
+\wxheading{Include files}
+
+<wx/datstrm.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxDataInputStream::wxDataInputStream}\label{wxdatainputstreamconstr}
diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex
index 26aa80fc9a..88eebeafbc 100644
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -13,6 +13,10 @@ only, so refer to this section for most device context information.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dc.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{dcoverview}
diff --git a/docs/latex/wx/ddeclint.tex b/docs/latex/wx/ddeclint.tex
index fa553552ea..5bc85beb16 100644
--- a/docs/latex/wx/ddeclint.tex
+++ b/docs/latex/wx/ddeclint.tex
@@ -19,6 +19,10 @@ of this API is available using \helpref{wxTCPClient}{wxtcpclient}.
 wxClientBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{See also}
 
 \helpref{wxDDEServer}{wxddeserver}, \helpref{wxDDEConnection}{wxddeconnection}, 
diff --git a/docs/latex/wx/ddeconn.tex b/docs/latex/wx/ddeconn.tex
index 5a197e708d..0be17834bc 100644
--- a/docs/latex/wx/ddeconn.tex
+++ b/docs/latex/wx/ddeconn.tex
@@ -21,6 +21,10 @@ of this API is available using \helpref{wxTCPConnection}{wxtcpconnection}.
 wxConnectionBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{Types}
 
 \index{wxIPCFormat}wxIPCFormat is defined as follows:
diff --git a/docs/latex/wx/ddeservr.tex b/docs/latex/wx/ddeservr.tex
index 36c2436114..700632f3c3 100644
--- a/docs/latex/wx/ddeservr.tex
+++ b/docs/latex/wx/ddeservr.tex
@@ -11,6 +11,10 @@ of this API is available using \helpref{wxTCPServer}{wxtcpserver}.
 
 wxServerBase
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \wxheading{See also}
 
 \helpref{wxDDEClient}{wxddeclient}, \helpref{wxDDEConnection}{wxddeconnection}, \helpref{IPC overview}{ipcoverview}
diff --git a/docs/latex/wx/debugcxt.tex b/docs/latex/wx/debugcxt.tex
index e157d32eab..0783080462 100644
--- a/docs/latex/wx/debugcxt.tex
+++ b/docs/latex/wx/debugcxt.tex
@@ -11,6 +11,10 @@ USE\_DEBUG\_CONTEXT to 0 is wx\_setup.h
 
 No parent class.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \wxheading{See also}
 
 \overview{Overview}{wxdebugcontextoverview}
@@ -251,6 +255,10 @@ This is soon to be obsolete, replaced by \helpref{wxLog}{wxlog} functionality.
 
 streambuf
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \wxheading{Example}
 
 \begin{verbatim}
diff --git a/docs/latex/wx/dialog.tex b/docs/latex/wx/dialog.tex
index 95d758c852..7a071fd3ef 100644
--- a/docs/latex/wx/dialog.tex
+++ b/docs/latex/wx/dialog.tex
@@ -10,6 +10,10 @@ the screen. It can contain controls and other windows.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dialog.h>
+
 \wxheading{Remarks}
 
 There are two kinds of dialog - {\it modal} and {\it modeless}. A modal dialog
diff --git a/docs/latex/wx/dirdlg.tex b/docs/latex/wx/dirdlg.tex
index 5a012a99f4..975062f23e 100644
--- a/docs/latex/wx/dirdlg.tex
+++ b/docs/latex/wx/dirdlg.tex
@@ -9,6 +9,10 @@ This class represents the directory chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dirdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxDirDialog overview}{wxdirdialogoverview}, \helpref{wxFileDialog}{wxfiledialog}
diff --git a/docs/latex/wx/docchfrm.tex b/docs/latex/wx/docchfrm.tex
index 1c03f01935..01fc056869 100644
--- a/docs/latex/wx/docchfrm.tex
+++ b/docs/latex/wx/docchfrm.tex
@@ -16,6 +16,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxFrame}{wxframe}
diff --git a/docs/latex/wx/docmanag.tex b/docs/latex/wx/docmanag.tex
index 19eaa58a66..f49e353689 100644
--- a/docs/latex/wx/docmanag.tex
+++ b/docs/latex/wx/docmanag.tex
@@ -9,6 +9,10 @@ and \helpref{wxDocTemplate}{wxdoctemplate} classes.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocManager overview}{wxdocmanageroverview}, \helpref{wxDocument}{wxdocument},\rtfsp
diff --git a/docs/latex/wx/docmdich.tex b/docs/latex/wx/docmdich.tex
index 63c86d32f7..d203beace2 100644
--- a/docs/latex/wx/docmdich.tex
+++ b/docs/latex/wx/docmdich.tex
@@ -17,6 +17,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docmdi.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxMDIChildFrame}{wxmdichildframe}
diff --git a/docs/latex/wx/docmdipr.tex b/docs/latex/wx/docmdipr.tex
index 3730dc9d9e..7dcff4d3ff 100644
--- a/docs/latex/wx/docmdipr.tex
+++ b/docs/latex/wx/docmdipr.tex
@@ -16,6 +16,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docmdi.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxMDIParentFrame}{wxmdiparentframe}
diff --git a/docs/latex/wx/docprfrm.tex b/docs/latex/wx/docprfrm.tex
index a39c6d55a2..ea468187c9 100644
--- a/docs/latex/wx/docprfrm.tex
+++ b/docs/latex/wx/docprfrm.tex
@@ -15,6 +15,10 @@ See the example application in {\tt samples/docview}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{Document/view overview}{docviewoverview}, \helpref{wxFrame}{wxframe}
diff --git a/docs/latex/wx/doctempl.tex b/docs/latex/wx/doctempl.tex
index e4bd82ef7d..10f310f63d 100644
--- a/docs/latex/wx/doctempl.tex
+++ b/docs/latex/wx/doctempl.tex
@@ -7,6 +7,10 @@ document class and a view class.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocTemplate overview}{wxdoctemplateoverview}, \helpref{wxDocument}{wxdocument}, \helpref{wxView}{wxview}
diff --git a/docs/latex/wx/document.tex b/docs/latex/wx/document.tex
index f75183c293..fc50326630 100644
--- a/docs/latex/wx/document.tex
+++ b/docs/latex/wx/document.tex
@@ -10,6 +10,10 @@ and \helpref{wxDocManager}{wxdocmanager} classes.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxDocument overview}{wxdocumentoverview}, \helpref{wxView}{wxview},\rtfsp
diff --git a/docs/latex/wx/dropevt.tex b/docs/latex/wx/dropevt.tex
index fc77fac91a..9e30f8dca5 100644
--- a/docs/latex/wx/dropevt.tex
+++ b/docs/latex/wx/dropevt.tex
@@ -12,6 +12,10 @@ older, Windows message-based approach of dropping files.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a drop files event, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/dropsrc.tex b/docs/latex/wx/dropsrc.tex
index fa0d71a910..2fc43ea65b 100644
--- a/docs/latex/wx/dropsrc.tex
+++ b/docs/latex/wx/dropsrc.tex
@@ -8,6 +8,10 @@ This class represents a source for a drag and drop operation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{Types}
 
 \index{wxDragResult}wxDragResult is defined as follows:
diff --git a/docs/latex/wx/droptrgt.tex b/docs/latex/wx/droptrgt.tex
index 3d38cc476c..c4db2ec7c3 100644
--- a/docs/latex/wx/droptrgt.tex
+++ b/docs/latex/wx/droptrgt.tex
@@ -8,6 +8,10 @@ This class represents a target for a drag and drop operation.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropSource}{wxdropsource}, 
diff --git a/docs/latex/wx/eraseevt.tex b/docs/latex/wx/eraseevt.tex
index 2c4a559780..a88c15e9e2 100644
--- a/docs/latex/wx/eraseevt.tex
+++ b/docs/latex/wx/eraseevt.tex
@@ -7,6 +7,10 @@ An erase event is sent when a window's background needs to be repainted.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an erase event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/event.tex b/docs/latex/wx/event.tex
index d44b4b3fb8..c7f58ab720 100644
--- a/docs/latex/wx/event.tex
+++ b/docs/latex/wx/event.tex
@@ -8,6 +8,10 @@ event object, and is an abstract base class for other event classes (see below).
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{See also}
 
 \helpref{wxCommandEvent}{wxcommandevent},\rtfsp
diff --git a/docs/latex/wx/evthand.tex b/docs/latex/wx/evthand.tex
index f980f27e30..8f5c7a9567 100644
--- a/docs/latex/wx/evthand.tex
+++ b/docs/latex/wx/evthand.tex
@@ -8,6 +8,10 @@ this class.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{See also}
 
 \overview{Event handling overview}{eventhandlingoverview}
diff --git a/docs/latex/wx/expr.tex b/docs/latex/wx/expr.tex
index c01a8ece63..18d0384f60 100644
--- a/docs/latex/wx/expr.tex
+++ b/docs/latex/wx/expr.tex
@@ -8,6 +8,10 @@ or list, and lists can be nested.
 
 None
 
+\wxheading{Include files}
+
+<wx/wxexpr.h>
+
 \wxheading{See also}
 
 \helpref{wxExpr overview}{exproverview}, \helpref{wxExprDatabase}{wxexprdatabase}
diff --git a/docs/latex/wx/fildatob.tex b/docs/latex/wx/fildatob.tex
index a5e13667d7..149bbb2c94 100644
--- a/docs/latex/wx/fildatob.tex
+++ b/docs/latex/wx/fildatob.tex
@@ -6,6 +6,10 @@ wxFileDataObject is a specialization of wxDataObject for file names.
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxDataObject}{wxdataobject}
diff --git a/docs/latex/wx/fildrptg.tex b/docs/latex/wx/fildrptg.tex
index 5e413f4f94..f483f11a5a 100644
--- a/docs/latex/wx/fildrptg.tex
+++ b/docs/latex/wx/fildrptg.tex
@@ -6,6 +6,10 @@
 
 \helpref{wxDropTarget}{wxdroptarget}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropSource}{wxdropsource}, 
diff --git a/docs/latex/wx/file.tex b/docs/latex/wx/file.tex
index 62aedec322..573407deed 100644
--- a/docs/latex/wx/file.tex
+++ b/docs/latex/wx/file.tex
@@ -9,6 +9,10 @@ between platforms and compilers.
 
 None.
 
+\wxheading{Include files}
+
+<wx/file.h>
+
 \wxheading{Constants}
 
 wx/file.h defines the following constants:
diff --git a/docs/latex/wx/filedlg.tex b/docs/latex/wx/filedlg.tex
index 69bf775c08..1631a49d12 100644
--- a/docs/latex/wx/filedlg.tex
+++ b/docs/latex/wx/filedlg.tex
@@ -9,6 +9,10 @@ This class represents the file chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/filedlg.h>
+
 \wxheading{See also}
 
 \helpref{wxFileDialog overview}{wxfiledialogoverview}, \helpref{wxFileSelector}{wxfileselector}
diff --git a/docs/latex/wx/filehist.tex b/docs/latex/wx/filehist.tex
index 1d9001be31..2804384dc2 100644
--- a/docs/latex/wx/filehist.tex
+++ b/docs/latex/wx/filehist.tex
@@ -11,6 +11,10 @@ as well as the MDI parent frame.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxFileHistory overview}{wxfilehistoryoverview}, \helpref{wxDocManager}{wxdocmanager}
diff --git a/docs/latex/wx/filetype.tex b/docs/latex/wx/filetype.tex
index 2ae03f063a..be2b621f19 100644
--- a/docs/latex/wx/filetype.tex
+++ b/docs/latex/wx/filetype.tex
@@ -29,14 +29,14 @@ A MIME type may have one or more associated extensions: "text/plain" will
 typically correspond to the extension ".txt", but may as well be associated with
 ".ini" or ".conf".
 
-\wxheading{Required headers}
-
-<wx/mimetype.h>
-
 \wxheading{Derived from}
 
 No base class.
 
+\wxheading{Include files}
+
+<wx/mimetype.h>
+
 \wxheading{See also}
 
 \helpref{wxMimeTypesManager}{wxmimetypesmanager}
diff --git a/docs/latex/wx/fltinstr.tex b/docs/latex/wx/fltinstr.tex
index a0deb39e6f..2032317f9e 100644
--- a/docs/latex/wx/fltinstr.tex
+++ b/docs/latex/wx/fltinstr.tex
@@ -8,6 +8,10 @@
 \helpref{wxInputStream}{wxinputstream}\\
 \helpref{wxStreamBase}{wxstreambase}
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{Note}
 
 The use of this class is exactly the same as of wxInputStream. Only a constructor
diff --git a/docs/latex/wx/fltoutst.tex b/docs/latex/wx/fltoutst.tex
index c0a775aec9..02b283b69c 100644
--- a/docs/latex/wx/fltoutst.tex
+++ b/docs/latex/wx/fltoutst.tex
@@ -8,6 +8,10 @@
 \helpref{wxOutputStream}{wxoutputstream}\\
 \helpref{wxStreamBase}{wxstreambase}
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{Note}
 
 The use of this class is exactly the same as of wxOutputStream. Only a constructor
diff --git a/docs/latex/wx/focusevt.tex b/docs/latex/wx/focusevt.tex
index e47b55d138..642d72ed96 100644
--- a/docs/latex/wx/focusevt.tex
+++ b/docs/latex/wx/focusevt.tex
@@ -7,6 +7,10 @@ A focus event is sent when a window's focus changes.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a focus event, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/font.tex b/docs/latex/wx/font.tex
index de553defbb..5f2f9f0c77 100644
--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -9,6 +9,10 @@ a window's text.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/font.h>
+
 \wxheading{See also}
 
 \helpref{wxFont overview}{wxfontoverview}, \helpref{wxDC::SetFont}{wxdcsetfont},\rtfsp
diff --git a/docs/latex/wx/fontdlg.tex b/docs/latex/wx/fontdlg.tex
index d88e5c6ee9..dc3a0549e6 100644
--- a/docs/latex/wx/fontdlg.tex
+++ b/docs/latex/wx/fontdlg.tex
@@ -8,6 +8,10 @@ This class holds a variety of information related to font dialogs.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cmndata.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{wxfontdialogoverview}, \helpref{wxFontDialog}{wxfontdialog}
@@ -149,6 +153,10 @@ This class represents the font chooser dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/fontdlg.h>
+
 \wxheading{See also}
 
 \helpref{Overview}{wxfontdialogoverview}, \helpref{wxFontData}{wxfontdata}
diff --git a/docs/latex/wx/fontlist.tex b/docs/latex/wx/fontlist.tex
index b6ee9b108b..2ee6f4bbe5 100644
--- a/docs/latex/wx/fontlist.tex
+++ b/docs/latex/wx/fontlist.tex
@@ -12,6 +12,10 @@ deleted and their resources freed, eliminating the possibility of `memory leaks'
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{See also}
 
 \helpref{wxFont}{wxfont}
diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex
index d2b140a783..52c5be1dfb 100644
--- a/docs/latex/wx/frame.tex
+++ b/docs/latex/wx/frame.tex
@@ -14,6 +14,10 @@ the remaining size available to application windows.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/frame.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/ftp.tex b/docs/latex/wx/ftp.tex
index 27ed3af7f8..b7e337ed92 100644
--- a/docs/latex/wx/ftp.tex
+++ b/docs/latex/wx/ftp.tex
@@ -4,6 +4,10 @@
 
 \helpref{wxProtocol}{wxprotocol}
 
+\wxheading{Include files}
+
+<wx/ftp.h>
+
 \wxheading{See also}
 
 \helpref{wxSocketBase}{wxsocketbase}
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 07d95c757e..655af485a7 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -6,7 +6,13 @@ The functions defined in wxWindows are described here.
 
 \section{File functions}\label{filefunctions}
 
-See also \helpref{wxPathList}{wxpathlist}.
+\wxheading{Include files}
+
+<wx/utils.h>
+
+\wxheading{See also}
+
+\helpref{wxPathList}{wxpathlist}
 
 \membersection{::wxDirExists}
 
@@ -332,6 +338,10 @@ if (s)
 Remember that the returned pointer is temporary and should be copied
 if other wxWindows calls will be made before the value is to be used.
 
+\wxheading{Include files}
+
+<wx/filedlg.h>
+
 \membersection{::wxGetTextFromUser}\label{wxgettextfromuser}
 
 \func{wxString}{wxGetTextFromUser}{\param{const wxString\& }{message}, \param{const wxString\& }{caption = ``Input text"},\\
@@ -345,6 +355,10 @@ or press Cancel to return NULL.
 If {\it centre} is TRUE, the message text (which may include new line characters)
 is centred; if FALSE, the message is left-justified.
 
+\wxheading{Include files}
+
+<wx/textdlg.h>
+
 \membersection{::wxGetMultipleChoice}\label{wxgetmultiplechoice}
 
 \func{int}{wxGetMultipleChoice}{\param{const wxString\& }{message}, \param{const wxString\& }{caption}, \param{int}{ n}, \param{const wxString\& }{choices[]},\\
@@ -367,6 +381,10 @@ If Cancel is pressed, -1 is returned.
 If {\it centre} is TRUE, the message text (which may include new line characters)
 is centred; if FALSE, the message is left-justified.
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \membersection{::wxGetSingleChoice}\label{wxgetsinglechoice}
 
 \func{wxString}{wxGetSingleChoice}{\param{const wxString\& }{message}, \param{const wxString\& }{caption}, \param{int}{ n}, \param{const wxString\& }{choices[]},\\
@@ -382,6 +400,10 @@ Cancel to return NULL.
 If {\it centre} is TRUE, the message text (which may include new line characters)
 is centred; if FALSE, the message is left-justified.
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \membersection{::wxGetSingleChoiceIndex}\label{wxgetsinglechoiceindex}
 
 \func{int}{wxGetSingleChoiceIndex}{\param{const wxString\& }{message}, \param{const wxString\& }{caption}, \param{int}{ n}, \param{const wxString\& }{choices[]},\\
@@ -391,6 +413,10 @@ is centred; if FALSE, the message is left-justified.
 As {\bf wxGetSingleChoice} but returns the index representing the selected string.
 If the user pressed cancel, -1 is returned.
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \membersection{::wxGetSingleChoiceData}\label{wxgetsinglechoicedata}
 
 \func{wxString}{wxGetSingleChoiceData}{\param{const wxString\& }{message}, \param{const wxString\& }{caption}, \param{int}{ n}, \param{const wxString\& }{choices[]},\\
@@ -400,6 +426,10 @@ If the user pressed cancel, -1 is returned.
 As {\bf wxGetSingleChoice} but takes an array of client data pointers
 corresponding to the strings, and returns one of these pointers.
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \membersection{::wxMessageBox}\label{wxmessagebox}
 
 \func{int}{wxMessageBox}{\param{const wxString\& }{message}, \param{const wxString\& }{caption = ``Message"}, \param{int}{ style = wxOK \pipe wxCENTRE},\\
@@ -442,10 +472,18 @@ is specified in the style, in which case a generic function is used.
 This is because the native MessageBox function cannot centre text.
 The symbols are not shown when the generic function is used.
 
+\wxheading{Include files}
+
+<wx/msgdlg.h>
+
 \section{GDI functions}\label{gdifunctions}
 
 The following are relevant to the GDI (Graphics Device Interface).
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \membersection{::wxColourDisplay}
 
 \func{bool}{wxColourDisplay}{\void}
@@ -498,6 +536,10 @@ See also \helpref{wxCursor}{wxcursor}, \helpref{wxWindow::SetCursor}{wxwindowset
 The following functions are used to control PostScript printing. Under
 Windows, PostScript output can only be sent to a file.
 
+\wxheading{Include files}
+
+<wx/dcps.h>
+
 \membersection{::wxGetPrinterCommand}
 
 \func{wxString}{wxGetPrinterCommand}{\void}
@@ -600,6 +642,10 @@ Sets the translation (from the top left corner) for PostScript output. The defau
 
 These clipboard functions are implemented for Windows only.
 
+\wxheading{Include files}
+
+<wx/clipbrd.h>
+
 \membersection{::wxClipboardOpen}
 
 \func{bool}{wxClipboardOpen}{\void}
@@ -697,19 +743,27 @@ The clipboard must have previously been opened for this call to succeed.
 
 \section{Miscellaneous functions}\label{miscellany}
 
-\membersection{::NewId}
+\membersection{::wxNewId}
 
-\func{long}{NewId}{\void}
+\func{long}{wxNewId}{\void}
 
 Generates an integer identifier unique to this run of the program.
 
-\membersection{::RegisterId}
+\wxheading{Include files}
+
+<wx/utils.h>
 
-\func{void}{RegisterId}{\param{long}{ id}}
+\membersection{::wxRegisterId}
+
+\func{void}{wxRegisterId}{\param{long}{ id}}
 
 Ensures that ids subsequently generated by {\bf NewId} do not clash with
 the given {\bf id}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxBeginBusyCursor}\label{wxbeginbusycursor}
 
 \func{void}{wxBeginBusyCursor}{\param{wxCursor *}{cursor = wxHOURGLASS\_CURSOR}}
@@ -721,20 +775,19 @@ ensures that only the outer calls take effect.
 
 See also \helpref{wxIsBusy}{wxisbusy}, \helpref{wxBusyCursor}{wxbusycursor}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxBell}
 
 \func{void}{wxBell}{\void}
 
 Ring the system bell.
 
-\membersection{::wxCleanUp}\label{wxcleanup}
+\wxheading{Include files}
 
-\func{void}{wxCleanUp}{\void}
-
-Normally, wxWindows will call this cleanup function for you. However, if
-you call \helpref{wxEntry}{wxentry} in order to initialize wxWindows
-manually, then you should also call wxCleanUp before terminating wxWindows,
-if wxWindows does not get a chance to do it.
+<wx/utils.h>
 
 \membersection{::wxCreateDynamicObject}\label{wxcreatedynamicobject}
 
@@ -752,6 +805,10 @@ called by the application.
 
 See also helpref{wxDDEInitialize}{wxddeinitialize}.
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \membersection{::wxDDEInitialize}\label{wxddeinitialize}
 
 \func{void}{wxDDEInitialize}{\void}
@@ -764,6 +821,10 @@ by wxWindows if necessary.
 See also \helpref{wxDDEServer}{wxddeserver}, \helpref{wxDDEClient}{wxddeclient}, \helpref{wxDDEConnection}{wxddeconnection}, 
 \helpref{wxDDECleanUp}{wxddecleanup}.
 
+\wxheading{Include files}
+
+<wx/dde.h>
+
 \membersection{::wxDebugMsg}\label{wxdebugmsg}
 
 \func{void}{wxDebugMsg}{\param{const wxString\& }{fmt}, \param{...}{}}
@@ -787,18 +848,26 @@ instead.
 
 This function is now obsolete, replaced by \helpref{Log functions}{logfunctions}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxDisplaySize}
 
 \func{void}{wxDisplaySize}{\param{int *}{width}, \param{int *}{height}}
 
 Gets the physical size of the display in pixels.
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \membersection{::wxEntry}\label{wxentry}
 
 This initializes wxWindows in a platform-dependent way. Use this if you
 are not using the default wxWindows entry code (e.g. main or WinMain). For example,
 you can initialize wxWindows from an Microsoft Foundation Classes application using
-this function. See also \helpref{wxCleanUp}{wxcleanup}.
+this function.
 
 \func{void}{wxEntry}{\param{HANDLE}{ hInstance}, \param{HANDLE}{ hPrevInstance},
  \param{const wxString\& }{commandLine}, \param{int}{ cmdShow}, \param{bool}{ enterLoop = TRUE}}
@@ -816,6 +885,26 @@ wxWindows initialization under Windows (for applications constructed as a DLL).
 
 wxWindows initialization under Unix.
 
+\wxheading{Remarks}
+
+To clean up wxWindows, call wxApp::OnExit followed by the static function
+wxApp::CleanUp. For example, if exiting from an MFC application that also uses wxWindows:
+
+\begin{verbatim}
+int CTheApp::ExitInstance()
+{
+  // OnExit isn't called by CleanUp so must be called explicitly.
+  wxTheApp->OnExit();
+  wxApp::CleanUp();
+
+  return CWinApp::ExitInstance();
+}
+\end{verbatim}
+
+\wxheading{Include files}
+
+<wx/app.h>
+
 \membersection{::wxError}\label{wxerror}
 
 \func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Internal Error"}}
@@ -824,6 +913,10 @@ Displays {\it msg} and continues. This writes to standard error under
 Unix, and pops up a message box under Windows. Used for internal
 wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxEndBusyCursor}\label{wxendbusycursor}
 
 \func{void}{wxEndBusyCursor}{\void}
@@ -833,6 +926,10 @@ Use with \helpref{wxBeginBusyCursor}{wxbeginbusycursor}.
 
 See also \helpref{wxIsBusy}{wxisbusy}, \helpref{wxBusyCursor}{wxbusycursor}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxExecute}\label{wxexecute}
 
 \func{long}{wxExecute}{\param{const wxString\& }{command}, \param{bool }{sync = FALSE}, \param{wxProcess *}{callback = NULL}}
@@ -859,6 +956,10 @@ the process finishes.
 
 See also \helpref{wxShell}{wxshell}, \helpref{wxProcess}{wxprocess}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxExit}\label{wxexit}
 
 \func{void}{wxExit}{\void}
@@ -868,6 +969,10 @@ Should only be used in an emergency: normally the top-level frame
 should be deleted (after deleting all other frames) to terminate the
 application. See \helpref{wxWindow::OnCloseWindow}{wxwindowonclosewindow} and \helpref{wxApp}{wxapp}.
 
+\wxheading{Include files}
+
+<wx/app.h>
+
 \membersection{::wxFatalError}\label{wxfatalerror}
 
 \func{void}{wxFatalError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Fatal Error"}}
@@ -876,12 +981,20 @@ Displays {\it msg} and exits. This writes to standard error under Unix,
 and pops up a message box under Windows. Used for fatal internal
 wxWindows errors. See also \helpref{wxError}{wxerror}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxFindMenuItemId}
 
 \func{int}{wxFindMenuItemId}{\param{wxFrame *}{frame}, \param{const wxString\& }{menuString}, \param{const wxString\& }{itemString}}
 
 Find a menu item identifier associated with the given frame's menu bar.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxFindWindowByLabel}
 
 \func{wxWindow *}{wxFindWindowByLabel}{\param{const wxString\& }{label}, \param{wxWindow *}{parent=NULL}}
@@ -891,6 +1004,10 @@ or panel item label. If {\it parent} is NULL, the search will start from all top
 frames and dialog boxes; if non-NULL, the search will be limited to the given window hierarchy.
 The search is recursive in both cases.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxFindWindowByName}\label{wxfindwindowbyname}
 
 \func{wxWindow *}{wxFindWindowByName}{\param{const wxString\& }{name}, \param{wxWindow *}{parent=NULL}}
@@ -902,24 +1019,40 @@ The search is recursive in both cases.
 
 If no such named window is found, {\bf wxFindWindowByLabel} is called.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetActiveWindow}\label{wxgetactivewindow}
 
 \func{wxWindow *}{wxGetActiveWindow}{\void}
 
 Gets the currently active window (Windows only).
 
+\wxheading{Include files}
+
+<wx/windows.h>
+
 \membersection{::wxGetDisplayName}\label{wxgetdisplayname}
 
 \func{wxString}{wxGetDisplayName}{\void}
 
 Under X only, returns the current display name. See also \helpref{wxSetDisplayName}{wxsetdisplayname}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetHomeDir}
 
 \func{wxString}{wxGetHomeDir}{\param{const wxString\& }{buf}}
 
 Fills the buffer with a string representing the user's home directory (Unix only).
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetHostName}
 
 \func{bool}{wxGetHostName}{\param{const wxString\& }{buf}, \param{int}{ bufSize}}
@@ -929,6 +1062,10 @@ buffer {\it buf}, of maximum size {\it bufSize}, returning TRUE if
 successful. Under Unix, this will return a machine name. Under Windows,
 this returns ``windows''.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetElapsedTime}\label{wxgetelapsedtime}
 
 \func{long}{wxGetElapsedTime}{\param{bool}{ resetTimer = TRUE}}
@@ -940,6 +1077,10 @@ by this call.
 
 See also \helpref{wxTimer}{wxtimer}.
 
+\wxheading{Include files}
+
+<wx/timer.h>
+
 \membersection{::wxGetFreeMemory}\label{wxgetfreememory}
 
 \func{long}{wxGetFreeMemory}{\void}
@@ -948,12 +1089,20 @@ Returns the amount of free memory in Kbytes under environments which
 support it, and -1 if not supported. Currently, returns a positive value
 under Windows, and -1 under Unix.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetMousePosition}
 
 \func{void}{wxGetMousePosition}{\param{int* }{x}, \param{int* }{y}}
 
 Returns the mouse position in screen coordinates.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetOsVersion}
 
 \func{int}{wxGetOsVersion}{\param{int *}{major = NULL}, \param{int *}{minor = NULL}}
@@ -973,6 +1122,10 @@ Gets operating system version information.
 \twocolitem{Watcom C++ 386 supervisor mode (Windows 3.1)}{Return value is wxWIN386, {\it major} is 3, {\it minor} is 1.}
 \end{twocollist}
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetResource}\label{wxgetresource}
 
 \func{bool}{wxGetResource}{\param{const wxString\& }{section}, \param{const wxString\& }{entry},
@@ -1003,6 +1156,10 @@ the overloading of the function for different types.
 
 See also \helpref{wxWriteResource}{wxwriteresource}, \helpref{wxConfigBase}{wxconfigbase}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetUserId}
 
 \func{bool}{wxGetUserId}{\param{const wxString\& }{buf}, \param{int}{ bufSize}}
@@ -1011,6 +1168,10 @@ Copies the user's login identity (such as ``jacs'') into the buffer {\it
 buf}, of maximum size {\it bufSize}, returning TRUE if successful.
 Under Windows, this returns ``user''.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxGetUserName}
 
 \func{bool}{wxGetUserName}{\param{const wxString\& }{buf}, \param{int}{ bufSize}}
@@ -1019,6 +1180,10 @@ Copies the user's name (such as ``Julian Smart'') into the buffer {\it
 buf}, of maximum size {\it bufSize}, returning TRUE if successful.
 Under Windows, this returns ``unknown''.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxKill}\label{wxkill}
 
 \func{int}{wxKill}{\param{long}{ pid}, \param{int}{ sig}}
@@ -1029,12 +1194,9 @@ Returns 0 on success, -1 on failure.
 Tip: sending a signal of 0 to a process returns -1 if the process does not exist.
 It does not raise a signal in the receiving process.
 
-\membersection{::wxInitClipboard}\label{wxinitclipboard}
+\wxheading{Include files}
 
-\func{void}{wxInitClipboard}{\void}
-
-Initializes the generic clipboard system by creating an instance of
-the class \helpref{wxClipboard}{wxclipboard}.
+<wx/utils.h>
 
 \membersection{::wxIsBusy}\label{wxisbusy}
 
@@ -1045,6 +1207,10 @@ Returns TRUE if between two \helpref{wxBeginBusyCursor}{wxbeginbusycursor} and\r
 
 See also \helpref{wxBusyCursor}{wxbusycursor}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxLoadUserResource}\label{wxloaduserresource}
 
 \func{wxString}{wxLoadUserResource}{\param{const wxString\& }{resourceName}, \param{const wxString\& }{resourceType=``TEXT"}}
@@ -1066,23 +1232,35 @@ using \helpref{wxResourceParseString}{wxresourceparsestring}.
 
 This function is available under Windows only.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxNow}\label{wxnow}
 
 \func{wxString}{wxNow}{\void}
 
 Returns a string representing the current date and time.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxPostDelete}\label{wxpostdelete}
 
 \func{void}{wxPostDelete}{\param{wxObject *}{object}}
 
-Under X, tells the system to delete the specified object when
+Tells the system to delete the specified object when
 all other events have been processed. In some environments, it is
 necessary to use this instead of deleting a frame directly with the
-delete operator, because X will still send events to the window.
+delete operator, because some GUIs will still send events to a deleted window.
 
 Now obsolete: use \helpref{wxWindow::Close}{wxwindowclose} instead.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxSetDisplayName}\label{wxsetdisplayname}
 
 \func{void}{wxSetDisplayName}{\param{const wxString\& }{displayName}}
@@ -1094,6 +1272,10 @@ displays to be used.
 
 See also \helpref{wxGetDisplayName}{wxgetdisplayname}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxShell}\label{wxshell}
 
 \func{bool}{wxShell}{\param{const wxString\& }{command = NULL}}
@@ -1103,12 +1285,20 @@ specified, then just the shell is spawned.
 
 See also \helpref{wxExecute}{wxexecute}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxSleep}\label{wxsleep}
 
 \func{void}{wxSleep}{\param{int}{ secs}}
 
 Sleeps for the specified number of seconds.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxStripMenuCodes}
 
 \func{wxString}{wxStripMenuCodes}{\param{const wxString\& }{in}}
@@ -1121,6 +1311,10 @@ in {\it out} (or returns the new string, in the first form).
 Menu codes include \& (mark the next character with an underline
 as a keyboard shortkey in Windows and Motif) and $\backslash$t (tab in Windows).
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxStartTimer}\label{wxstarttimer}
 
 \func{void}{wxStartTimer}{\void}
@@ -1129,18 +1323,30 @@ Starts a stopwatch; use \helpref{::wxGetElapsedTime}{wxgetelapsedtime} to get th
 
 See also \helpref{wxTimer}{wxtimer}.
 
+\wxheading{Include files}
+
+<wx/timer.h>
+
 \membersection{::wxToLower}\label{wxtolower}
 
 \func{char}{wxToLower}{\param{char }{ch}}
 
 Converts the character to lower case. This is implemented as a macro for efficiency.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxToUpper}\label{wxtoupper}
 
 \func{char}{wxToUpper}{\param{char }{ch}}
 
 Converts the character to upper case. This is implemented as a macro for efficiency.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxTrace}\label{wxtrace}
 
 \func{void}{wxTrace}{\param{const wxString\& }{fmt}, \param{...}{}}
@@ -1150,6 +1356,10 @@ is directed to the current output stream (see \helpref{wxDebugContext}{wxdebugco
 
 This function is now obsolete, replaced by \helpref{Log functions}{logfunctions}.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \membersection{::wxTraceLevel}\label{wxtracelevel}
 
 \func{void}{wxTraceLevel}{\param{int}{ level}, \param{const wxString\& }{fmt}, \param{...}{}}
@@ -1162,6 +1372,10 @@ this value.
 
 This function is now obsolete, replaced by \helpref{Log functions}{logfunctions}.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \membersection{::wxWriteResource}\label{wxwriteresource}
 
 \func{bool}{wxWriteResource}{\param{const wxString\& }{section}, \param{const wxString\& }{entry},
@@ -1189,6 +1403,10 @@ file under Unix, although the WIN.INI file is fair game under Windows.
 
 See also \helpref{wxGetResource}{wxgetresource}, \helpref{wxConfigBase}{wxconfigbase}.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxYield}
 
 \func{bool}{wxYield}{\void}
@@ -1203,6 +1421,10 @@ user to perform actions which are not compatible with the current task.
 Disabling menu items or whole menus during processing can avoid unwanted
 reentrance of code.
 
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \section{Macros}\label{macros}
 
 These macros are defined in wxWindows.
@@ -1213,6 +1435,10 @@ These macros are defined in wxWindows.
 
 Returns a pointer to the wxClassInfo object associated with this class.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{WXDEBUG\_NEW}\label{debugnew}
 
 \func{}{WXDEBUG\_NEW}{arg}
@@ -1226,6 +1452,10 @@ with filename and line number arguments. The definition is:
 
 In non-debug mode, this is defined as the normal new operator.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{DECLARE\_ABSTRACT\_CLASS}
 
 \func{}{DECLARE\_ABSTRACT\_CLASS}{className}
@@ -1248,6 +1478,10 @@ class wxCommand: public wxObject
 };
 \end{verbatim}
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{DECLARE\_APP}\label{declareapp}
 
 \func{}{DECLARE\_APP}{className}
@@ -1261,6 +1495,10 @@ Example:
   DECLARE_APP(MyApp)
 \end{verbatim}
 
+\wxheading{Include files}
+
+<wx/app.h>
+
 \membersection{DECLARE\_CLASS}
 
 \func{}{DECLARE\_CLASS}{className}
@@ -1269,6 +1507,10 @@ Used inside a class declaration to declare that the class should be
 made known to the class hierarchy, but objects of this class cannot be created
 dynamically. The same as DECLARE\_ABSTRACT\_CLASS.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{DECLARE\_DYNAMIC\_CLASS}
 
 \func{}{DECLARE\_DYNAMIC\_CLASS}{className}
@@ -1290,6 +1532,10 @@ class wxFrame: public wxWindow
 };
 \end{verbatim}
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_ABSTRACT\_CLASS}
 
 \func{}{IMPLEMENT\_ABSTRACT\_CLASS}{className, baseClassName}
@@ -1308,6 +1554,10 @@ wxCommand::wxCommand(void)
 }
 \end{verbatim}
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_ABSTRACT\_CLASS2}
 
 \func{}{IMPLEMENT\_ABSTRACT\_CLASS2}{className, baseClassName1, baseClassName2}
@@ -1315,6 +1565,10 @@ wxCommand::wxCommand(void)
 Used in a C++ implementation file to complete the declaration of
 a class that has run-time type information and two base classes. The same as IMPLEMENT\_CLASS2.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_APP}\label{implementapp}
 
 \func{}{IMPLEMENT\_APP}{className}
@@ -1336,6 +1590,10 @@ New form:
 
 See also \helpref{DECLARE\_APP}{declareapp}.
 
+\wxheading{Include files}
+
+<wx/app.h>
+
 \membersection{IMPLEMENT\_CLASS}
 
 \func{}{IMPLEMENT\_CLASS}{className, baseClassName}
@@ -1343,6 +1601,10 @@ See also \helpref{DECLARE\_APP}{declareapp}.
 Used in a C++ implementation file to complete the declaration of
 a class that has run-time type information. The same as IMPLEMENT\_ABSTRACT\_CLASS.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_CLASS2}
 
 \func{}{IMPLEMENT\_CLASS2}{className, baseClassName1, baseClassName2}
@@ -1351,6 +1613,10 @@ Used in a C++ implementation file to complete the declaration of a
 class that has run-time type information and two base classes. The
 same as IMPLEMENT\_ABSTRACT\_CLASS2.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_DYNAMIC\_CLASS}
 
 \func{}{IMPLEMENT\_DYNAMIC\_CLASS}{className, baseClassName}
@@ -1370,6 +1636,10 @@ wxFrame::wxFrame(void)
 }
 \end{verbatim}
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{IMPLEMENT\_DYNAMIC\_CLASS2}
 
 \func{}{IMPLEMENT\_DYNAMIC\_CLASS2}{className, baseClassName1, baseClassName2}
@@ -1379,6 +1649,10 @@ a class that has run-time type information, and whose instances
 can be created dynamically. Use this for classes derived from two
 base classes.
 
+\wxheading{Include files}
+
+<wx/object.h>
+
 \membersection{WXTRACE}\label{trace}
 
 \func{}{WXTRACE}{formatString, ...}
@@ -1388,6 +1662,10 @@ is directed to the current output stream (see \helpref{wxDebugContext}{wxdebugco
 
 This macro is now obsolete, replaced by \helpref{Log functions}{logfunctions}.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \membersection{WXTRACELEVEL}\label{tracelevel}
 
 \func{}{WXTRACELEVEL}{level, formatString, ...}
@@ -1400,6 +1678,10 @@ this value.
 
 This function is now obsolete, replaced by \helpref{Log functions}{logfunctions}.
 
+\wxheading{Include files}
+
+<wx/memory.h>
+
 \section{wxWindows resource functions}\label{resourcefuncs}
 
 \overview{wxWindows resource system}{resourceformats}
@@ -1416,6 +1698,8 @@ as wxWriteResource and wxGetResource. It's just an unfortunate clash of terminol
 See also \helpref{wxWindow::LoadFromResource}{wxwindowloadfromresource} for
 loading from resource data.
 
+{\bf Warning:} this needs updating for wxWindows 2.
+
 \membersection{::wxResourceAddIdentifier}\label{wxresourceaddidentifier}
 
 \func{bool}{wxResourceAddIdentifier}{\param{const wxString\& }{name}, \param{int }{value}}
@@ -1600,6 +1884,10 @@ Another name for \helpref{wxResourceRegisterBitmapData}{registerbitmapdata}.
 These functions provide a variety of logging functions: see \helpref{Log classes overview}{wxlogoverview} for
 further information.
 
+\wxheading{Include files}
+
+<wx/log.h>
+
 \membersection{::wxLogError}\label{wxlogerror}
 
 \func{void}{wxLogError}{\param{const char*}{ formatString}, \param{...}{}}
@@ -1693,6 +1981,10 @@ Useful macros and functins for error checking and defensive programming. ASSERTs
 compiled if \_\_WXDEBUG\_\_ is defined, whereas CHECK macros stay in release
 builds.
 
+\wxheading{Include files}
+
+<wx/debug.h>
+
 \membersection{::wxOnAssert}\label{wxonassert}
 
 \func{void}{wxOnAssert}{\param{const char*}{ fileName}, \param{int}{ lineNumber}, \param{const char*}{ msg = NULL}}
diff --git a/docs/latex/wx/gauge.tex b/docs/latex/wx/gauge.tex
index 6e9d9f61c5..a6b2336e9f 100644
--- a/docs/latex/wx/gauge.tex
+++ b/docs/latex/wx/gauge.tex
@@ -10,6 +10,10 @@ There are no user commands for the gauge.
 \helpref{wxEvtHandler}{wxEvtHandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gauge.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/gdiobj.tex b/docs/latex/wx/gdiobj.tex
index a2b98d53a3..db60a9da6c 100644
--- a/docs/latex/wx/gdiobj.tex
+++ b/docs/latex/wx/gdiobj.tex
@@ -11,6 +11,10 @@ Since the functionality of this class is platform-specific, it is not documented
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/gdiobj.h>
+
 \wxheading{See also}
 
 \helpref{wxPen}{wxpen}, \helpref{wxBrush}{wxbrush}, \helpref{wxFont}{wxfont}
diff --git a/docs/latex/wx/grid.tex b/docs/latex/wx/grid.tex
index 39e4a04a1b..db3368f9b7 100644
--- a/docs/latex/wx/grid.tex
+++ b/docs/latex/wx/grid.tex
@@ -9,6 +9,10 @@ wxGrid is a class for displaying and editing tabular information.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/grid.h>
+
 \wxheading{Window styles}
 
 There are no specific window styles for this class.
diff --git a/docs/latex/wx/hash.tex b/docs/latex/wx/hash.tex
index 5cb1232974..500a9dd526 100644
--- a/docs/latex/wx/hash.tex
+++ b/docs/latex/wx/hash.tex
@@ -8,6 +8,10 @@ key.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/hash.h>
+
 \wxheading{Example}
 
 Below is an example of using a hash table.
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 3f0265c1ae..8bb79f6dbd 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -25,14 +25,14 @@ There are currently the following help controller classes defined:
 The default browser is Netscape Navigator.
 \end{itemize}
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 wxHelpControllerBase\\
 \helpref{wxObject}{wxobject}
 
-\wxheading{Include file}
+\wxheading{Include files}
 
-{\tt <wx/help.h>}
+<wx/help.h>
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
diff --git a/docs/latex/wx/icon.tex b/docs/latex/wx/icon.tex
index cb0c24cef5..438cf63ce9 100644
--- a/docs/latex/wx/icon.tex
+++ b/docs/latex/wx/icon.tex
@@ -34,6 +34,10 @@ For more information please see \helpref{Bitmap and icon overview}{wxbitmapoverv
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/icon.h>
+
 \wxheading{See also}
 
 \helpref{Bitmap and icon overview}{wxbitmapoverview}, \helpref{supported bitmap file formats}{supportedbitmapformats}, 
diff --git a/docs/latex/wx/idleevt.tex b/docs/latex/wx/idleevt.tex
index 8cd51fe633..f38cf33a03 100644
--- a/docs/latex/wx/idleevt.tex
+++ b/docs/latex/wx/idleevt.tex
@@ -7,6 +7,10 @@ This class is used for idle events, which are generated when the system is idle.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an idle event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/ilayout.tex b/docs/latex/wx/ilayout.tex
index 22203abf69..9bbe08e3d9 100644
--- a/docs/latex/wx/ilayout.tex
+++ b/docs/latex/wx/ilayout.tex
@@ -10,6 +10,10 @@ which means that their values should be calculated by looking at known constrain
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/layout.h>
+
 \wxheading{See also}
 
 \helpref{Overview and examples}{constraintsoverview},\rtfsp
diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index d911a1fc28..7a9351b804 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -14,6 +14,10 @@ wxDC::DrawBitmap.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/image.h>
+
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}
@@ -465,8 +469,7 @@ application initialisation.
 
 \wxheading{Note (Legal Issue)}
 
-This software is based in part on the work of
- the Independent JPEG Group.
+This software is based in part on the work of the Independent JPEG Group.
 
 (Applies when wxWindows is linked with JPEG support. wxJPEGHandler uses libjpeg
 created by IJG.)
@@ -475,6 +478,10 @@ created by IJG.)
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/image.h>
+
 \wxheading{See also}
 
 \helpref{wxImage}{wximage}
diff --git a/docs/latex/wx/imaglist.tex b/docs/latex/wx/imaglist.tex
index a1f79912d9..aeab053604 100644
--- a/docs/latex/wx/imaglist.tex
+++ b/docs/latex/wx/imaglist.tex
@@ -12,6 +12,10 @@ wxImageList is used principally in conjunction with \helpref{wxTreeCtrl}{wxtreec
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/imaglist.h>
+
 \wxheading{See also}
 
 \helpref{wxTreeCtrl}{wxtreectrl}, \helpref{wxListCtrl}{wxlistctrl}
diff --git a/docs/latex/wx/indlgevt.tex b/docs/latex/wx/indlgevt.tex
index 067cf580ab..259a55b49d 100644
--- a/docs/latex/wx/indlgevt.tex
+++ b/docs/latex/wx/indlgevt.tex
@@ -8,6 +8,10 @@ Handlers for this event can transfer data to the window.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an activate event, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/inputstr.tex b/docs/latex/wx/inputstr.tex
index 795b834dd3..ae346a3178 100644
--- a/docs/latex/wx/inputstr.tex
+++ b/docs/latex/wx/inputstr.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxStreamBase}{wxstreambase}
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreambuffer}
diff --git a/docs/latex/wx/joyevent.tex b/docs/latex/wx/joyevent.tex
index f8da76cf65..8f2e8b3ced 100644
--- a/docs/latex/wx/joyevent.tex
+++ b/docs/latex/wx/joyevent.tex
@@ -7,6 +7,10 @@ events received by windows.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a mouse event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/joystick.tex b/docs/latex/wx/joystick.tex
index 338f11668f..f9c03f49fb 100644
--- a/docs/latex/wx/joystick.tex
+++ b/docs/latex/wx/joystick.tex
@@ -6,6 +6,10 @@ wxJoystick allows an application to control one or more joysticks.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/joystick.h>
+
 \wxheading{See also}
 
 \helpref{wxJoystickEvent}{wxjoystickevent}
diff --git a/docs/latex/wx/keyevent.tex b/docs/latex/wx/keyevent.tex
index f06eefa1fc..1248ec89cf 100644
--- a/docs/latex/wx/keyevent.tex
+++ b/docs/latex/wx/keyevent.tex
@@ -6,6 +6,10 @@ This event class contains information about keypress (character) events.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a key event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/layalgor.tex b/docs/latex/wx/layalgor.tex
index 6b0ff45c75..e4d58e3264 100644
--- a/docs/latex/wx/layalgor.tex
+++ b/docs/latex/wx/layalgor.tex
@@ -58,6 +58,10 @@ way of specifying layouts for which the normal constraint system is unsuitable.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/laywin.h>
+
 \wxheading{Event handling}
 
 The algorithm object does not respond to events, but itself generates the
diff --git a/docs/latex/wx/layout.tex b/docs/latex/wx/layout.tex
index 2b9e2e5dbc..31ec86c587 100644
--- a/docs/latex/wx/layout.tex
+++ b/docs/latex/wx/layout.tex
@@ -30,6 +30,10 @@ not be changed.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/layout.h>
+
 \wxheading{See also}
 
 \helpref{Overview and examples}{constraintsoverview},\rtfsp
diff --git a/docs/latex/wx/list.tex b/docs/latex/wx/list.tex
index 5fb29e84c1..af43ec1d2c 100644
--- a/docs/latex/wx/list.tex
+++ b/docs/latex/wx/list.tex
@@ -72,6 +72,10 @@ future versions completely.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/list.h>
+
 \wxheading{Example}
 
 It is very common to iterate on a list as follows:
diff --git a/docs/latex/wx/listbox.tex b/docs/latex/wx/listbox.tex
index e10378099b..60a60b9d2a 100644
--- a/docs/latex/wx/listbox.tex
+++ b/docs/latex/wx/listbox.tex
@@ -19,6 +19,10 @@ wxEVT\_COMMAND\_LISTBOX\_DOUBLE\_CLICKED for double clicks.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/listbox.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}%
diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex
index 557b320039..ea672c9b25 100644
--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -12,6 +12,10 @@ To intercept events from a list control, use the event table macros described in
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/listctrl.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/listevt.tex b/docs/latex/wx/listevt.tex
index e1561cda4d..f029808f6f 100644
--- a/docs/latex/wx/listevt.tex
+++ b/docs/latex/wx/listevt.tex
@@ -8,6 +8,10 @@ A list event holds information about events associated with wxListCtrl objects.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/listctrl.h>
+
 \wxheading{Event table macros}
 
 To process input from a list control, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/log.tex b/docs/latex/wx/log.tex
index de29116f55..8d3a6e6e4f 100644
--- a/docs/latex/wx/log.tex
+++ b/docs/latex/wx/log.tex
@@ -19,6 +19,10 @@ logging facilities.
 
 No base class
 
+\wxheading{Include files}
+
+<wx/log.h>
+
 \latexignore{\rtfignore{\wxheading{Function groups}}}
 
 \membersection{Static functions}
diff --git a/docs/latex/wx/mask.tex b/docs/latex/wx/mask.tex
index 7f004df69e..8933486d1c 100644
--- a/docs/latex/wx/mask.tex
+++ b/docs/latex/wx/mask.tex
@@ -7,6 +7,10 @@ the unmasked area is white.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/bitmap.h>
+
 \wxheading{Remarks}
 
 A mask may be associated with a \helpref{wxBitmap}{wxbitmap}. It is used in \helpref{wxDC::Blit}{wxdcblit} when
diff --git a/docs/latex/wx/mdi.tex b/docs/latex/wx/mdi.tex
index 11666e82c5..f5e909f304 100644
--- a/docs/latex/wx/mdi.tex
+++ b/docs/latex/wx/mdi.tex
@@ -10,6 +10,10 @@ which is itself a child of \helpref{wxMDIParentFrame}{wxmdiparentframe}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/mdi.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
@@ -153,6 +157,10 @@ more \helpref{wxMDIChildFrame}{wxmdichildframe} objects.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/mdi.h>
+
 \wxheading{Remarks}
 
 The client window is the area where MDI child windows exist. It doesn't have to cover the whole
@@ -225,6 +233,10 @@ and is used in many popular Windows applications, such as Microsoft Word(TM).
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/mdi.h>
+
 \wxheading{Remarks}
 
 There may be multiple MDI parent frames in a single application, but this probably only makes sense
diff --git a/docs/latex/wx/memorydc.tex b/docs/latex/wx/memorydc.tex
index ac29294fa4..9ae8c50927 100644
--- a/docs/latex/wx/memorydc.tex
+++ b/docs/latex/wx/memorydc.tex
@@ -7,6 +7,10 @@ A memory device context provides a means to draw graphics onto a bitmap.
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dcmemory.h>
+
 \wxheading{Remarks}
 
 A bitmap must be selected into the new memory DC before it may be used
diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index 203e6277c0..5862f357da 100644
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -12,6 +12,10 @@ identify the selection, or to change the menu item in some way.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/menu.h>
+
 \wxheading{Event handling}
 
 If the menu is part of a menubar, then \helpref{wxMenuBar}{wxmenubar} event processing is used.
@@ -351,6 +355,10 @@ A menu bar is a series of menus accessible from the top of a frame.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/menu.h>
+
 \wxheading{Event handling}
 
 To respond to a menu selection, provide a handler for EVT\_MENU, in the frame
diff --git a/docs/latex/wx/menuevt.tex b/docs/latex/wx/menuevt.tex
index 8e6ac0ffe0..51cba035cf 100644
--- a/docs/latex/wx/menuevt.tex
+++ b/docs/latex/wx/menuevt.tex
@@ -8,6 +8,10 @@ these do not include menu command events.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a menu event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/menuitem.tex b/docs/latex/wx/menuitem.tex
index aaa192d866..d780b742a7 100644
--- a/docs/latex/wx/menuitem.tex
+++ b/docs/latex/wx/menuitem.tex
@@ -9,6 +9,10 @@ bitmaps can be achieved via wxMenu on all platforms.
 wxOwnerDrawn (Windows only)\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/menuitem.h>
+
 \wxheading{See also}
 
 \helpref{wxMenuBar}{wxmenubar}, \helpref{wxMenu}{wxmenu}
diff --git a/docs/latex/wx/metafile.tex b/docs/latex/wx/metafile.tex
index 338d410ab5..394496c3b4 100644
--- a/docs/latex/wx/metafile.tex
+++ b/docs/latex/wx/metafile.tex
@@ -10,6 +10,10 @@ is to use a wxMetafileDC.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/metafile.h>
+
 \wxheading{See also}
 
 \helpref{wxMetafileDC}{wxmetafiledc}
@@ -94,6 +98,10 @@ closing your disk-based metafile device context.
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/metafile.h>
+
 \wxheading{See also}
 
 \helpref{wxMetafile}{wxmetafile}, \helpref{wxDC}{wxdc}
diff --git a/docs/latex/wx/mimetype.tex b/docs/latex/wx/mimetype.tex
index 55b6315eef..f2b8242b77 100644
--- a/docs/latex/wx/mimetype.tex
+++ b/docs/latex/wx/mimetype.tex
@@ -22,14 +22,14 @@ provided to load additional files.
 NB: Currently, wxMimeTypesManager is limited to reading MIME type information
 but it will support modifying it as well in the future versions.
 
-\wxheading{Required headers}
-
-<wx/mimetype.h>
-
 \wxheading{Derived from}
 
 No base class.
 
+\wxheading{Include files}
+
+<wx/mimetype.h>
+
 \wxheading{See also}
 
 \helpref{wxFileType}{wxfiletype}
diff --git a/docs/latex/wx/minifram.tex b/docs/latex/wx/minifram.tex
index afc01f7d0f..0acfcd6567 100644
--- a/docs/latex/wx/minifram.tex
+++ b/docs/latex/wx/minifram.tex
@@ -10,6 +10,10 @@ take up too much screen area.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/minifram.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/mltchdlg.tex b/docs/latex/wx/mltchdlg.tex
index f221a33152..709e91dfce 100644
--- a/docs/latex/wx/mltchdlg.tex
+++ b/docs/latex/wx/mltchdlg.tex
@@ -3,6 +3,8 @@
 This class represents a dialog that shows a list of strings, and allows
 the user to select one or more.
 
+{\bf NOTE:} this class is not yet implemented.
+
 \wxheading{Derived from}
 
 \helpref{wxDialog}{wxdialog}\\
@@ -10,6 +12,10 @@ the user to select one or more.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxMultipleChoiceDialog overview}{wxmultiplechoicedialogoverview}
diff --git a/docs/latex/wx/module.tex b/docs/latex/wx/module.tex
index 5df78e2e80..bb515828dc 100644
--- a/docs/latex/wx/module.tex
+++ b/docs/latex/wx/module.tex
@@ -35,6 +35,10 @@ For example:
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/module.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxModule::wxModule}\label{wxmoduleconstr}
diff --git a/docs/latex/wx/mouseevt.tex b/docs/latex/wx/mouseevt.tex
index a116241989..05ea9878c8 100644
--- a/docs/latex/wx/mouseevt.tex
+++ b/docs/latex/wx/mouseevt.tex
@@ -7,6 +7,10 @@ See \helpref{wxWindow::OnMouseEvent}{wxwindowonmouseevent}.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a mouse event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/moveevt.tex b/docs/latex/wx/moveevt.tex
index 8be4e9ba06..932dd343bb 100644
--- a/docs/latex/wx/moveevt.tex
+++ b/docs/latex/wx/moveevt.tex
@@ -7,6 +7,10 @@ A move event holds information about move change events.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a move event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/msgdlg.tex b/docs/latex/wx/msgdlg.tex
index c121b4d865..2a6874cdb4 100644
--- a/docs/latex/wx/msgdlg.tex
+++ b/docs/latex/wx/msgdlg.tex
@@ -10,6 +10,10 @@ with a choice of OK, Yes, No and Cancel buttons.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/msgdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxMessageDialog overview}{wxmessagedialogoverview}
diff --git a/docs/latex/wx/mutex.tex b/docs/latex/wx/mutex.tex
index c992dbe79a..8a8c1cc222 100644
--- a/docs/latex/wx/mutex.tex
+++ b/docs/latex/wx/mutex.tex
@@ -61,6 +61,10 @@ more so if yoor program uses C++ exceptions.
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxThread}{wxthread}, \helpref{wxCondition}{wxcondition},
diff --git a/docs/latex/wx/mutexlck.tex b/docs/latex/wx/mutexlck.tex
index 1db3945ac8..b0be0556c1 100644
--- a/docs/latex/wx/mutexlck.tex
+++ b/docs/latex/wx/mutexlck.tex
@@ -11,6 +11,10 @@ usage.
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxMutex}{wxmutex}, \helpref{wxCriticalSectionLocker}{wxcriticalsectionlocker}
diff --git a/docs/latex/wx/node.tex b/docs/latex/wx/node.tex
index 8e31a45dfd..389c874644 100644
--- a/docs/latex/wx/node.tex
+++ b/docs/latex/wx/node.tex
@@ -12,6 +12,10 @@ usage of this class is deprecated.
 
 None.
 
+\wxheading{Include files}
+
+<wx/list.h>
+
 \wxheading{See also}
 
 \helpref{wxList}{wxlist}, \helpref{wxHashTable}{wxhashtable}
diff --git a/docs/latex/wx/notebook.tex b/docs/latex/wx/notebook.tex
index 726da6a80a..a2a24c8739 100644
--- a/docs/latex/wx/notebook.tex
+++ b/docs/latex/wx/notebook.tex
@@ -15,6 +15,10 @@ managed by wxNotebook.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/notebook.h>
+
 \wxheading{Event handling}
 
 To process input from a notebook control, use the following event handler macros to direct input to member
diff --git a/docs/latex/wx/noteevt.tex b/docs/latex/wx/noteevt.tex
index 04c72ddc8e..ec5f2ac93f 100644
--- a/docs/latex/wx/noteevt.tex
+++ b/docs/latex/wx/noteevt.tex
@@ -9,6 +9,10 @@ This class represents the events generated by a notebook control.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/notebook.h>
+
 \wxheading{Event table macros}
 
 To process a notebook event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/outptstr.tex b/docs/latex/wx/outptstr.tex
index 7966a2c97d..eae660ae42 100644
--- a/docs/latex/wx/outptstr.tex
+++ b/docs/latex/wx/outptstr.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxStreamBase}{wxstreambase}
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreambuffer}
diff --git a/docs/latex/wx/pagedlg.tex b/docs/latex/wx/pagedlg.tex
index 082970f2c0..f02df12794 100644
--- a/docs/latex/wx/pagedlg.tex
+++ b/docs/latex/wx/pagedlg.tex
@@ -6,6 +6,10 @@ This class holds a variety of information related to \helpref{wxPageSetupDialog}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cmndata.h>
+
 \wxheading{See also}
 
 \helpref{wxPageSetupDialog}{wxpagesetupdialog}
@@ -207,6 +211,10 @@ application.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/printdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxPrintDialog}{wxprintdialog}, \helpref{wxPageSetupData}{wxpagesetupdata}
diff --git a/docs/latex/wx/paintdc.tex b/docs/latex/wx/paintdc.tex
index 05842fb646..c56a76832e 100644
--- a/docs/latex/wx/paintdc.tex
+++ b/docs/latex/wx/paintdc.tex
@@ -19,6 +19,10 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \helpref{wxDC}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcclient.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPaintDC}{wxpaintdc},\rtfsp
diff --git a/docs/latex/wx/paintevt.tex b/docs/latex/wx/paintevt.tex
index b60f34bf16..e7b0551f45 100644
--- a/docs/latex/wx/paintevt.tex
+++ b/docs/latex/wx/paintevt.tex
@@ -7,6 +7,10 @@ A paint event is sent when a window's contents needs to be repainted.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a paint event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/palette.tex b/docs/latex/wx/palette.tex
index 90738536ca..5aeaa852fd 100644
--- a/docs/latex/wx/palette.tex
+++ b/docs/latex/wx/palette.tex
@@ -9,6 +9,10 @@ of a low-depth bitmap, for example, to be mapped to the available colours in a d
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/palette.h>
+
 \wxheading{See also}
 
 \helpref{wxDC::SetPalette}{wxdcsetpalette}, \helpref{wxBitmap}{wxbitmap}
diff --git a/docs/latex/wx/panel.tex b/docs/latex/wx/panel.tex
index af873dd390..3d4d514fab 100644
--- a/docs/latex/wx/panel.tex
+++ b/docs/latex/wx/panel.tex
@@ -11,6 +11,10 @@ having any window as a parent.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/panel.h>
+
 \wxheading{Window styles}
 
 There are no specific styles for this window.
diff --git a/docs/latex/wx/pantabv.tex b/docs/latex/wx/pantabv.tex
index 69e9cc8546..8fbe4a7a01 100644
--- a/docs/latex/wx/pantabv.tex
+++ b/docs/latex/wx/pantabv.tex
@@ -7,6 +7,10 @@ The wxPanelTabView is responsible for input and output on a wxPanel.
 \helpref{wxTabView}{wxtabview}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tab.h>
+
 \wxheading{See also}
 
 \helpref{wxTabView overview}{wxtabviewoverview}, \helpref{wxTabView}{wxtabview}
diff --git a/docs/latex/wx/pathlist.tex b/docs/latex/wx/pathlist.tex
index 8310d24e3f..82fdc7c662 100644
--- a/docs/latex/wx/pathlist.tex
+++ b/docs/latex/wx/pathlist.tex
@@ -14,6 +14,10 @@ from the path.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/filefn.h>
+
 \wxheading{See also}
 
 \helpref{wxList}{wxlist}
diff --git a/docs/latex/wx/pen.tex b/docs/latex/wx/pen.tex
index 67f449b884..14400253a9 100644
--- a/docs/latex/wx/pen.tex
+++ b/docs/latex/wx/pen.tex
@@ -4,6 +4,15 @@ A pen is a drawing tool for drawing outlines. It is used for drawing
 lines and painting the outline of rectangles, ellipses, etc. It has a
 colour, a width and a style. 
 
+\wxheading{Derived from}
+
+\helpref{wxGDIObject}{wxgdiobject}\\
+\helpref{wxObject}{wxobject}
+
+\wxheading{Include files}
+
+<wx/pen.h>
+
 \wxheading{Remarks}
 
 On a monochrome display, wxWindows shows all non-white pens as black.
diff --git a/docs/latex/wx/point.tex b/docs/latex/wx/point.tex
index 056b85c451..06fdd5a9a4 100644
--- a/docs/latex/wx/point.tex
+++ b/docs/latex/wx/point.tex
@@ -5,10 +5,14 @@ It simply contains integer {\it x} and {\it y} members.
 
 See also \helpref{wxRealPoint}{wxrealpoint} for a floating point version.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 None
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{See also}
 
 \helpref{wxRealPoint}{wxrealpoint}
diff --git a/docs/latex/wx/postscpt.tex b/docs/latex/wx/postscpt.tex
index e654c282d8..c1d5e45eb1 100644
--- a/docs/latex/wx/postscpt.tex
+++ b/docs/latex/wx/postscpt.tex
@@ -9,6 +9,10 @@ descriptions of the member functions.
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/dcps.h>
+
 \membersection{wxPostScriptDC::wxPostScriptDC}
 
 \func{}{wxPostScriptDC}{\param{const wxString\& }{output}, \param{bool }{interactive = TRUE},\\
diff --git a/docs/latex/wx/prevwin.tex b/docs/latex/wx/prevwin.tex
index fbf2203a4f..93681025de 100644
--- a/docs/latex/wx/prevwin.tex
+++ b/docs/latex/wx/prevwin.tex
@@ -1,4 +1,3 @@
-
 \section{\class{wxPreviewCanvas}}\label{wxpreviewcanvas}
 
 A preview canvas is the default canvas used by the print preview
@@ -11,6 +10,10 @@ system to display the preview.
 \helpref{wxevthandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \helpref{wxPreviewFrame}{wxpreviewframe}, \helpref{wxPreviewControlBar}{wxpreviewcontrolbar},\rtfsp
@@ -52,6 +55,10 @@ or you can leave it as it is.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \helpref{wxPreviewFrame}{wxpreviewframe}, \helpref{wxPreviewCanvas}{wxpreviewcanvas},\rtfsp
@@ -121,6 +128,10 @@ class may be used without derivation.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \helpref{wxPreviewCanvas}{wxpreviewcanvas}, \helpref{wxPreviewControlBar}{wxpreviewcontrolbar},\rtfsp
diff --git a/docs/latex/wx/print.tex b/docs/latex/wx/print.tex
index fbc7e61755..f576dd3f8e 100644
--- a/docs/latex/wx/print.tex
+++ b/docs/latex/wx/print.tex
@@ -6,6 +6,10 @@ This class holds a variety of information related to print dialogs.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/cmndata.h>
+
 \wxheading{See also}
 
 \helpref{wxPrintDialog}{wxprintdialog}, \helpref{wxPrintDialog Overview}{wxprintdialogoverview}
@@ -167,6 +171,10 @@ a successfully dismissed print dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/printdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxPrintDialog Overview}{wxprintdialogoverview}
@@ -226,6 +234,10 @@ method of printing.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \helpref{Printing framework overview}{printingoverview}, \helpref{wxPrinterDC}{wxprinterdc}, \helpref{wxPrintDialog}{wxprintdialog},\rtfsp
@@ -309,6 +321,10 @@ achieving the correct scaling for the page.
 \helpref{wxDC}{wxdc}\\
 \helpref{wxObject}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcprint.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{Printing framework overview}{printingoverview}
@@ -338,6 +354,10 @@ wxPrintPreview object to initiate printing or previewing.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \helpref{Printing framework overview}{printingoverview}, \helpref{wxPrinterDC}{wxprinterdc}, \helpref{wxPrintDialog}{wxprintdialog},\rtfsp
@@ -489,6 +509,10 @@ immediately after the frame is shown.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/print.h>
+
 \wxheading{See also}
 
 \overview{Printing framework overview}{printingoverview}, \helpref{wxPrinterDC}{wxprinterdc}, \helpref{wxPrintDialog}{wxprintdialog},\rtfsp
diff --git a/docs/latex/wx/process.tex b/docs/latex/wx/process.tex
index ee84b0e404..b09bb386ef 100644
--- a/docs/latex/wx/process.tex
+++ b/docs/latex/wx/process.tex
@@ -8,6 +8,10 @@ isn't overriden.
 
 \helpref{wxEvtHandler}{wxevthandler}
 
+\wxheading{Include files}
+
+<wx/process.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxProcess::wxProcess}\label{wxprocessconstr}
diff --git a/docs/latex/wx/procevt.tex b/docs/latex/wx/procevt.tex
index 32663ecf35..897b5b961c 100644
--- a/docs/latex/wx/procevt.tex
+++ b/docs/latex/wx/procevt.tex
@@ -7,6 +7,10 @@ A process event is sent when a process is terminated.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/process.h>
+
 \wxheading{Event table macros}
 
 To process a wxProcessEvent, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/protocol.tex b/docs/latex/wx/protocol.tex
index c2232d2924..b5c35cf358 100644
--- a/docs/latex/wx/protocol.tex
+++ b/docs/latex/wx/protocol.tex
@@ -4,6 +4,10 @@
 
 \helpref{wxSocketClient}{wxsocketclient}
 
+\wxheading{Include files}
+
+<wx/protocol/protocol.h>
+
 \wxheading{See also}
 
 \helpref{wxSocketBase}{wxsocketbase}, \helpref{wxURL}{wxurl}
diff --git a/docs/latex/wx/prvdatob.tex b/docs/latex/wx/prvdatob.tex
index f3d7a22270..9b4542f50e 100644
--- a/docs/latex/wx/prvdatob.tex
+++ b/docs/latex/wx/prvdatob.tex
@@ -9,6 +9,10 @@ with a string literal corresponding to the mime-type of the data. Typically this
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxDataObject}{wxdataobject}
diff --git a/docs/latex/wx/prvtdrpt.tex b/docs/latex/wx/prvtdrpt.tex
index 21e6dddce4..adeedd7715 100644
--- a/docs/latex/wx/prvtdrpt.tex
+++ b/docs/latex/wx/prvtdrpt.tex
@@ -6,6 +6,10 @@ wxPrivateDropTarget is for...
 
 \helpref{wxDropTarget}{wxdroptarget}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{wxDropTarget}{wxdroptarget}
diff --git a/docs/latex/wx/query.tex b/docs/latex/wx/query.tex
index 02988522f4..923ed46348 100644
--- a/docs/latex/wx/query.tex
+++ b/docs/latex/wx/query.tex
@@ -2,10 +2,14 @@
 
 Every ODBC data column is represented by an instance of this class.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/odbc.h>
+
 \wxheading{See also}
 
 \overview{wxQueryCol overview}{wxquerycoloverview}, \overview{wxDatabase overview}{wxdatabaseoverview}
diff --git a/docs/latex/wx/qylayevt.tex b/docs/latex/wx/qylayevt.tex
index 73baa422dc..638317eea5 100644
--- a/docs/latex/wx/qylayevt.tex
+++ b/docs/latex/wx/qylayevt.tex
@@ -9,6 +9,10 @@ by the OnCalculateLayout handler which is itself invoked by wxLayoutAlgorithm.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/laywin.h>
+
 \wxheading{Event table macros}
 
 \twocolwidtha{7cm}%
diff --git a/docs/latex/wx/radiobox.tex b/docs/latex/wx/radiobox.tex
index a98a59a22e..ec378a7039 100644
--- a/docs/latex/wx/radiobox.tex
+++ b/docs/latex/wx/radiobox.tex
@@ -11,6 +11,10 @@ labelled buttons.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/radiobox.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/radiobut.tex b/docs/latex/wx/radiobut.tex
index 8d4f225add..48cae42ab5 100644
--- a/docs/latex/wx/radiobut.tex
+++ b/docs/latex/wx/radiobut.tex
@@ -10,6 +10,10 @@ exclusive options. It has a text label next to a (usually) round button.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/radiobut.h>
+
 \wxheading{Window styles}
 
 There are no specific styles for this class.
diff --git a/docs/latex/wx/realpoin.tex b/docs/latex/wx/realpoin.tex
index 380e997f2a..b9ddad00f4 100644
--- a/docs/latex/wx/realpoin.tex
+++ b/docs/latex/wx/realpoin.tex
@@ -4,9 +4,13 @@ A {\bf wxRealPoint} is a useful data structure for graphics operations.
 It contains floating point point {\it x} and {\it y} members.
 See also \helpref{wxPoint}{wxpoint} for an integer version.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
-\helpref{wxObject}{wxobject}
+None
+
+\wxheading{Include files}
+
+<wx/gdicmn.h>
 
 \wxheading{See also}
 
diff --git a/docs/latex/wx/recrdset.tex b/docs/latex/wx/recrdset.tex
index 532bddfef1..568fd85a24 100644
--- a/docs/latex/wx/recrdset.tex
+++ b/docs/latex/wx/recrdset.tex
@@ -4,10 +4,14 @@ Each wxRecordSet represents an ODBC database query. You can make multiple querie
 at a time by using multiple wxRecordSets with a wxDatabase or you can make
 your queries in sequential order using the same wxRecordSet.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/odbc.h>
+
 \wxheading{See also}
 
 \helpref{wxRecordSet overview}{wxrecordsetoverview}, \helpref{wxDatabase overview}{wxdatabaseoverview}
diff --git a/docs/latex/wx/rect.tex b/docs/latex/wx/rect.tex
index c99b66b423..28e610f021 100644
--- a/docs/latex/wx/rect.tex
+++ b/docs/latex/wx/rect.tex
@@ -6,6 +6,10 @@ A class for manipulating rectangles.
 
 None
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{See also}
 
 \helpref{wxPoint}{wxpoint}, \helpref{wxSize}{wxsize}
diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex
index a2828e8e24..fe16c0e250 100644
--- a/docs/latex/wx/region.tex
+++ b/docs/latex/wx/region.tex
@@ -8,6 +8,10 @@ reference counting, so copying and assignment operations are fast.
 \helpref{wxGDIObject}{wxgdiobject}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/region.h>
+
 \wxheading{See also}
 
 \helpref{wxRegionIterator}{wxregioniterator}
@@ -197,6 +201,10 @@ See \helpref{wxWindow::OnPaint}{wxwindowonpaint} for an example of use.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/region.h>
+
 \wxheading{See also}
 
 \helpref{wxWindow::OnPaint}{wxwindowonpaint}
diff --git a/docs/latex/wx/sashevt.tex b/docs/latex/wx/sashevt.tex
index b3b02eec3f..35b7d8559e 100644
--- a/docs/latex/wx/sashevt.tex
+++ b/docs/latex/wx/sashevt.tex
@@ -9,6 +9,10 @@ dragged by the user.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/sashwin.h>
+
 \wxheading{Event table macros}
 
 To process an activate event, use these event handler macros to direct input to a member
diff --git a/docs/latex/wx/sashlayw.tex b/docs/latex/wx/sashlayw.tex
index d584186b5f..ae906e2207 100644
--- a/docs/latex/wx/sashlayw.tex
+++ b/docs/latex/wx/sashlayw.tex
@@ -17,6 +17,10 @@ the purpose of this class in more detail.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/laywin.h>
+
 \wxheading{Window styles}
 
 See \helpref{wxSashWindow}{wxsashwindow}.
diff --git a/docs/latex/wx/sashwin.tex b/docs/latex/wx/sashwin.tex
index 9094aeb729..219d8e1944 100644
--- a/docs/latex/wx/sashwin.tex
+++ b/docs/latex/wx/sashwin.tex
@@ -11,6 +11,10 @@ via a \helpref{wxSashEvent}{wxsashevent} notification.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/sashwin.h>
+
 \wxheading{Window styles}
 
 The following styles apply in addition to the normal wxWindow styles.
diff --git a/docs/latex/wx/sckaddr.tex b/docs/latex/wx/sckaddr.tex
index 9c505887cc..e101799615 100644
--- a/docs/latex/wx/sckaddr.tex
+++ b/docs/latex/wx/sckaddr.tex
@@ -3,11 +3,15 @@
 % ----------------------------------------------------------------------------
 \section{\class{wxSockAddress}}\label{wxsockaddress}
 
+You are unlikely to need to use this class: only wxSocketBase uses it.
+
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
-{\bf Actually, you don't have to use these functions: only wxSocketBase use it.}
+\wxheading{Include files}
+
+<wx/socket.h>
 
 \wxheading{See also}
 
@@ -83,6 +87,10 @@ Returns the length of the socket address.
 
 \helpref{wxSockAddress}{wxsockaddress}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 % ----------------------------------------------------------------------------
 % MEMBERS
 % ----------------------------------------------------------------------------
diff --git a/docs/latex/wx/screendc.tex b/docs/latex/wx/screendc.tex
index 9c5b06a3ef..ab31f205bb 100644
--- a/docs/latex/wx/screendc.tex
+++ b/docs/latex/wx/screendc.tex
@@ -8,6 +8,10 @@ a wxScreenDC object.
 
 \helpref{wxDC}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcscreen.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPaintDC}{wxpaintdc},\rtfsp
diff --git a/docs/latex/wx/scrolbar.tex b/docs/latex/wx/scrolbar.tex
index cb4a11d0b9..31891f3a1f 100644
--- a/docs/latex/wx/scrolbar.tex
+++ b/docs/latex/wx/scrolbar.tex
@@ -12,6 +12,10 @@ events are received.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/scrolbar.h>
+
 \wxheading{Remarks}
 
 A scrollbar has the following main attributes: {\it range}, {\it thumb size}, {\it page size}, and {\it position}.
diff --git a/docs/latex/wx/scrolevt.tex b/docs/latex/wx/scrolevt.tex
index 7ed9ea26de..9e70010e87 100644
--- a/docs/latex/wx/scrolevt.tex
+++ b/docs/latex/wx/scrolevt.tex
@@ -8,6 +8,10 @@ A scroll event holds information about events sent from scrollbars and scrolling
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a scroll event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex
index 631761b8a7..5b53e8aa36 100644
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -20,6 +20,10 @@ scroll position.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/scrolwin.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/settings.tex b/docs/latex/wx/settings.tex
index c85151e9b6..5ef89d04d2 100644
--- a/docs/latex/wx/settings.tex
+++ b/docs/latex/wx/settings.tex
@@ -8,6 +8,10 @@ and user interface element sizes.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/settings.h>
+
 \wxheading{See also}
 
 \helpref{wxFont}{wxfont}, \helpref{wxColour}{wxcolour}
diff --git a/docs/latex/wx/size.tex b/docs/latex/wx/size.tex
index 2f9579b6e1..ef380c687c 100644
--- a/docs/latex/wx/size.tex
+++ b/docs/latex/wx/size.tex
@@ -3,10 +3,14 @@
 A {\bf wxSize} is a useful data structure for graphics operations.
 It simply contains integer {\it x} and {\it y} members.
 
-\wxheading{Derivation}
+\wxheading{Derived from}
 
 None
 
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \wxheading{See also}
 
 \helpref{wxPoint}{wxpoint}, \helpref{wxRealPoint}{wxrealpoint}
diff --git a/docs/latex/wx/sizeevt.tex b/docs/latex/wx/sizeevt.tex
index a06d99fa76..64256e167e 100644
--- a/docs/latex/wx/sizeevt.tex
+++ b/docs/latex/wx/sizeevt.tex
@@ -7,6 +7,10 @@ A size event holds information about size change events.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a size event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/slider.tex b/docs/latex/wx/slider.tex
index 968974c5eb..8697a032dd 100644
--- a/docs/latex/wx/slider.tex
+++ b/docs/latex/wx/slider.tex
@@ -15,6 +15,10 @@ Slider events are handled in the same way as a scrollbar.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/slider.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/sngchdlg.tex b/docs/latex/wx/sngchdlg.tex
index e5206ecd37..3ca1e4a513 100644
--- a/docs/latex/wx/sngchdlg.tex
+++ b/docs/latex/wx/sngchdlg.tex
@@ -11,6 +11,10 @@ and then pressing OK.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/choicdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxSingleChoiceDialog overview}{wxsinglechoicedialogoverview}
diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index f4e8f7df05..49a59bb227 100644
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -4,6 +4,10 @@
 
 \helpref{wxEvtHandler}{wxevthandler}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 % ---------------------------------------------------------------------------
 % Event handling
 % ---------------------------------------------------------------------------
@@ -469,6 +473,10 @@ Sets an event handler to be called when a socket event occured.
 
 \helpref{wxSocketBase}{wxsocketbase}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 % ---------------------------------------------------------------------------
 % Members
 % ---------------------------------------------------------------------------
@@ -544,6 +552,10 @@ This event class contains information about socket events.
 
 \helpref{wxEvent}{wxevent}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 \wxheading{Event table macros}
 
 To process a socket event, use these event handler macros to direct input to member
@@ -584,6 +596,10 @@ Returns the socket event type.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 % ---------------------------------------------------------------------------
 % Members
 % ---------------------------------------------------------------------------
@@ -733,6 +749,10 @@ Execute pending requests in all registered sockets.
 
 \helpref{wxSocketBase}{wxsocketbase}
 
+\wxheading{Include files}
+
+<wx/socket.h>
+
 % ---------------------------------------------------------------------------
 % Members
 % ---------------------------------------------------------------------------
diff --git a/docs/latex/wx/spinbutt.tex b/docs/latex/wx/spinbutt.tex
index 34698b944d..d2b3b3332a 100644
--- a/docs/latex/wx/spinbutt.tex
+++ b/docs/latex/wx/spinbutt.tex
@@ -10,6 +10,10 @@ used next to a text control for increment and decrementing a value.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/spinbutt.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/splitter.tex b/docs/latex/wx/splitter.tex
index d96ccb9551..135fbe299e 100644
--- a/docs/latex/wx/splitter.tex
+++ b/docs/latex/wx/splitter.tex
@@ -24,6 +24,10 @@ See also \helpref{window styles overview}{windowstyles}.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/splitter.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxSplitterWindow::wxSplitterWindow}\label{wxsplitterwindowconstr}
diff --git a/docs/latex/wx/statbmp.tex b/docs/latex/wx/statbmp.tex
index 201718e4cc..47cbbe5094 100644
--- a/docs/latex/wx/statbmp.tex
+++ b/docs/latex/wx/statbmp.tex
@@ -9,6 +9,10 @@ A static bitmap control displays a bitmap.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/statbmp.h>
+
 \wxheading{Window styles}
 
 There are no special styles for this control.
diff --git a/docs/latex/wx/statbox.tex b/docs/latex/wx/statbox.tex
index d57fbca254..e4c38bbe8a 100644
--- a/docs/latex/wx/statbox.tex
+++ b/docs/latex/wx/statbox.tex
@@ -10,6 +10,10 @@ a logical grouping of items.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/statbox.h>
+
 \wxheading{Window styles}
 
 There are no special styles for this control.
diff --git a/docs/latex/wx/stattext.tex b/docs/latex/wx/stattext.tex
index 4b6e81b9bd..81d1505b58 100644
--- a/docs/latex/wx/stattext.tex
+++ b/docs/latex/wx/stattext.tex
@@ -9,6 +9,10 @@ A static text control displays one or more lines of read-only text.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/stattext.h>
+
 \wxheading{Window styles}
 
 There are no special styles for this control.
diff --git a/docs/latex/wx/statusbr.tex b/docs/latex/wx/statusbr.tex
index 965e30bc28..13160da737 100644
--- a/docs/latex/wx/statusbr.tex
+++ b/docs/latex/wx/statusbr.tex
@@ -8,6 +8,16 @@ be variable length according to the size of the window.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Derived from}
+
+\helpref{wxWindow}{wxwindow}\\
+\helpref{wxEvtHandler}{wxevthandler}\\
+\helpref{wxObject}{wxobject}
+
+\wxheading{Include files}
+
+<wx/statusbr.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/stream.tex b/docs/latex/wx/stream.tex
index 69395451d0..20cf2e72d2 100644
--- a/docs/latex/wx/stream.tex
+++ b/docs/latex/wx/stream.tex
@@ -4,6 +4,10 @@
 
 None
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBase}{wxstreambase}
diff --git a/docs/latex/wx/strlist.tex b/docs/latex/wx/strlist.tex
index db26f1702f..79b0a3880c 100644
--- a/docs/latex/wx/strlist.tex
+++ b/docs/latex/wx/strlist.tex
@@ -10,6 +10,10 @@ member.
 \helpref{wxList}{wxlist}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/list.h>
+
 \wxheading{See also}
 
 \helpref{wxString}{wxstring}, \helpref{wxList}{wxlist}
diff --git a/docs/latex/wx/strmbase.tex b/docs/latex/wx/strmbase.tex
index f35be6e23c..b04bcdd83b 100644
--- a/docs/latex/wx/strmbase.tex
+++ b/docs/latex/wx/strmbase.tex
@@ -7,6 +7,10 @@
 
 None
 
+\wxheading{Include files}
+
+<wx/stream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreambuffer}
diff --git a/docs/latex/wx/strmfile.tex b/docs/latex/wx/strmfile.tex
index e19a2c946c..c96b061022 100644
--- a/docs/latex/wx/strmfile.tex
+++ b/docs/latex/wx/strmfile.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxInputStream}{wxinputstream}
 
+\wxheading{Include files}
+
+<wx/wfstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}
@@ -51,6 +55,10 @@ Returns TRUE if the stream is initialized and ready.
 
 \helpref{wxOutputStream}{wxoutputstream}
 
+\wxheading{Include files}
+
+<wx/wfstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}
@@ -96,6 +104,10 @@ Returns TRUE if the stream is initialized and ready.
 
 \helpref{wxFileOutputStream}{wxFileOutputStream}, \helpref{wxFileInputStream}{wxfileinputstream}
 
+\wxheading{Include files}
+
+<wx/wfstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}
diff --git a/docs/latex/wx/strmmem.tex b/docs/latex/wx/strmmem.tex
index 194478288e..f22a4bdaa0 100644
--- a/docs/latex/wx/strmmem.tex
+++ b/docs/latex/wx/strmmem.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxInputStream}{wxinputstream}
 
+\wxheading{Include files}
+
+<wx/mstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}
@@ -49,6 +53,10 @@ Destructor.
 
 \helpref{wxOutputStream}{wxoutputstream}
 
+\wxheading{Include files}
+
+<wx/mstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}
diff --git a/docs/latex/wx/strmsock.tex b/docs/latex/wx/strmsock.tex
index e49fd767f9..b482964b18 100644
--- a/docs/latex/wx/strmsock.tex
+++ b/docs/latex/wx/strmsock.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxInputStream}{wxinputStream}
 
+\wxheading{Include files}
+
+<wx/sckstrm.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxSocketBase}{wxsocketbase}
@@ -29,6 +33,10 @@ socket connection.
 
 \helpref{wxOutputStream}{wxoutputStream}
 
+\wxheading{Include files}
+
+<wx/sckstrm.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxSocketBase}{wxsocketbase}
diff --git a/docs/latex/wx/strmzlib.tex b/docs/latex/wx/strmzlib.tex
index e7e6cfd4ee..30997ea0cc 100644
--- a/docs/latex/wx/strmzlib.tex
+++ b/docs/latex/wx/strmzlib.tex
@@ -7,6 +7,10 @@
 
 \helpref{wxFilterInputStream}{wxfilterinputstream}
 
+\wxheading{Include files}
+
+<wx/zstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxInputStream}{wxinputstream}
@@ -25,6 +29,10 @@ stream to get new compressed data.
 
 \helpref{wxFilterOutputStream}{wxfilteroutputstream}
 
+\wxheading{Include files}
+
+<wx/zstream.h>
+
 \wxheading{See also}
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxOutputStream}{wxoutputstream}
diff --git a/docs/latex/wx/sysclevt.tex b/docs/latex/wx/sysclevt.tex
index dc1fd4918a..e0ff1959f7 100644
--- a/docs/latex/wx/sysclevt.tex
+++ b/docs/latex/wx/sysclevt.tex
@@ -9,6 +9,10 @@ This is only appropriate under Windows.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process a system colour changed event, use this event handler macro to direct input to a member
diff --git a/docs/latex/wx/tab.tex b/docs/latex/wx/tab.tex
index d4c7ce3900..3c29182dca 100644
--- a/docs/latex/wx/tab.tex
+++ b/docs/latex/wx/tab.tex
@@ -8,6 +8,10 @@ A dialog suitable for handling tabs.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tab.h>
+
 \wxheading{See also}
 
 \helpref{Tab classes overview}{wxtaboverview}
@@ -52,6 +56,10 @@ A panel suitable for handling tabs.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tab.h>
+
 \wxheading{See also}
 
 \helpref{Tab classes overview}{wxtaboverview}
@@ -86,6 +94,10 @@ You will rarely need to use this class directly.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tab.h>
+
 \wxheading{See also}
 
 \overview{Tab classes overview}{wxtaboverview}
@@ -227,6 +239,10 @@ Responsible for drawing tabs onto a window, and dealing with input.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tab.h>
+
 \wxheading{See also}
 
 \helpref{wxTabView overview}{wxtabviewoverview}, \helpref{wxPanelTabView}{wxpaneltabview}
diff --git a/docs/latex/wx/tabctrl.tex b/docs/latex/wx/tabctrl.tex
index f8ded606c1..cf23b6a41e 100644
--- a/docs/latex/wx/tabctrl.tex
+++ b/docs/latex/wx/tabctrl.tex
@@ -9,6 +9,10 @@ This class represents a tab control, which manages multiple tabs.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tabctrl.h>
+
 \wxheading{See also}
 
 \helpref{wxTabEvent}{wxtabevent}, \helpref{wxImageList}{wximagelist},\rtfsp
diff --git a/docs/latex/wx/tabevent.tex b/docs/latex/wx/tabevent.tex
index 0ec2f36aad..c578812222 100644
--- a/docs/latex/wx/tabevent.tex
+++ b/docs/latex/wx/tabevent.tex
@@ -9,6 +9,10 @@ This class represents the events generated by a tab control.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tabctrl.h>
+
 \wxheading{Event table macros}
 
 To process a tab event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/taskbar.tex b/docs/latex/wx/taskbar.tex
index f6a81a4288..f5d9fa9ace 100644
--- a/docs/latex/wx/taskbar.tex
+++ b/docs/latex/wx/taskbar.tex
@@ -7,6 +7,10 @@ mouse clicks. An icon has an optional tooltip. This class is only supported for
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/taskbar.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxTaskBarIcon::wxTaskBarIcon}\label{wxtaskbariconconstr}
diff --git a/docs/latex/wx/tcpclint.tex b/docs/latex/wx/tcpclint.tex
index 64da293405..40ae1dc631 100644
--- a/docs/latex/wx/tcpclint.tex
+++ b/docs/latex/wx/tcpclint.tex
@@ -17,6 +17,10 @@ a wxTCPConnection of the required class, when a connection is made.
 wxClientBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/sckipc.h>
+
 \wxheading{See also}
 
 \helpref{wxTCPServer}{wxtcpserver}, \helpref{wxTCPConnection}{wxtcpconnection}, 
diff --git a/docs/latex/wx/tcpconn.tex b/docs/latex/wx/tcpconn.tex
index 97dcd75491..a0aff6b751 100644
--- a/docs/latex/wx/tcpconn.tex
+++ b/docs/latex/wx/tcpconn.tex
@@ -20,6 +20,10 @@ to do something interesting.
 wxConnectionBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/sckipc.h>
+
 \wxheading{Types}
 
 \index{wxIPCFormat}wxIPCFormat is defined as follows:
diff --git a/docs/latex/wx/tcpservr.tex b/docs/latex/wx/tcpservr.tex
index 5f16cdd031..c25930389a 100644
--- a/docs/latex/wx/tcpservr.tex
+++ b/docs/latex/wx/tcpservr.tex
@@ -10,6 +10,10 @@ A DDE-based implementation for Windows is available using \helpref{wxDDEServer}{
 wxServerBase\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/sckipc.h>
+
 \wxheading{See also}
 
 \helpref{wxTCPClient}{wxtcpclient}, \helpref{wxTCPConnection}{wxtcpconnection}, \helpref{IPC overview}{ipcoverview}
diff --git a/docs/latex/wx/tempfile.tex b/docs/latex/wx/tempfile.tex
index 2a196c6432..8a0fe8089b 100644
--- a/docs/latex/wx/tempfile.tex
+++ b/docs/latex/wx/tempfile.tex
@@ -37,6 +37,10 @@ the modifications.
 
 No base class
 
+\wxheading{Include files}
+
+<wx/file.h>
+
 \wxheading{See also:}
 
 \helpref{wxFile}{wxfile}
diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex
index df79879a07..7b431f2672 100644
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -11,6 +11,10 @@ streambuf\\
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/textctrl.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
diff --git a/docs/latex/wx/textdlg.tex b/docs/latex/wx/textdlg.tex
index b6035be3a1..ef13e0b1d5 100644
--- a/docs/latex/wx/textdlg.tex
+++ b/docs/latex/wx/textdlg.tex
@@ -10,6 +10,10 @@ It is implemented as a generic wxWindows dialog.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/textdlg.h>
+
 \wxheading{See also}
 
 \helpref{wxTextEntryDialog overview}{wxtextentrydialogoverview}
diff --git a/docs/latex/wx/textfile.tex b/docs/latex/wx/textfile.tex
index 6c6720ac77..275479dab3 100644
--- a/docs/latex/wx/textfile.tex
+++ b/docs/latex/wx/textfile.tex
@@ -45,6 +45,10 @@ termination type if you wish.
 
 No base class
 
+\wxheading{Include files}
+
+<wx/textfile.h>
+
 \wxheading{Data structures}
 
 The following constants identify the line termination type:
diff --git a/docs/latex/wx/thread.tex b/docs/latex/wx/thread.tex
index 742473d5da..8910946811 100644
--- a/docs/latex/wx/thread.tex
+++ b/docs/latex/wx/thread.tex
@@ -12,6 +12,10 @@ such as \helpref{mutexes}{wxmutex} and/or \helpref{critical sections}{wxcritical
 
 None.
 
+\wxheading{Include files}
+
+<wx/thread.h>
+
 \wxheading{See also}
 
 \helpref{wxMutex}{wxmutex}, \helpref{wxCondition}{wxcondition}, \helpref{wxCriticalSection}{wxcriticalsection}
diff --git a/docs/latex/wx/time.tex b/docs/latex/wx/time.tex
index 5a68ca7ecb..2e463e402b 100644
--- a/docs/latex/wx/time.tex
+++ b/docs/latex/wx/time.tex
@@ -3,13 +3,17 @@
 Representation of time and date.
 
 NOTE: this class should be
-used with caution, since it is not fully tested. It may be replaced
-with a new class in the near future.
+used with caution, since it is not fully tested. It will be replaced
+with a new wxDateTime class in the near future.
 
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/time.h>
+
 \wxheading{Data structures}
 
 {\small \begin{verbatim}
diff --git a/docs/latex/wx/timer.tex b/docs/latex/wx/timer.tex
index 6f2094999f..a3d297137c 100644
--- a/docs/latex/wx/timer.tex
+++ b/docs/latex/wx/timer.tex
@@ -1,6 +1,6 @@
 \section{\class{wxTimer}}\label{wxtimer}
 
-The wxTimer object is an abstraction of MS Windows and X toolkit timers. To
+The wxTimer class allows you to execute code at specified intervals. To
 use it, derive a new class and override the {\bf Notify} member to
 perform the required action. Start with {\bf Start}, stop with {\bf
 Stop}, it's as simple as that.
@@ -9,6 +9,10 @@ Stop}, it's as simple as that.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/timer.h>
+
 \wxheading{See also}
 
 \helpref{::wxStartTimer}{wxstarttimer}, \helpref{::wxGetElapsedTime}{wxgetelapsedtime}
diff --git a/docs/latex/wx/tokenizr.tex b/docs/latex/wx/tokenizr.tex
index 5fa0df6e01..23a98634e7 100644
--- a/docs/latex/wx/tokenizr.tex
+++ b/docs/latex/wx/tokenizr.tex
@@ -6,6 +6,10 @@ wxStringTokenizer helps you to break a string up into a number of tokens.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/tokenzr.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxStringTokenizer::wxStringTokenizer}\label{wxstringtokenizerwxstringtokenizer}
diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 701b3f3c36..a4e872e328 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -23,6 +23,14 @@ wxToolBarBase\\
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/toolbar.h> (to allow wxWindows to select an appropriate toolbar class)\\
+<wx/tbarbase.h> (the base class)\\
+<wx/tbarmsw.h> (the non-Windows 95 Windows toolbar class)\\
+<wx/tbar95.h> (the Windows 95/98 toolbar class)\\
+<wx/tbarsmpl.h> (the generic simple toolbar class)
+
 \wxheading{Remarks}
 
 You may also create a toolbar that is managed by the frame, by
diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex
index 70578d0cf0..45c682774c 100644
--- a/docs/latex/wx/treectrl.tex
+++ b/docs/latex/wx/treectrl.tex
@@ -12,6 +12,10 @@ To intercept events from a tree control, use the event table macros described in
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/treectrl.h>
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}
@@ -538,6 +542,10 @@ always be allocated on the heap.
 
 wxTreeItemId
 
+\wxheading{Include files}
+
+<wx/treectrl.h>
+
 \wxheading{See also}
 
 \helpref{wxTreeCtrl}{wxtreectrl}
diff --git a/docs/latex/wx/treeevt.tex b/docs/latex/wx/treeevt.tex
index f8cdc48c03..02188ac288 100644
--- a/docs/latex/wx/treeevt.tex
+++ b/docs/latex/wx/treeevt.tex
@@ -8,6 +8,10 @@ A tree event holds information about events associated with wxTreeCtrl objects.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/treectrl.h>
+
 \wxheading{Event table macros}
 
 To process input from a tree control, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/txtdatob.tex b/docs/latex/wx/txtdatob.tex
index a30b181533..63cfc3cff3 100644
--- a/docs/latex/wx/txtdatob.tex
+++ b/docs/latex/wx/txtdatob.tex
@@ -13,6 +13,10 @@ and \helpref{WriteData}{wxtextdataobjectwritedata} will have to be overridden.
 
 \helpref{wxDataObject}{wxdataobject}
 
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
 \wxheading{See also}
 
 \helpref{wxDataObject}{wxdataobject}
diff --git a/docs/latex/wx/txtdrptg.tex b/docs/latex/wx/txtdrptg.tex
index 7fb0d64000..85549e31c1 100644
--- a/docs/latex/wx/txtdrptg.tex
+++ b/docs/latex/wx/txtdrptg.tex
@@ -6,6 +6,10 @@ A predefined drop target for dealing with text data.
 
 \helpref{wxDropTarget}{wxdroptarget}
 
+\wxheading{Include files}
+
+<wx/dnd.h>
+
 \wxheading{See also}
 
 \helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropSource}{wxdropsource}, 
diff --git a/docs/latex/wx/upduievt.tex b/docs/latex/wx/upduievt.tex
index c7f13a2734..e602979bd5 100644
--- a/docs/latex/wx/upduievt.tex
+++ b/docs/latex/wx/upduievt.tex
@@ -8,6 +8,10 @@ to give an application the chance to update various user interface elements.
 \helpref{wxEvent}{wxevent}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/event.h>
+
 \wxheading{Event table macros}
 
 To process an update event, use these event handler macros to direct input to member
diff --git a/docs/latex/wx/url.tex b/docs/latex/wx/url.tex
index 12385071e7..56a55a318c 100644
--- a/docs/latex/wx/url.tex
+++ b/docs/latex/wx/url.tex
@@ -4,6 +4,10 @@
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/url.h>
+
 \wxheading{See also}
 
 \helpref{wxSocketBase}{wxsocketbase}, \helpref{wxProtocol}{wxprotocol}
diff --git a/docs/latex/wx/valgen.tex b/docs/latex/wx/valgen.tex
index cabaeff412..8b2f5818b8 100644
--- a/docs/latex/wx/valgen.tex
+++ b/docs/latex/wx/valgen.tex
@@ -16,6 +16,10 @@ For more information, please see \helpref{Validator overview}{validatoroverview}
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/valgen.h>
+
 \wxheading{See also}
 
 \helpref{Validator overview}{validatoroverview}, \helpref{wxValidator}{wxvalidator}, 
diff --git a/docs/latex/wx/validatr.tex b/docs/latex/wx/validatr.tex
index c5c13bf4d2..2bbb2f7dd3 100644
--- a/docs/latex/wx/validatr.tex
+++ b/docs/latex/wx/validatr.tex
@@ -23,6 +23,10 @@ For more information, please see \helpref{Validator overview}{validatoroverview}
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/validate.h>
+
 \wxheading{See also}
 
 \helpref{Validator overview}{validatoroverview}, \helpref{wxTextValidator}{wxtextvalidator}
diff --git a/docs/latex/wx/valtext.tex b/docs/latex/wx/valtext.tex
index f466e3abd6..ab34ea4d74 100644
--- a/docs/latex/wx/valtext.tex
+++ b/docs/latex/wx/valtext.tex
@@ -10,6 +10,10 @@ For more information, please see \helpref{Validator overview}{validatoroverview}
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/valtext.h>
+
 \wxheading{See also}
 
 \helpref{Validator overview}{validatoroverview}, \helpref{wxValidator}{wxvalidator}, 
diff --git a/docs/latex/wx/variant.tex b/docs/latex/wx/variant.tex
index 95a84ac9af..f91ca59e14 100644
--- a/docs/latex/wx/variant.tex
+++ b/docs/latex/wx/variant.tex
@@ -25,6 +25,10 @@ wxPropertyValue may be replaced by wxVariant eventually.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/variant.h>
+
 \wxheading{See also}
 
 \helpref{wxVariantData}{wxvariantdata}
@@ -386,6 +390,10 @@ and override the pure virtual functions.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/variant.h>
+
 \wxheading{See also}
 
 \helpref{wxVariant}{wxvariant}
diff --git a/docs/latex/wx/view.tex b/docs/latex/wx/view.tex
index 139269555d..b988382746 100644
--- a/docs/latex/wx/view.tex
+++ b/docs/latex/wx/view.tex
@@ -10,6 +10,10 @@ and \helpref{wxDocManager}{wxdocmanager} classes.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/docview.h>
+
 \wxheading{See also}
 
 \helpref{wxView overview}{wxviewoverview}, \helpref{wxDocument}{wxdocument}, \helpref{wxDocTemplate}{wxdoctemplate},\rtfsp
diff --git a/docs/latex/wx/wave.tex b/docs/latex/wx/wave.tex
index 2cc66087a8..fe42ac8cfa 100644
--- a/docs/latex/wx/wave.tex
+++ b/docs/latex/wx/wave.tex
@@ -8,6 +8,10 @@ only.
 
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/wave.h>
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxWave::wxWave}\label{wxwaveconstr}
diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 464d0c733f..0929c65b7f 100644
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -9,6 +9,10 @@ before the window itself is deleted.
 \helpref{wxEvtHandler}{wxevthandler}\\
 \helpref{wxObject}{wxobject}
 
+\wxheading{Include files}
+
+<wx/window.h>
+
 \wxheading{Window styles}
 
 The following styles can apply to all windows, although they will not always make sense for a particular
diff --git a/docs/latex/wx/windowdc.tex b/docs/latex/wx/windowdc.tex
index ac0dcf681c..2112237ac3 100644
--- a/docs/latex/wx/windowdc.tex
+++ b/docs/latex/wx/windowdc.tex
@@ -16,6 +16,10 @@ To draw on the whole window including decorations, construct a \helpref{wxWindow
 
 \helpref{wxDC}{wxdc}
 
+\wxheading{Include files}
+
+<wx/dcclient.h>
+
 \wxheading{See also}
 
 \helpref{wxDC}{wxdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPaintDC}{wxpaintdc},\rtfsp
diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex
index 077bdf7e01..fda7f85030 100644
--- a/docs/latex/wx/wxstring.tex
+++ b/docs/latex/wx/wxstring.tex
@@ -4,6 +4,10 @@
 
 None
 
+\wxheading{Include files}
+
+<wx/string.h>
+
 \wxheading{See also}
 
 \overview{Overview}{wxstringoverview}
-- 
2.47.2

