diff --git a/plugins/pyloader/src/python_cpu_policy.cc b/plugins/pyloader/src/python_cpu_policy.cc
index 57b612d..5ee728c 100644
--- a/plugins/pyloader/src/python_cpu_policy.cc
+++ b/plugins/pyloader/src/python_cpu_policy.cc
@@ -22,8 +22,9 @@
 
 #include "python_cpu_policy.hh"
 
+#include <glibmm/timer.h>
+
 #include <limits>
-#include <unistd.h>
 #include <iostream>
 
 using namespace sgpem;
@@ -235,7 +236,7 @@ PythonCPUPolicy::wait_unlock() const throw(UserInterruptException, MalformedPoli
   do
   {
     Py_UNBLOCK_THREADS;
-    usleep(wait_for); // hack'a'ton! magggggiccc nummmbeeerrrrrs!!
+	Glib::usleep(wait_for); // hack'a'ton! magggggiccc nummmbeeerrrrrs!!
     Py_BLOCK_THREADS;
 
     PyObject* retval = PyObject_CallMethod(_adapter, "mutex_test_lock", NULL);
diff --git a/plugins/pyloader/src/python_cpu_policy.hh b/plugins/pyloader/src/python_cpu_policy.hh
index 8481a7a..8d28ca4 100644
--- a/plugins/pyloader/src/python_cpu_policy.hh
+++ b/plugins/pyloader/src/python_cpu_policy.hh
@@ -23,16 +23,17 @@
 
 #include "config.h"
 
+#include <sgpemv2/cpu_policy.hh>
+#include <sgpemv2/user_interrupt_exception.hh>
+#include <sgpemv2/malformed_policy_exception.hh>
+
 #include <Python.h>
+
 #include <glibmm/thread.h>
 #include <glibmm/ustring.h>
 
 #include <iostream>
 
-#include <sgpemv2/cpu_policy.hh>
-#include <sgpemv2/user_interrupt_exception.hh>
-#include <sgpemv2/malformed_policy_exception.hh>
-
 namespace sgpem
 {
   class PythonCPUPolicy;
diff --git a/plugins/pyloader/src/python_cpu_policy_manager.cc b/plugins/pyloader/src/python_cpu_policy_manager.cc
index 752436b..af2e29c 100644
--- a/plugins/pyloader/src/python_cpu_policy_manager.cc
+++ b/plugins/pyloader/src/python_cpu_policy_manager.cc
@@ -24,7 +24,6 @@
 
 #include <sgpemv2/templates/deletor.tcc>
 
-#include <Python.h>
 #include <glibmm/ustring.h>
 #include <glibmm/timer.h>
 #include <glibmm/fileutils.h>
@@ -36,7 +35,6 @@
 #include <iostream>
 #include <string>
 #include <iostream>
-#include <unistd.h>
 
 using namespace sgpem;
 using std::vector;
@@ -108,8 +106,8 @@ PythonCPUPolicyManager::collect_policies()
 
   for (; dir_it != dir_end; ++dir_it)
   {
-    Glib::Dir dir(dir_it->c_str());
-
+    Glib::Dir dir(*dir_it);
+	  
 #ifndef NDEBUG
     std::clog << "Opening directory " << *dir_it << " looking for python policies..." << endl;
 #endif
diff --git a/plugins/pyloader/src/python_cpu_policy_manager.hh b/plugins/pyloader/src/python_cpu_policy_manager.hh
index ba8480b..7a0a7f9 100644
--- a/plugins/pyloader/src/python_cpu_policy_manager.hh
+++ b/plugins/pyloader/src/python_cpu_policy_manager.hh
@@ -23,10 +23,11 @@
 
 #include "config.h"
 
-#include <Python.h>
+#include "python_cpu_policy.hh"
 
 #include <sgpemv2/cpu_policy_manager.hh>
-#include "python_cpu_policy.hh"
+
+#include <Python.h>
 
 namespace sgpem
 {