diff --git a/app/Services/OpSetService.h b/app/Services/OpSetService.h
index 7e9d264c84c25b4511ef5667d46c98550147dde9..2a48b5d590be125f229d3100b9a9af15c9e11d34 100644
--- a/app/Services/OpSetService.h
+++ b/app/Services/OpSetService.h
@@ -21,7 +21,7 @@
 #define OPSETSERVICE_H
 
 #include <Service.h>
-#include <Plugin.h>
+//#include <Plugin.h>
 #include "OperationService.h"
 
 #include <Services/AlgorithmService.h>
diff --git a/app/Services/PluginManager.cpp b/app/Services/PluginManager.cpp
index bda6322a74cbde598589dba1d2cdf0413bd7b406..d46c11f351bb2cfe0c05867c83115efd68bcec97 100644
--- a/app/Services/PluginManager.cpp
+++ b/app/Services/PluginManager.cpp
@@ -177,9 +177,9 @@ bool PluginManager::loadPlugin(QString file, bool silent) {
     
     std::cout << file.toStdString() << " loaded" << std::endl;
     
-    void* ptr = library->resolve("loadPlugin");
+    QFunctionPointer ptr = library->resolve("loadPlugin");
     
-    if(ptr==0) {
+    if(ptr == 0) {
         if(!silent) {
             QMessageBox::critical (_gi, tr("Error loading plugin"), tr("Could not find the plugin's entry point \"loadPlugin\""));
         }
diff --git a/plugins/Segmentation/segmentation.cpp b/plugins/Segmentation/segmentation.cpp
index 36b8a3f8a5b211daf116d9b2f652a2c95b43c23c..fc00be8f6247c1fd43048759aea440fd9d4ad269 100644
--- a/plugins/Segmentation/segmentation.cpp
+++ b/plugins/Segmentation/segmentation.cpp
@@ -1,18 +1,18 @@
 /*
  * Copyright 2011-2012 INSA Rennes
- * 
+ *
  * This file is part of EIImage.
- * 
+ *
  * EIImage is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * EIImage is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with EIImage.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -40,7 +40,7 @@ class Thresholding : public PlugOperation {
         addParam(CurrentImg(), &Thresholding::img);
         addParam(IntParam("Entier", 0, 255, 127), &Thresholding::threshold);
     }
-    
+
     void operation() {
         algorithm::Binarization_t<depth_default_t> thresholding(threshold);
         GrayscaleImage* grayImg = imagein::Converter<GrayscaleImage>::convert(img);
@@ -57,7 +57,7 @@ class Otsu : public PlugOperation {
     Otsu() : PlugOperation("Otsu") {
         this->addParam(CurrentImg(), &Otsu::img);
     }
-    
+
     void operation() {
         algorithm::Otsu_t<depth_default_t> otsu;
         GrayscaleImage* grayImg = imagein::Converter<GrayscaleImage>::convert(img);
@@ -74,7 +74,7 @@ class Dithering : public PlugOperation {
         this->addParam(CurrentImg(), &Dithering::img);
 //        this->addParam(ImgParam("Image"), &Dithering::img);
     }
-    
+
     void operation() {
         algorithm::Dithering_t<depth_default_t> dithering;
         Image* result = dithering(&img);
diff --git a/plugins/plugin.cpp b/plugins/plugin.cpp
index 8188ed3417eea867bf442fb76520d1dbad453c3b..44cdd42f6f66403115ae5d13b85a0a14ac5e33a7 100644
--- a/plugins/plugin.cpp
+++ b/plugins/plugin.cpp
@@ -22,11 +22,11 @@
 
 #include "Image.h"
 
-#include "../ImageEIICore/Operation.h"
-#include "../ImageEIICore/Plugin.h"
-#include "../ImageEIICore/ImgParam.h"
-#include "../ImageEIICore/IntParam.h"
-#include "../ImageEIICore/ImgOutput.h"
+#include "Operation.h"
+#include "Plugin.h"
+#include "ImgParam.h"
+#include "IntParam.h"
+#include "ImgOutput.h"
 
 using namespace std;
 using namespace imagein;
@@ -122,4 +122,4 @@ class MyPlugin : public Plugin {
 extern "C" Plugin* getPlugin() {
     Plugin* myPlugin = new MyPlugin("ImageRef");
     return myPlugin;
-}
\ No newline at end of file
+}