diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm
index 13ee14009c..dccffa0053 100644
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -1,22 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/checkbox.mm
+// Name:        src/cocoa/checkbox.mm
 // Purpose:     wxCheckBox
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_CHECKBOX
 
+#include "wx/checkbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
-    #include "wx/checkbox.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index e92a4ca990..2bbe652c8d 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -30,12 +30,11 @@
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bmpbuttn.h"
+    #include "wx/checkbox.h"
 #endif
 
-#include "wx/checkbox.h"
 #include "wx/textctrl.h"
 #include "wx/choice.h"
-#include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/longlong.h"
 #include "wx/sizer.h"
diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 32cfc4e50e..8cbda8d72e 100644
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/checkbox.cpp
+// Name:        src/msw/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
@@ -26,8 +26,9 @@
 
 #if wxUSE_CHECKBOX
 
+#include "wx/checkbox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/checkbox.h"
     #include "wx/brush.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
@@ -212,7 +213,7 @@ wxSize wxCheckBox::DoGetBestSize() const
     wxString str = wxGetWindowText(GetHWND());
 
     int wCheckbox, hCheckbox;
-    if ( !str.IsEmpty() )
+    if ( !str.empty() )
     {
         GetTextExtent(wxStripMenuCodes(str), &wCheckbox, &hCheckbox);
         wCheckbox += s_checkSize + GetCharWidth();
diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 3bdc229700..84d93fc94b 100644
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/os2/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      David Webster
 // Modified by:
@@ -12,8 +12,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/checkbox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/checkbox.h"
     #include "wx/brush.h"
     #include "wx/scrolwin.h"
     #include "wx/dcscreen.h"
@@ -51,20 +52,15 @@ bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam),
     return true;
 } // end of wxCheckBox::OS2Command
 
-bool wxCheckBox::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsLabel
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxValidator&                rValidator
-, const wxString&                   rsName
-)
+bool wxCheckBox::Create(wxWindow* pParent,
+                        wxWindowID vId,
+                        const wxString& rsLabel,
+                        const wxPoint& rPos,
+                        const wxSize& rSize,
+                        long lStyle,
+                        const wxValidator& rValidator,
+                        const wxString& rsName )
 {
-    LONG                            lColor;
-    bool                            bOk;
-
     if (!CreateControl( pParent
                        ,vId
                        ,rPos
@@ -73,14 +69,12 @@ bool wxCheckBox::Create(
                        ,rValidator
                        ,rsName
                       ))
-        return FALSE;
+        return false;
 
 
-    long                            osStyle = BS_AUTOCHECKBOX |
-                                              WS_TABSTOP      |
-                                              WS_VISIBLE;
+    long osStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE;
 
-    bOk = OS2CreateControl( wxT("BUTTON")
+    bool bOk = OS2CreateControl( wxT("BUTTON")
                            ,osStyle
                            ,rPos
                            ,rSize
@@ -88,7 +82,8 @@ bool wxCheckBox::Create(
                            ,0
                           );
     m_backgroundColour = pParent->GetBackgroundColour();
-    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    LONG lColor = (LONG)m_backgroundColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
@@ -98,11 +93,9 @@ bool wxCheckBox::Create(
     return bOk;
 } // end of wxCheckBox::Create
 
-void wxCheckBox::SetLabel(
-  const wxString&                   rsLabel
-)
+void wxCheckBox::SetLabel( const wxString& rsLabel )
 {
-    wxString                         sLabel=::wxPMTextToLabel(rsLabel);
+    wxString  sLabel=::wxPMTextToLabel(rsLabel);
     ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
 } // end of wxCheckBox::SetLabel
 
@@ -132,14 +125,10 @@ wxSize wxCheckBox::DoGetBestSize() const
         nHeightCheckbox = nCheckSize;
     }
 
-    return wxSize( nWidthCheckbox
-                  ,nHeightCheckbox
-                 );
+    return wxSize( nWidthCheckbox, nHeightCheckbox );
 } // end of wxCheckBox::DoGetBestSize
 
-void wxCheckBox::SetValue(
-  bool                              bValue
-)
+void wxCheckBox::SetValue( bool bValue )
 {
     ::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0);
 } // end of wxCheckBox::SetValue
@@ -153,9 +142,7 @@ bool wxCheckBox::GetValue() const
     return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L));
 } // end of wxCheckBox::GetValue
 
-void wxCheckBox::Command (
-  wxCommandEvent&                  rEvent
-)
+void wxCheckBox::Command ( wxCommandEvent& rEvent )
 {
     SetValue((rEvent.GetInt() != 0));
     ProcessCommand(rEvent);
diff --git a/src/palmos/checkbox.cpp b/src/palmos/checkbox.cpp
index 75e98f33be..1e1d14d925 100644
--- a/src/palmos/checkbox.cpp
+++ b/src/palmos/checkbox.cpp
@@ -26,8 +26,9 @@
 
 #if wxUSE_CHECKBOX
 
+#include "wx/checkbox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/checkbox.h"
     #include "wx/brush.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index 4f3c12ec0f..ca0acf8d1f 100644
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -35,10 +35,10 @@
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/button.h"
+    #include "wx/checkbox.h"
 #endif
 
 #include "wx/toplevel.h"
-#include "wx/checkbox.h"
 #include "wx/tglbtn.h"
 #include "wx/radiobut.h"
 #include "wx/slider.h"
diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 8be56e16f5..e1c6b75d31 100644
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -34,13 +34,13 @@
     #include "wx/frame.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
     #include "wx/button.h"
+    #include "wx/checkbox.h"
 #endif //WX_PRECOMP
 
 #include "wx/module.h"
 #include "wx/display.h"
 
 // controls for sending select event
-#include "wx/checkbox.h"
 #include "wx/radiobut.h"
 #include "wx/tglbtn.h"
 #include "wx/slider.h"
diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index 7f807740e4..d02c0c1d0b 100644
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -25,9 +25,10 @@
 
 #if wxUSE_CHECKBOX
 
+#include "wx/checkbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
-    #include "wx/checkbox.h"
     #include "wx/validate.h"
 
     #include "wx/button.h" // for wxACTION_BUTTON_XXX
diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index f67b7beb54..4f84fccd36 100644
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_chckb.cpp
+// Name:        src/xrc/xh_chckb.cpp
 // Purpose:     XRC resource for wxCheckBox
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -18,7 +18,10 @@
 #if wxUSE_XRC && wxUSE_CHECKBOX
 
 #include "wx/xrc/xh_chckb.h"
-#include "wx/checkbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/checkbox.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)