diff --git a/include/libhqr.h b/include/libhqr.h
index 2406395beb3005a082a76f357df874aafce764cf..4f95775f55d116e810b33f1d2316f81d53c3d659 100644
--- a/include/libhqr.h
+++ b/include/libhqr.h
@@ -18,8 +18,8 @@
 #ifndef _LIBHQR_H_
 #define _LIBHQR_H_
 
-#include "common.h"
 #include <stdio.h>
+#include "libhqr_common.h"
 
 BEGIN_C_DECLS
 
diff --git a/include/common.h b/include/libhqr_common.h
similarity index 59%
rename from include/common.h
rename to include/libhqr_common.h
index 0b4d316e4fe172c15e54ec1261107792bcfbe357..1ae8a4312f30cdf4195b857a0373f7cd0f083494 100644
--- a/include/common.h
+++ b/include/libhqr_common.h
@@ -1,14 +1,10 @@
 /**
  *
- * @file common.h
+ * @file libhqr_common.h
  *
  * Header file for common macro
  *
- * @copyright 2010-2017 The University of Tennessee and The University
- *                      of Tennessee Research Foundation.  All rights
- *                      reserved.
- *
- * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ * @copyright 2017      Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
  * @version 1.0.0
@@ -17,8 +13,8 @@
  * @date 2017-04-05
  *
  */
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _LIBHQR_COMMON_H_
+#define _LIBHQR_COMMON_H_
 
 #undef BEGIN_C_DECLS
 #undef END_C_DECLS
@@ -30,4 +26,4 @@
 # define END_C_DECLS            /* empty */
 #endif
 
-#endif /* _COMMON_H_ */
+#endif /* _LIBHQR_COMMON_H_ */
diff --git a/include/libdraw.h b/include/libhqr_draw.h
similarity index 77%
rename from include/libdraw.h
rename to include/libhqr_draw.h
index bef64bc59b07fcc854abbb4bac94073830af9d73..596151dcc7ba7afe7ca22ec0761a40aff20f1de8 100644
--- a/include/libdraw.h
+++ b/include/libhqr_draw.h
@@ -1,10 +1,10 @@
 /**
   *
-  * @file libdraw.h
+  * @file libhqr_draw.h
   *
   * Header file for all the functions of drawing.
   *
-  * @copyright 2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+  * @copyright 2017      Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
   *                      Univ. Bordeaux. All rights reserved.
   *
   * @version 1.0.0
@@ -14,10 +14,11 @@
   *
   **/
 
-#ifndef _LIBDRAW_H_
-#define _LIBDRAW_H_
+#ifndef _LIBHQR_DRAW_H_
+#define _LIBHQR_DRAW_H_
+
+#include "libhqr_common.h"
 
-#include "common.h"
 BEGIN_C_DECLS
 
 #define WIDTH  50
@@ -42,4 +43,4 @@ void libhqr_drawline(int x1, int y1, int x2, int y2, int k, FILE *file);
 
 END_C_DECLS
 
-#endif /* _LIBDRAW_H_ */
+#endif /* _LIBHQR_DRAW_H_ */
diff --git a/include/queue.h b/include/libhqr_queue.h
similarity index 79%
rename from include/queue.h
rename to include/libhqr_queue.h
index 7581a5da8eaefa81bcd59208e1f5cc3c31531c27..1448ce88877c1c309b48fefd873f00037c1ef679 100644
--- a/include/queue.h
+++ b/include/libhqr_queue.h
@@ -1,10 +1,10 @@
 /**
  *
- * @file queue.h
+ * @file libhqr_queue.h
  *
  * Queue module for the treewalk algorithm.
  *
- * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ * @copyright 2017      Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
  * @version 1.0.0
@@ -13,10 +13,10 @@
  * @date 2017-03-21
  *
  */
-#ifndef _QUEUE_H_
-#define _QUEUE_H_
+#ifndef _LIBHQR_QUEUE_H_
+#define _LIBHQR_QUEUE_H_
 
-#include "common.h"
+#include "libhqr_common.h"
 
 BEGIN_C_DECLS
 
@@ -34,4 +34,4 @@ void libhqr_queue_tile_delete(libhqr_queue_tile_t ** queue_tile);
 
 END_C_DECLS
 
-#endif /* _QUEUE_H_ */
+#endif /* _LIBHQR_QUEUE_H_ */
diff --git a/src/queue.c b/src/queue.c
index 6afbbf7ee9f3965e0e9a6a2fe6c509b93edb33ae..eedec89126cf02bfadb826a5c3d9e856e36354b1 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -13,7 +13,7 @@
  * @date 2017-04-05
  *
  */
-#include "queue.h"
+#include "libhqr_queue.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
diff --git a/src/treedraw.c b/src/treedraw.c
index 4c3a05df777ffc02f0ff7f08f6a001d70d04b258..4a22317d6fd35609769721190dc67005035fb4e6 100644
--- a/src/treedraw.c
+++ b/src/treedraw.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include "libdraw.h"
+#include "libhqr_draw.h"
 
 /*
  * Global array for color
diff --git a/src/treewalk.c b/src/treewalk.c
index 4f6e494a5390c9de3d9e09d2e30e8cfce14911e2..464304833b46de950aab48339fe69c825004aba4 100644
--- a/src/treewalk.c
+++ b/src/treewalk.c
@@ -15,8 +15,8 @@
  */
 
 #include "libhqr.h"
-#include "libdraw.h"
-#include "queue.h"
+#include "libhqr_draw.h"
+#include "libhqr_queue.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/testings/CMakeLists.txt b/testings/CMakeLists.txt
index 5f5c936bd47af257c7ca5684ec8334cdf540e818..59ed2e4a187111a491535103cd576ebd2a9e90a7 100644
--- a/testings/CMakeLists.txt
+++ b/testings/CMakeLists.txt
@@ -8,6 +8,9 @@
 #  @date 2017-04-26
 #
 ###
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 set(TESTINGS
   testing_pivgen.c
   testing_tileinit.c
@@ -16,7 +19,8 @@ set(TESTINGS
 
 foreach (_file ${TESTINGS})
   get_filename_component(_name_we ${_file} NAME_WE)
-  add_executable(${_name_we} ${_file})
+  add_executable(${_name_we}
+    ${_file} common.c)
   target_link_libraries(${_name_we} hqr)
 
   install(TARGETS ${_name_we} RUNTIME DESTINATION examples )
diff --git a/testings/testing_pivgen.c b/testings/testing_pivgen.c
index 3b805735395defff14c665540cc4f458a6c0f216..669755cc2d23166b67d3f73b2c5917c8f83dfb1d 100644
--- a/testings/testing_pivgen.c
+++ b/testings/testing_pivgen.c
@@ -17,11 +17,12 @@
  * @date 2017-03-21
  *
  */
-#include "libhqr.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include "libhqr.h"
 
-int main(int argc, char ** argv)
+int
+main(int argc, char ** argv)
 {
     libhqr_tree_t qrtree;
     libhqr_tiledesc_t matrix;
diff --git a/testings/testing_tileinit.c b/testings/testing_tileinit.c
index 895aa63781f4c5a173e1c8b0f688f60a2b981bc5..e2cccd2adf3ed2c73f459acce53d54f4dcce740b 100644
--- a/testings/testing_tileinit.c
+++ b/testings/testing_tileinit.c
@@ -1,6 +1,6 @@
 /**
  *
- * @file testting_tileinit.c
+ * @file testing_tileinit.c
  *
  * Testing file for the functions stocking the informations of the tiles
  *
@@ -13,8 +13,6 @@
  * @date 2017-04-18
  *
  */
-
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/testings/testing_treedraw.c b/testings/testing_treedraw.c
index d37809f3e40a0746b76646a99cdf35f9991dc26c..a9b1ed3bf94bda6aa1ef540b345630e55a353c5e 100644
--- a/testings/testing_treedraw.c
+++ b/testings/testing_treedraw.c
@@ -13,13 +13,11 @@
  * @date 2017-04-04
  *
  */
-
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "libdraw.h"
 #include "libhqr.h"
+#include "libhqr_draw.h"
 
 int
 main(int argc, char ** argv)