diff --git a/include/dns_answer.h b/include/dns_answer.h
index 9e6972f6c45c6adb939ef88bbd865bbdcb40f0bd..15c7c63ff2f75e4544d9c7bb07a44630ba5b521a 100644
--- a/include/dns_answer.h
+++ b/include/dns_answer.h
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <arpa/inet.h>
+
 #include "dns_question.h"
 #include "general_sockaddr_wp.h"
 
diff --git a/include/general_sockaddr_wp.h b/include/general_sockaddr_wp.h
index cdc5e6560929e7e056fd0ecc2768abfadc1d31b4..6e5c065c5e3d060a7a8cc74ca1d07dd63aeedff5 100644
--- a/include/general_sockaddr_wp.h
+++ b/include/general_sockaddr_wp.h
@@ -9,7 +9,6 @@
 #define GENERAL_SOCKADDR_WP_H
 
 #include <sys/socket.h>
-
 #include <stdlib.h>
 
 /**
diff --git a/main.cpp b/main.cpp
index c1a77b90b380af020356eb9c7ea26654cf651773..56d22a0b89816000da818b5d0b10bf5576fe8479 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,7 +11,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <pwd.h>
-#include <signal.h>
 #include <linux/limits.h>
 
 #include "include/general_sockaddr_wp.h"
diff --git a/src/dns_answer.cpp b/src/dns_answer.cpp
index bc0d64cb1bba7d16c3dacc8bea0931e9841d0300..28e2e5fe7e29c66f34dee010591cd9971050a40b 100644
--- a/src/dns_answer.cpp
+++ b/src/dns_answer.cpp
@@ -1,7 +1,8 @@
+#include <string.h>
+
 #include "../include/dns_answer.h"
 #include "../include/dns_types.h"
 #include "../include/exceptions/server_error.h"
-#include <string.h>
 
 dns_answer::dns_answer(const dns_answer& other) : dns_question(other), ttl(other.ttl), rd_length(other.rd_length) {
 	rdata = new char[get_rd_length()];
diff --git a/src/dns_db.cpp b/src/dns_db.cpp
index 82c55253987f7d5c4a5facbffca151c9ce7466f0..03d716f3dbc4a966165fbfc00934672f212300a9 100644
--- a/src/dns_db.cpp
+++ b/src/dns_db.cpp
@@ -1,10 +1,3 @@
-/* 
- * File:   sqlite3_wrapper.cpp
- * Author: Eckl Máté <ecklm94@gmail.com>
- * 
- * Created on 2016. május 17., 19:33
- */
-
 #include "../include/dns_db.h"
 #include "../include/dns_types.h"
 #include "../include/exceptions/db_exception.h"
diff --git a/src/dns_server.cpp b/src/dns_server.cpp
index f6eb6956112e79e27e648842488e7f3440f5a203..6f6dbc67bc260d2e231850d2f6930f3e892784cb 100644
--- a/src/dns_server.cpp
+++ b/src/dns_server.cpp
@@ -1,10 +1,3 @@
-/* 
- * File:   dns_server.cpp
- * Author: Eckl Máté <ecklm94@gmail.com>
- * 
- * Created on 2016. május 21., 18:47
- */
-
 #include <pthread.h>
 
 #include "../include/dns_server.h"
diff --git a/src/logger.cpp b/src/logger.cpp
index d76ff28a532dfa985b4f2d2ed069a54b06af8ba8..4c376295275a8ae2fc8618a71b8224c33238df6a 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,8 +1,9 @@
-#include "../include/logger.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdio.h>
 
+#include "../include/logger.h"
+
 LOGGER_FUNCTION_HEADER(syslog_on_demand) {
 	va_list args;
 	va_start(args, __fmt);