diff --git a/src/Makefile.am b/src/Makefile.am
index 7482632..26448a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ sgpemv2_CPPFLAGS = -I@top_srcdir@ \
 sgpemv2_LDFLAGS = -L@builddir@/backend \
 		  -L@builddir@/pyloader \
 		  $(LT_LDFLAGS)
-sgpemv2_LDADD = -lbackend -lpyloader \
+sgpemv2_LDADD = -lbackend \
 		$(CAIRO_LIBS) \
 		$(GTKMM_LIBS)
 
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 5d27ea9..6a15cfc 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -40,10 +40,9 @@ libbackend_la_CPPFLAGS = -I@top_srcdir@ \
 		-DLOCALEDIR="\"$(localedir)\"" \
 		$(PYTHON_CPPFLAGS) \
 		$(GLIBMM_CFLAGS)
-libbackend_la_LIBADD = $(PYTHON_LDFLAGS) \
-		$(PYTHON_EXTRA_LIBS)
-libbackend_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
-		$(GLIBMM_LDFLAGS)
+libbackend_la_LIBADD = ../pyloader/libpyloader.la
+libbackend_la_LDFLAGS = $(GLIBMM_LDFLAGS) \
+		$(LT_LDFLAGS)
 
 # Please keep this in sorted order:
 libbackend_la_SOURCES = \
@@ -53,8 +52,6 @@ libbackend_la_SOURCES = \
 		policy_manager.cc \
 		policy_parameters.cc \
 		process.cc \
-		python_policy.cc \
-		python_policy_manager.cc \
 		schedulable.cc \
 		schedulable_list.cc \
 		schedulable_status.cc \
@@ -68,8 +65,6 @@ noinst_HEADERS = \
 		policy_manager.hh \
 		policy_parameters.hh \
 		process.hh \
-		python_policy.hh \
-		python_policy_manager.hh \
 		schedulable.hh \
 		schedulable_list.hh \
 		schedulable_status.hh \
diff --git a/src/main.cc b/src/main.cc
index 87f64cd..6b61b5a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -34,8 +34,8 @@
 #include "backend/process.hh"
 #include "backend/policy.hh"
 #include "backend/policy_parameters.hh"
-#include "backend/python_policy.hh"
-#include "backend/python_policy_manager.hh"
+#include "pyloader/python_policy.hh"
+#include "pyloader/python_policy_manager.hh"
 #include "standard_io.hh"
 
 #include <glibmm/timer.h>
diff --git a/src/pyloader/Makefile.am b/src/pyloader/Makefile.am
index 22fce25..a475474 100644
--- a/src/pyloader/Makefile.am
+++ b/src/pyloader/Makefile.am
@@ -38,18 +38,20 @@ libpyloader_la_CPPFLAGS = -I@top_srcdir@ \
 		-DPYCDIR="\"$(pycdir)\"" \
 		-DMODDIR="\"$(moddir)\"" \
 		-DLOCALEDIR="\"$(localedir)\"" \
-		$(PYTHON_CPPFLAGS)
+		$(PYTHON_CPPFLAGS) \
+		$(GLIBMM_CFLAGS)
 libpyloader_la_LIBADD = $(PYTHON_LDFLAGS) \
-		$(PYTHON_EXTRA_LIBS)
-libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS)
+		$(PYTHON_EXTRA_LIBS) \
+		$(GLIBMM_LIBS)
+libpyloader_la_LDFLAGS = $(PYTHON_EXTRA_LDFLAGS) \
+		$(LT_LDFLAGS) 
 
 # Please keep this in sorted order:
-libpyloader_la_SOURCES = empty.cc
+libpyloader_la_SOURCES = \
+		python_policy.cc \
+		python_policy_manager.cc
 
-noinst_HEADERS = 
+noinst_HEADERS = python_policy.hh \
+		python_policy_manager.hh
 
-# !! temp file for debug, will be deleted as soon as 
-# !! source's in place
-empty.cc :
-	echo "int main() {}" > @builddir@/$@