Index: bindings/python/vlc_internal.c
===================================================================
--- bindings/python/vlc_internal.c	(revision 25365)
+++ bindings/python/vlc_internal.c	(working copy)
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "../../config.h"
 #include "vlc_internal.h"
 #include "../../src/libvlc.h"
 
Index: bindings/python/setup-internal.py
===================================================================
--- bindings/python/setup-internal.py	(revision 25365)
+++ bindings/python/setup-internal.py	(working copy)
@@ -63,6 +63,7 @@
 				'r').readline().rstrip().split())
 	if os.sys.platform == 'darwin':
 	    ldflags.append('-lstdc++')
+	print 'ldflags: %s' % repr(ldflags)
         return ldflags
 
 #source_files = [ 'vlc_module.c', 'vlc_object.c', 'vlc_mediacontrol.c',
Index: include/vlc_modules_macros.h
===================================================================
--- include/vlc_modules_macros.h	(revision 25365)
+++ include/vlc_modules_macros.h	(working copy)
@@ -28,7 +28,7 @@
 /*****************************************************************************
  * If we are not within a module, assume we're in the vlc core.
  *****************************************************************************/
-#if !defined( __PLUGIN__ ) && !defined( __BUILTIN__ )
+#if !defined( __PLUGIN__ ) && !defined( __BUILTIN__ ) && !defined( MODULE_NAME )
 #   define MODULE_NAME main
 #endif
 
Index: include/vlc_objects.h
===================================================================
--- include/vlc_objects.h	(revision 25365)
+++ include/vlc_objects.h	(working copy)
@@ -104,6 +104,7 @@
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
+VLC_EXPORT( libvlc_int_t *, vlc_current_object, ( int i_object ) );
 
 /*}@*/