diff --git a/src/core/Core.cpp b/src/core/Core.cpp
index 28e80a03085b32fe15c5dd8ac6216005859faed3..ab0d62ca1a4b1facb14322eb609ca9eeb3c74b3a 100644
--- a/src/core/Core.cpp
+++ b/src/core/Core.cpp
@@ -94,31 +94,7 @@
 #include "interface/Interface_graphic.hpp"
 #include "core/Core.hpp"
 #include "interface/parsing_thread.hpp"
-
-
-/*
-
-#include "Core.hpp"
-
-
-
-#include "../interface/Interface_graphic.hpp"
-
-#include "../render/Render_opengl_dl.hpp"
-
-#include "../render/render_svg.hpp"
-
-#include "../trace/Trace.hpp"
-#include "../trace/DrawTrace.hpp"
-#include "../parser/ParserPaje.hpp"
-#include "../parser/ParserOTF.hpp"
-
-#include "resource.hpp"
-
-#include "../general/Tools.hpp"
-
-#include "parsing_thread.hpp"
-*/
+/* -- */
 using namespace std;
 
 #define message *Message::get_instance() << "(" << __FILE__ << " l." << __LINE__ << "): "
diff --git a/src/core/Core.hpp b/src/core/Core.hpp
index 4971e72c97db3a85889cb7500eb72f23f2894e45..9c477572dc94576e6b38de2f86157d6bc05f62b6 100644
--- a/src/core/Core.hpp
+++ b/src/core/Core.hpp
@@ -47,23 +47,12 @@
 #ifndef CORE_HPP
 #define CORE_HPP
 
-
 class Core;
 class Interface_graphic;
 class Render_opengl;
 class Trace;
-#include "../interface/Interface.hpp"
-
-
-/*
- * render_opengl.hpp includes render_area.hpp.
- * So do not include it twice.
- */
-//#ifndef RENDER_AREA_HPP 
-
-//#endif
-
 
+#include "interface/Interface.hpp"
 
 /*!
  *\brief This class is an terminal interface, it inherited from the Interface interface.
diff --git a/src/interface/Interface.hpp b/src/interface/Interface.hpp
index 3a0c07e315c7c6d97f8dafa998f43246ffddd534..a6c197e187ad77f0b08a285bcb4e92526cd5d346 100644
--- a/src/interface/Interface.hpp
+++ b/src/interface/Interface.hpp
@@ -52,8 +52,7 @@
 
 class Interface;
 
-#include "resource.hpp"
-
+#include "interface/resource.hpp"
 
 /*!
  *\brief  This is an interface, used by the terminal and graphical interfaces.
diff --git a/src/interface/Interface_graphic.cpp b/src/interface/Interface_graphic.cpp
index 6bb5a3e7f08f01a76bd1657ef256ac5a16a1e1ca..f3725a97cb4ff2109cc31bc1b84f864a0b88b218 100644
--- a/src/interface/Interface_graphic.cpp
+++ b/src/interface/Interface_graphic.cpp
@@ -65,11 +65,11 @@
 #include "interface/resource.hpp"
 //#include "interface/help.hpp"
 //#include "interface/interface.hpp"
-#include "../core/Core.hpp"
-#include "Interface_graphic.hpp"
+#include "core/Core.hpp"
+#include "interface/Interface_graphic.hpp"
 //#include "resource.hpp"
 
-#include "../plugin/Command_window.hpp"
+#include "plugin/Command_window.hpp"
 
 
 using namespace std;
diff --git a/src/interface/Interface_graphic.hpp b/src/interface/Interface_graphic.hpp
index a127b22b4003c408f441bb3789b0afcf6b26fbe8..4bc577d43ce9bc3d2b64d7adfa38fe633830bf78 100644
--- a/src/interface/Interface_graphic.hpp
+++ b/src/interface/Interface_graphic.hpp
@@ -55,10 +55,10 @@ class Command_window;
 class Svg;
 
 
-#include "../ui_main_window.h"/* the main window graphical interface */
+#include "ui_main_window.h"/* the main window graphical interface */
 
 /* Global informations */
-#include "Interface.hpp"
+#include "interface/Interface.hpp"
 
 /*!
  *\brief This class is a graphical interface which creates a window, it inherited from the Interface interface.
diff --git a/src/plugin/Command_window.cpp b/src/plugin/Command_window.cpp
index c44a3b94338f5e352c2c1d163139d8eb3b0100b5..b957253212497ab15a9717d0454191c64abd1389 100644
--- a/src/plugin/Command_window.cpp
+++ b/src/plugin/Command_window.cpp
@@ -51,7 +51,7 @@
 /* -- */
 #include "interface/Interface_graphic.hpp"
 /* -- */
