diff --git a/include/common.h b/include/common.h
index 85138a054725ef5051a1c4683be35afd1915bacd..c61ff309e6ead805defaa844f5abb324c0aaea03 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 # define BEGIN_C_DECLS extern "C" {
 # define END_C_DECLS }
 #else
-#define BEGIN_C_DECLS          /* empty */
-#define END_C_DECLS            /* empty */
+# define BEGIN_C_DECLS          /* empty */
+# define END_C_DECLS            /* empty */
 #endif
 
 #endif /* _COMMON_H_ */
diff --git a/include/libhqr.h b/include/libhqr.h
index 3be90edced56be419bdf52c2954a7d38d02520aa..d724e48ddf717e239ee9873f5f0f06bce003690e 100644
--- a/include/libhqr.h
+++ b/include/libhqr.h
@@ -15,11 +15,11 @@
  * @date 2017-03-21
  *
  */
-#include "common.h"
-
 #ifndef _LIBHQR_H_
 #define _LIBHQR_H_
 
+#include "common.h"
+
 BEGIN_C_DECLS
 
 static inline int libhqr_imin(int a, int b){
diff --git a/include/queue.h b/include/queue.h
index 2b18e11fab4ed8fa0484c06d3613abfd7011e980..45013c7a1656602c8c5f5743732807f75d4fa138 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -11,27 +11,27 @@
  * @date 2017-03-21
  *
  */
-#include "common.h"
-
 #ifndef _QUEUE_H_
 #define _QUEUE_H_
 
+#include "common.h"
+
 BEGIN_C_DECLS
 
 typedef struct libhqr_queue_tile_s{
-  struct libhqr_queue_tile_s *prev;
-  struct libhqr_queue_tile_s *next;
-  int numero;
+    struct libhqr_queue_tile_s *prev;
+    struct libhqr_queue_tile_s *next;
+    int numero;
 } libhqr_queue_tile_t;
 
 libhqr_queue_tile_t *libhqr_queue_tile_new (void);
-void libhqr_queue_tile_post (libhqr_queue_tile_t ** queue_tile,int numero);
-int libhqr_queue_tile_get (libhqr_queue_tile_t ** queue_tile);
-void libhqr_queue_tile_delete (libhqr_queue_tile_t ** queue_tile);
+void libhqr_queue_tile_post  (libhqr_queue_tile_t ** queue_tile, int numero);
+int  libhqr_queue_tile_get   (libhqr_queue_tile_t ** queue_tile);
+void libhqr_queue_tile_delete(libhqr_queue_tile_t ** queue_tile);
 void libhqr_queue_tile_first (libhqr_queue_tile_t ** queue_tile);
-void libhqr_queue_tile_prev (libhqr_queue_tile_t ** queue_tile);
-void libhqr_queue_tile_last (libhqr_queue_tile_t ** queue_tile);
-void libhqr_queue_tile_next (libhqr_queue_tile_t ** queue_tile);
+void libhqr_queue_tile_prev  (libhqr_queue_tile_t ** queue_tile);
+void libhqr_queue_tile_last  (libhqr_queue_tile_t ** queue_tile);
+void libhqr_queue_tile_next  (libhqr_queue_tile_t ** queue_tile);
 
 END_C_DECLS