diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index d7399039a0..b2ca14d5eb 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -81,6 +81,11 @@ typedef int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, long sortDat
 #define wxLIST_STATE_FOCUSED        0x0002
 #define wxLIST_STATE_SELECTED       0x0004
 #define wxLIST_STATE_CUT            0x0008      // MSW only
+#define wxLIST_STATE_DISABLED       0x0010      // OS2 only
+#define wxLIST_STATE_FILTERED       0x0020      // OS2 only
+#define wxLIST_STATE_INUSE          0x0040      // OS2 only
+#define wxLIST_STATE_PICKED         0x0080      // OS2 only
+#define wxLIST_STATE_SOURCE         0x0100      // OS2 only
 
 // Hit test flags, used in HitTest
 #define wxLIST_HITTEST_ABOVE            0x0001  // Above the client area.
@@ -287,6 +292,10 @@ public:
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 
+#ifdef __WXPM__
+    int             m_miniImage; // handle to the mini image for OS/2
+#endif
+
 protected:
     // creates m_attr if we don't have it yet
     wxListItemAttr& Attributes()
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index c57ee5ef67..e1840f1fcb 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -26,6 +26,8 @@
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif