diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index 192ae2b54a..df402a42d4 100644
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -133,7 +133,9 @@ public:
 
     QWidget *GetHandle() const wxOVERRIDE;
 
+#if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
+#endif
 
 #if wxUSE_ACCEL
     // accelerators
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 719ccb63bc..c3448b09f5 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -106,7 +106,7 @@ bool MyApp::OnInit(void)
     m_bitmap = image;
 #endif
     m_angle = 30;
-    m_testFont.Create(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+    m_testFont = wxFontInfo(10).Family(wxFONTFAMILY_SWISS);
 
 
     // Create the main frame window
diff --git a/src/common/ownerdrwcmn.cpp b/src/common/ownerdrwcmn.cpp
index 967a5a285b..faa6b4240a 100644
--- a/src/common/ownerdrwcmn.cpp
+++ b/src/common/ownerdrwcmn.cpp
@@ -36,6 +36,12 @@
     #include "wx/utils.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// constants for base class
+// ----------------------------------------------------------------------------
+
+int wxOwnerDrawnBase::ms_defaultMargin = 3;
+
 // ============================================================================
 // implementation
 // ============================================================================
diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 166e84542d..fa3ef819b7 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -23,12 +23,6 @@
 #include "wx/msw/private/dc.h"
 #include "wx/msw/wrapcctl.h"            // for HIMAGELIST
 
-// ----------------------------------------------------------------------------
-// constants for base class
-// ----------------------------------------------------------------------------
-
-int wxOwnerDrawnBase::ms_defaultMargin = 3;
-
 // ============================================================================
 // implementation of wxOwnerDrawn class
 // ============================================================================
diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp
index 3b7fda37b8..7e99e94ec2 100644
--- a/src/qt/dnd.cpp
+++ b/src/qt/dnd.cpp
@@ -8,6 +8,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DRAG_AND_DROP
+
 #include "wx/dnd.h"
 
 wxDropTarget::wxDropTarget(wxDataObject *WXUNUSED(dataObject))
@@ -58,3 +60,4 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
     return wxDragResult();
 }
 
+#endif // wxUSE_DRAG_AND_DROP
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
index 1ac40a3916..5ca92385b8 100644
--- a/src/qt/uiaction.cpp
+++ b/src/qt/uiaction.cpp
@@ -12,6 +12,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_UIACTIONSIMULATOR
+
 #include "wx/uiaction.h"
 #include "wx/private/uiaction.h"
 
@@ -24,8 +26,6 @@
 #include "wx/qt/private/converter.h"
 
 
-#if wxUSE_UIACTIONSIMULATOR
-
 using namespace Qt;
 using namespace QTest;
 
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index b82a4e3054..183a277f89 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -650,10 +650,12 @@ void wxWindowQt::ScrollWindow( int dx, int dy, const wxRect *rect )
 }
 
 
+#if wxUSE_DRAG_AND_DROP
 void wxWindowQt::SetDropTarget( wxDropTarget * WXUNUSED( dropTarget ) )
 {
     wxMISSING_IMPLEMENTATION( __FUNCTION__ );
 }
+#endif
 
 void wxWindowQt::SetWindowStyleFlag( long style )
 {