-#define VLC_OBJECT_MODULE (-2)
-#define VLC_OBJECT_INTF (-3)
-#define VLC_OBJECT_PLAYLIST (-4)
-#define VLC_OBJECT_INPUT (-5)
-#define VLC_OBJECT_DECODER (-6)
-#define VLC_OBJECT_VOUT (-7)
-#define VLC_OBJECT_AOUT (-8)
-#define VLC_OBJECT_PRIVATE (-666)
+#define VLC_OBJECT_VLC (-2)
+#define VLC_OBJECT_MODULE (-3)
+#define VLC_OBJECT_INTF (-4)
+#define VLC_OBJECT_PLAYLIST (-5)
+#define VLC_OBJECT_ITEM (-6)
+#define VLC_OBJECT_INPUT (-7)
+#define VLC_OBJECT_DECODER (-8)
+#define VLC_OBJECT_VOUT (-9)
+#define VLC_OBJECT_AOUT (-10)
+#define VLC_OBJECT_SOUT (-11)
+#define VLC_OBJECT_HTTPD (-12)
+#define VLC_OBJECT_PACKETIZER (-13)
+#define VLC_OBJECT_ENCODER (-14)
+#define VLC_OBJECT_DIALOGS (-15)
+#define VLC_OBJECT_VLM (-16)
+#define VLC_OBJECT_ANNOUNCE (-17)
+#define VLC_OBJECT_DEMUX (-18)
+#define VLC_OBJECT_ACCESS (-19)
+#define VLC_OBJECT_STREAM (-20)
+#define VLC_OBJECT_OPENGL (-21)
+
+#define VLC_OBJECT_GENERIC (-666)