diff --git a/src/database.cpp b/src/database.cpp
index eba238d..c0e5e8a 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -1,11 +1,16 @@
+#ifndef DATABASE_CPP
+#define DATABASE_CPP
+
 #include <string>
 #include <list>
-#include <map>
 #include <iostream>
 #include <vector>
+
 #include <pqxx/pqxx>
 #include <pqxx/except>
+
 #include "crow.h"
+
 #include "databaseStatementConstCollection.cpp"
 
 using namespace DatabaseStatementConstCollection;
@@ -509,4 +514,5 @@ namespace Database {
         }
         return returnJson;
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/databaseStatementConstCollection.cpp b/src/databaseStatementConstCollection.cpp
index c9be68d..b016d86 100644
--- a/src/databaseStatementConstCollection.cpp
+++ b/src/databaseStatementConstCollection.cpp
@@ -1,3 +1,6 @@
+#ifndef DATABASE_STATEMENT_CONST_COLLECTION_CPP
+#define DATABASE_STATEMENT_CONST_COLLECTION_CPP
+
 #include <string>
 #include <map>
 
@@ -232,4 +235,5 @@ namespace DatabaseStatementConstCollection {
      * Delivers if the commission limit has been reached and if the commissions are closed based on the accepted/completed state of the freelancers requests
      */
     const static std::string SQL_Statement_SELECT_FREELANCERS_WITHCOMMISSIONSSTATE = "select id, name, basicInformation , (case when (commissionlimit <= (select count(*) as requestCount from requests where requests.accepted = true and requests.completed = false and requests.freelancerid = freelancers.id group by freelancers.id)) then 'Closed' else 'Open' end) as commissionsclosed from freelancers order by name;";
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/emailTemplateCollection.cpp b/src/emailTemplateCollection.cpp
index 56b7187..cb4372d 100644
--- a/src/emailTemplateCollection.cpp
+++ b/src/emailTemplateCollection.cpp
@@ -1,3 +1,6 @@
+#ifndef EMAIL_TEMPLATE_COLLECTION_CPP
+#define EMAIL_TEMPLATE_COLLECTION_CPP
+
 #include <string>
 
 namespace EmailTemplateCollection {
@@ -15,4 +18,5 @@ namespace EmailTemplateCollection {
         emailContent += "If you haven't requested this PasswordReset please ignore this email";
         return emailContent;
 	}
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
diff --git a/src/utilities.cpp b/src/utilities.cpp
index 0796634..aa4bc4e 100644
--- a/src/utilities.cpp
+++ b/src/utilities.cpp
@@ -1,3 +1,6 @@
+#ifndef UTILITIES_CPP
+#define UTILITIES_CPP
+
 #include <string>
 #include <map>
 #include <iostream>
@@ -6,11 +9,16 @@
 #include <vector>
 #include <iomanip>
 #include <stdexcept>
-#include <pqxx/pqxx>
+#include <chrono>
+#include <thread>
+
 #include <openssl/sha.h>
+#include <pqxx/pqxx>
 #include "crow.h"
+#include "crow/middlewares/cookie_parser.h"
 #include "cpp/opportunisticsecuresmtpclient.hpp"
 #include "cpp/htmlmessage.hpp"
+
 #include "emailTemplateCollection.cpp"
 
 using namespace jed_utils::cpp;