diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 0b621274e9..387b2c7f93 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1164,7 +1164,7 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "
-		     "Do not create global print dialog data objects.") );
+                     "Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();
 
@@ -1180,7 +1180,7 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "
-		     "Do not create global print dialog data objects.") );
+                     "Do not create global print dialog data objects.") );
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index cf00ab21d5..85388cf0d7 100644
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -30,8 +30,9 @@
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
+
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
 #endif