diff -Naur jahshaka.orig/source/Jahshaka/JahDesktop/player/qtplayer.h jahshaka/source/Jahshaka/JahDesktop/player/qtplayer.h
--- jahshaka.orig/source/Jahshaka/JahDesktop/player/qtplayer.h	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/Jahshaka/JahDesktop/player/qtplayer.h	2007-02-19 21:59:20.000000000 +0100
@@ -12,9 +12,9 @@
 #include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
 
-#include <openpluginlib/openpluginlib.hpp>
-#include <openpluginlib/utf8_utils.hpp>
-#include <openpluginlib/GL_utility.hpp>
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
+#include <openpluginlib/pl/GL_utility.hpp>
 
 #include <openmedialib/ml/ml.hpp>
 
diff -Naur jahshaka.orig/source/Jahshaka/JahModules/editing_mlt/audio.h jahshaka/source/Jahshaka/JahModules/editing_mlt/audio.h
--- jahshaka.orig/source/Jahshaka/JahModules/editing_mlt/audio.h	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/Jahshaka/JahModules/editing_mlt/audio.h	2007-02-19 22:02:55.000000000 +0100
@@ -10,7 +10,7 @@
 #ifndef JAHNLE_MLTAUDIO_H
 #define JAHNLE_MLTAUDIO_H
 
-#include <openpluginlib/timer.hpp>
+#include <openpluginlib/pl/timer.hpp>
 #include <openmedialib/ml/ml.hpp>
 
 #include <iostream>
diff -Naur jahshaka.orig/source/Jahshaka/JahModules/editing_mlt/gpupreview.cpp jahshaka/source/Jahshaka/JahModules/editing_mlt/gpupreview.cpp
--- jahshaka.orig/source/Jahshaka/JahModules/editing_mlt/gpupreview.cpp	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/Jahshaka/JahModules/editing_mlt/gpupreview.cpp	2007-02-19 22:10:18.000000000 +0100
@@ -17,7 +17,7 @@
 #include <qtimer.h>
 #include <qmessagebox.h>
 
-#include <openpluginlib/GL_utility.hpp>
+#include <openpluginlib/pl/GL_utility.hpp>
 
 using namespace Mlt;
 using namespace jahnle;
diff -Naur jahshaka.orig/source/Jahshaka/JahSource/jahcreate/jahcreate.cpp jahshaka/source/Jahshaka/JahSource/jahcreate/jahcreate.cpp
--- jahshaka.orig/source/Jahshaka/JahSource/jahcreate/jahcreate.cpp	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/Jahshaka/JahSource/jahcreate/jahcreate.cpp	2007-02-19 22:28:49.000000000 +0100
@@ -37,7 +37,7 @@
 #include "MainEncoder.h"
 
 
-#include <openpluginlib/openpluginlib.hpp>
+#include <openpluginlib/pl/openpluginlib.hpp>
 #include <openobjectlib/sg/sg.hpp>
 #include <openobjectlib.h>
 
diff -Naur jahshaka.orig/source/OpenLibraries/openimagelib/exr.cpp jahshaka/source/OpenLibraries/openimagelib/exr.cpp
--- jahshaka.orig/source/OpenLibraries/openimagelib/exr.cpp	2007-02-19 21:37:55.000000000 +0100
+++ jahshaka/source/OpenLibraries/openimagelib/exr.cpp	2007-02-19 21:39:16.000000000 +0100
@@ -9,8 +9,8 @@
 #include <qimage.h>
 #include <qdatastream.h>
 
-#include <openpluginlib/openpluginlib.hpp>
-#include <openpluginlib/utf8_utils.hpp>
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
 
 #include <openimagelib/il/openimagelib_plugin.hpp>
 
diff -Naur jahshaka.orig/source/OpenLibraries/openobjectlib/openobject.cpp jahshaka/source/OpenLibraries/openobjectlib/openobject.cpp
--- jahshaka.orig/source/OpenLibraries/openobjectlib/openobject.cpp	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/OpenLibraries/openobjectlib/openobject.cpp	2007-02-19 21:55:38.000000000 +0100
@@ -28,8 +28,8 @@
 #include <openlibraries_global_config.hpp>
 #endif
 
-#include <openpluginlib/openpluginlib.hpp>
-#include <openpluginlib/utf8_utils.hpp>
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
 
 #include <openobjectlib/sg/openobjectlib_plugin.hpp>
 
diff -Naur jahshaka.orig/source/OpenLibraries/openobjectlib/openobjectlib.cpp jahshaka/source/OpenLibraries/openobjectlib/openobjectlib.cpp
--- jahshaka.orig/source/OpenLibraries/openobjectlib/openobjectlib.cpp	2007-02-19 21:37:56.000000000 +0100
+++ jahshaka/source/OpenLibraries/openobjectlib/openobjectlib.cpp	2007-02-19 21:39:59.000000000 +0100
@@ -18,8 +18,8 @@
 
 #ifdef NEWOPENOBJECTLIB
 
-#include <openpluginlib/openpluginlib.hpp>
-#include <openpluginlib/utf8_utils.hpp>
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/utf8_utils.hpp>
 
 namespace opl = olib::openpluginlib;