diff --git a/inc/api/API.h b/inc/api/API.h
index 5c3e3c2..d2f4f75 100644
--- a/inc/api/API.h
+++ b/inc/api/API.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
+#include "Hashmap.h"
 
 #include <string>
-#include "Hashmap.h"
 
 class API {
 public:
diff --git a/inc/api/IPAPI.h b/inc/api/IPAPI.h
index fbcfd48..ed67133 100644
--- a/inc/api/IPAPI.h
+++ b/inc/api/IPAPI.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include <string>
 #include "API.h"
 
+#include <string>
+
 class IPAPI : API{
 public:
     /**
diff --git a/inc/api/TelegramAPI.h b/inc/api/TelegramAPI.h
index 5cdaaf0..676cfd5 100644
--- a/inc/api/TelegramAPI.h
+++ b/inc/api/TelegramAPI.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
+#include "API.h"
 
 #include <string>
-#include "API.h"
 
 class TelegramAPI : API {
 public:
diff --git a/src/Config.cpp b/src/Config.cpp
index 07bc961..417f84e 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -2,14 +2,14 @@
 // Created by lukas on 11.02.20.
 //
 
-#include <Config.h>
-#include <Logger.h>
+#include "Config.h"
+#include "Logger.h"
+#include "Version.h"
 
 #include <iostream>
 #include <cstring>
 #include <fstream>
 #include <libconfig.h++>
-#include <Version.h>
 
 std::string Config::dynuapikey;
 std::string Config::domainid; //id of the dynu domain
diff --git a/src/FileLogger.cpp b/src/FileLogger.cpp
index a851d91..4468e09 100644
--- a/src/FileLogger.cpp
+++ b/src/FileLogger.cpp
@@ -2,12 +2,12 @@
 // Created by lukas on 05.05.19.
 //
 
+#include "FileLogger.h"
+
 #include <fstream>
 #include <iostream>
 #include <climits>
 
-#include "FileLogger.h"
-
 void FileLogger::safeip(std::string ip) {
     std::ofstream out;
     out.open("ip.txt", std::ios::out);
diff --git a/src/IPRefresher.cpp b/src/IPRefresher.cpp
index 14d5335..41347f3 100644
--- a/src/IPRefresher.cpp
+++ b/src/IPRefresher.cpp
@@ -2,20 +2,18 @@
 // Created by lukas on 02.08.19.
 //
 
+#include "IPRefresher.h"
+#include "FileLogger.h"
+#include "api/IPAPI.h"
+#include "api/DynuAPI.h"
+#include "api/TelegramAPI.h"
+#include "Config.h"
+#include "Version.h"
+
 #include <string>
-
-#include <FileLogger.h>
-#include <api/IPAPI.h>
-#include <api/DynuAPI.h>
-#include <api/TelegramAPI.h>
-
 #include <chrono>
 #include <thread>
 #include <Logger.h>
-
-#include <IPRefresher.h>
-#include <Config.h>
-#include <Version.h>
 #include <climits>
 
 void IPRefresher::checkIPAdress(bool force) {
diff --git a/src/Logger.cpp b/src/Logger.cpp
index 77a81ca..2bfbabe 100644
--- a/src/Logger.cpp
+++ b/src/Logger.cpp
@@ -2,11 +2,11 @@
 // Created by lukas on 26.10.19.
 //
 
+#include "Logger.h"
+
 #include <sstream>
 #include <iostream>
 
-#include "Logger.h"
-
 void Logger::debug(const std::string message) {
     log(message, Logger::Debug);
 }
diff --git a/src/api/API.cpp b/src/api/API.cpp
index e246450..b41cd89 100644
--- a/src/api/API.cpp
+++ b/src/api/API.cpp
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <curl/curl.h>
 
-
 std::string API::request(std::string myurl) {
     Hashmap<std::string, std::string> map;
     std::vector<std::string> str;
diff --git a/src/main.cpp b/src/main.cpp
index a7d1dd2..141e5f5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,13 +2,13 @@
 // Created by lukas on 18.06.19.
 //
 
-#include <Version.h>
-#include <IPRefresher.h>
-#include <Logger.h>
-#include <Config.h>
+#include "Version.h"
+#include "IPRefresher.h"
+#include "Logger.h"
+#include "Config.h"
+#include "api/IPAPI.h"
 
 #include <iostream>
-#include <api/IPAPI.h>
 
 /**
  * application entry point