-#include "../core/Core.hpp"
+#include "core/Core.hpp"
 /* -- */
 #include "trace/values/Values.hpp"
 #include "trace/tree/Interval.hpp"
diff --git a/src/render/Hook_event.cpp b/src/render/Hook_event.cpp
index 5987965b6e86428dc2af2cac40a11407c2223d1a..8350b589957a162a1d6b8aea83137c7a96607d1d 100644
--- a/src/render/Hook_event.cpp
+++ b/src/render/Hook_event.cpp
@@ -43,16 +43,17 @@
 /*!
  *\file Hook_event.cpp
  */
-
-#include "../common/common.hpp"
-#include "Hook_event.hpp"
-#include "../common/info.hpp"
-#include "Render_opengl.hpp"
-
-
+#include <stack>
+/* -- */
+#include "common/common.hpp"
+#include "common/info.hpp"
+/* -- */
+#include "render/render.hpp"
+#include "render/Render_opengl.hpp"
+#include "render/Hook_event.hpp"
+/* -- */
 using namespace std;
 
-
 #define message *Message::get_instance() << "(" << __FILE__ << " l." << __LINE__ << "): "
 
 
diff --git a/src/render/Hook_event.hpp b/src/render/Hook_event.hpp
index aefae7b63f0fed8ef557cc3a3ce54381a2ee6f90..1c6974cd62ff86d25d1495cdae8e6a0ba9036cf7 100644
--- a/src/render/Hook_event.hpp
+++ b/src/render/Hook_event.hpp
@@ -48,17 +48,12 @@
 #ifndef HOOK_EVENT_HPP
 #define HOOK_EVENT_HPP
 
-
-#include "../core/Core.hpp"
-
+#include "core/Core.hpp"
 
 class Hook_event;
 class Core;
 class Render_opengl;
 
-
-
-
 /*!
  * \brief Structure used to store event information.
  */
diff --git a/src/render/Render_opengl.cpp b/src/render/Render_opengl.cpp
index 13a4021e5cddb882a722543626427e7a59d140b5..31641f6ae1d494c4fa4ab30c5de02e3aff9a7984 100644
--- a/src/render/Render_opengl.cpp
+++ b/src/render/Render_opengl.cpp
@@ -51,9 +51,9 @@
 #include "render/Hook_event.hpp"
 #include "render/Render_opengl.hpp"
 /* -- */
-#include "../interface/resource.hpp"
-//#include "../interface/interface.hpp"
-#include "../core/Core.hpp"
+#include "interface/resource.hpp"
+//#include "interface/interface.hpp"
+#include "core/Core.hpp"
 /* -- */
 
 using namespace std;
diff --git a/src/render/Render_opengl.hpp b/src/render/Render_opengl.hpp
index 5f410c344bab9b8ce46cd6517771d252e70554ab..312399e719888474074bba8da9db290f91a127b7 100644
--- a/src/render/Render_opengl.hpp
+++ b/src/render/Render_opengl.hpp
@@ -48,9 +48,10 @@
 #define RENDER_OPENGL_HPP
 
 #include <QGLWidget>
-#include "common/common.hpp"
-#include "render.hpp"
-#include "Hook_event.hpp"
+
+#include "core/Core.hpp"
+#include "render/render.hpp"
+#include "render/Hook_event.hpp"
 
 class Render_opengl;
 class Interface_console;
diff --git a/src/trace/DrawTrace.hpp b/src/trace/DrawTrace.hpp
index f3ed81a50bd07d6f521da5776e3931ed2e7d9889..cbdf9b788b12d586245f9caebe3f9700edcf0bb4 100644
--- a/src/trace/DrawTrace.hpp
+++ b/src/trace/DrawTrace.hpp
@@ -48,15 +48,6 @@
 #ifndef DRAW_TRACE_HPP
 #define DRAW_TRACE_HPP
 
-#include <string>
-
-//#include "resource.hpp"
-
-//#include "../render/render_opengl.hpp"
-#include "common/Message.hpp"
-
-#include "DrawTree.hpp"
-
 /*
  * Theses constants can not be put as static const float because it is a template and there binary representation is not normed by the C++ langage.
  */