diff --git a/test/native/i18n.c b/test/native/i18n.c
index fef1f83911..3de5437dd9 100644
--- a/test/native/i18n.c
+++ b/test/native/i18n.c
@@ -20,10 +20,10 @@
  *****************************************************************************/
 
 #include "../pyunit.h"
+#include <vlc/vlc.h>
 #include "charset.h"
 
-
-static PyObject *i18n_atof_test( PyObject *self, PyObject *args )
+PyObject *i18n_atof_test( PyObject *self, PyObject *args )
 {
     const char dot9[] = "999999.999999";
     const char comma9[] = "999999,999999";
diff --git a/test/native/init.c b/test/native/init.c
index 352e5e13db..902e56a779 100644
--- a/test/native/init.c
+++ b/test/native/init.c
@@ -1,9 +1,4 @@
-
-// TODO: Ugly, split correctly 
-#include "libvlc.c"
-#include "stats.c"
-#include "i18n.c"
-#include "url.c"
+#include "tests.h"
 
 static PyMethodDef native_libvlc_test_methods[] = {
    DEF_METHOD( create_destroy, "Create and destroy" )
diff --git a/test/native/libvlc.c b/test/native/libvlc.c
index 6a6b48211b..5611ae5c77 100644
--- a/test/native/libvlc.c
+++ b/test/native/libvlc.c
@@ -1,7 +1,7 @@
 #include "../pyunit.h"
 #include <vlc/libvlc.h>
 
-static PyObject *exception_test( PyObject *self, PyObject *args )
+ PyObject *exception_test( PyObject *self, PyObject *args )
 {
      libvlc_exception_t exception;
 
@@ -24,7 +24,7 @@ static PyObject *exception_test( PyObject *self, PyObject *args )
      return Py_None;
 }
 
-static PyObject *create_destroy( PyObject *self, PyObject *args )
+ PyObject *create_destroy( PyObject *self, PyObject *args )
 {
     libvlc_instance_t *p_instance;
     char *argv[] = { "vlc", "--quiet" };
@@ -45,7 +45,7 @@ static PyObject *create_destroy( PyObject *self, PyObject *args )
     return Py_None;
 }
 
-static PyObject *playlist_test( PyObject *self, PyObject *args )
+ PyObject *playlist_test( PyObject *self, PyObject *args )
 {
     libvlc_instance_t *p_instance;
     char *argv[] = { "vlc", "--quiet" };
@@ -89,7 +89,7 @@ static PyObject *playlist_test( PyObject *self, PyObject *args )
     return Py_None;
 }
 
-static PyObject *vlm_test( PyObject *self, PyObject *args )
+ PyObject *vlm_test( PyObject *self, PyObject *args )
 {
     libvlc_instance_t *p_instance;
     char *argv[] = { "vlc", "--quiet" };
diff --git a/test/native/stats.c b/test/native/stats.c
index d48575e0a2..3a20702da8 100644
--- a/test/native/stats.c
+++ b/test/native/stats.c
@@ -1,7 +1,7 @@
 #include "../pyunit.h"
 #include <vlc/vlc.h>
 
-static PyObject *timers_test( PyObject *self, PyObject *args )
+PyObject *timers_test( PyObject *self, PyObject *args )
 {
      Py_INCREF( Py_None );
      return Py_None;
diff --git a/test/native/tests.h b/test/native/tests.h
new file mode 100644
index 0000000000..3ff4f2e96e
--- /dev/null
+++ b/test/native/tests.h
@@ -0,0 +1,12 @@
+#include "../pyunit.h"
+
+PyObject *exception_test( PyObject *self, PyObject *args );
+PyObject *create_destroy( PyObject *self, PyObject *args );
+PyObject *playlist_test( PyObject *self, PyObject *args );
+PyObject *vlm_test( PyObject *self, PyObject *args );
+
+PyObject *timers_test( PyObject *self, PyObject *args );
+
+PyObject *url_decode_test( PyObject *self, PyObject *args );
+
+PyObject *i18n_atof_test( PyObject *self, PyObject *args );
diff --git a/test/native/url.c b/test/native/url.c
index eed90d2b48..8fb65fc5f7 100644
--- a/test/native/url.c
+++ b/test/native/url.c
@@ -19,13 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "../pyunit.h"
 #include <vlc/vlc.h>
 #include "vlc_url.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-static PyObject * test_decode (const char *in, const char *out)
+ PyObject * test_decode (const char *in, const char *out)
 {
     char *res;
 
@@ -41,7 +39,7 @@ static PyObject * test_decode (const char *in, const char *out)
     return Py_None;
 }
 
-static PyObject *url_decode_test( PyObject *self, PyObject *args )
+ PyObject *url_decode_test( PyObject *self, PyObject *args )
 {
     (void)setvbuf (stdout, NULL, _IONBF, 0);
     if( !test_decode ("this_should_not_be_modified_1234",
diff --git a/test/setup.py b/test/setup.py
index d1baa40998..dc43b12754 100644
--- a/test/setup.py
+++ b/test/setup.py
@@ -40,7 +40,8 @@ def get_ldflags():
 
 # To compile in a local vlc tree
 native_libvlc_test = Extension( 'native_libvlc_test',
-                sources = ['native/init.c'],
+                sources = ['native/init.c', 'native/url.c', 'native/i18n.c',
+			   'native/stats.c', 'native/libvlc.c'],
                 include_dirs = ['../include', '../', '/usr/win32/include' ],
                 extra_objects = [ '../src/.libs/libvlc.so' ],
                 extra_compile_args = get_cflags(),