diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index c3c1fe7c7e..557ecad1fd 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -135,10 +135,10 @@ public:
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
-#endif // wxUSE_DRAG_AND_DROP
 
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept) wxOVERRIDE;
+#endif // wxUSE_DRAG_AND_DROP
 
 #ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 458f24083a..bfcb6798f8 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1594,8 +1594,6 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
     }
 }
 
-#endif // wxUSE_DRAG_AND_DROP
-
 // old-style file manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
 void wxWindowMSW::DragAcceptFiles(bool accept)
@@ -1607,6 +1605,7 @@ void wxWindowMSW::DragAcceptFiles(bool accept)
         ::DragAcceptFiles(hWnd, (BOOL)accept);
     }
 }
+#endif // wxUSE_DRAG_AND_DROP
 
 // ----------------------------------------------------------------------------
 // tooltips