diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 6a8ede95ba..051447a2f1 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -74,6 +74,7 @@ public:
         { m_id = item.m_id; }
     bool IsOk() const                  { return m_id != NULL; }
     void* GetID() const                { return m_id; }
+    operator const void* () const      { return m_id; }
     
 private:
     void* m_id;
@@ -396,7 +397,7 @@ protected:
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
-WX_DECLARE_OBJARRAY(wxDataViewItem, wxDataViewItemArray);
+WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
 
 #define wxDV_SINGLE                  0x0000     // for convenience
 #define wxDV_MULTIPLE                0x0001     // can select multiple items
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index cfa0149e6a..1572f8c75f 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -533,9 +533,6 @@ void wxDataViewColumnBase::SetFlags(int flags)
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDataViewItemArray);
-
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()