diff --git a/include/Client.h b/include/Client.hpp
similarity index 100%
rename from include/Client.h
rename to include/Client.hpp
diff --git a/include/FileService.h b/include/FileService.hpp
similarity index 100%
rename from include/FileService.h
rename to include/FileService.hpp
diff --git a/include/HyprlandService.h b/include/HyprlandService.hpp
similarity index 93%
rename from include/HyprlandService.h
rename to include/HyprlandService.hpp
index dfe8837..0bce8dc 100644
--- a/include/HyprlandService.h
+++ b/include/HyprlandService.hpp
@@ -2,9 +2,9 @@
 #define HYPRLAND_SERVICE_H
 
 #include <list>
-#include "Workspace.h"
-#include "Client.h"
-#include "WindowRule.h"
+#include "Workspace.hpp"
+#include "Client.hpp"
+#include "WindowRule.hpp"
 
 class HyprlandService {
   private:
diff --git a/include/Macros.h b/include/Macros.hpp
similarity index 100%
rename from include/Macros.h
rename to include/Macros.hpp
diff --git a/include/ShellService.h b/include/ShellService.hpp
similarity index 100%
rename from include/ShellService.h
rename to include/ShellService.hpp
diff --git a/include/WindowRule.h b/include/WindowRule.hpp
similarity index 100%
rename from include/WindowRule.h
rename to include/WindowRule.hpp
diff --git a/include/Workspace.h b/include/Workspace.hpp
similarity index 100%
rename from include/Workspace.h
rename to include/Workspace.hpp
diff --git a/src/Client.cpp b/src/Client.cpp
index 2de0273..d9d13c3 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -1,4 +1,4 @@
-#include "../include/Client.h"
+#include "../include/Client.hpp"
 
 void from_json(const json& j, WorkspaceSignature& ws) {
   j.at("id").get_to(ws.id);
diff --git a/src/FileService.cpp b/src/FileService.cpp
index a5a03b7..5798559 100644
--- a/src/FileService.cpp
+++ b/src/FileService.cpp
@@ -1,8 +1,8 @@
 #include <sstream>
 #include <fstream>
-#include "../include/FileService.h"
-#include "../include/Macros.h"
-#include "../include/ShellService.h"
+#include "../include/FileService.hpp"
+#include "../include/Macros.hpp"
+#include "../include/ShellService.hpp"
 
 bool FileService::doesNonEmptyFileExist(std::string path) {
     std::ifstream file(path);
@@ -60,4 +60,4 @@ std::vector<std::string> FileService::readLines(std::string path) {
         lines.push_back(line);
     }
     return lines;
-};
\ No newline at end of file
+};
diff --git a/src/HyprlandService.cpp b/src/HyprlandService.cpp
index 6d0fb13..4764e5c 100644
--- a/src/HyprlandService.cpp
+++ b/src/HyprlandService.cpp
@@ -1,17 +1,17 @@
+#include "../include/HyprlandService.hpp"
+#include "../include/FileService.hpp"
+#include "../include/Macros.hpp"
+#include "../include/ShellService.hpp"
 #include <nlohmann/json.hpp>
 #include <optional>
 #include <string>
-#include "../include/HyprlandService.h"
-#include "../include/ShellService.h"
-#include "../include/Macros.h"
-#include "../include/FileService.h"
 
 using json = nlohmann::json;
 
 std::string HyprlandService::configFilePath;
 
 void HyprlandService::setConfigFilePath(std::string path) {
-  //Look for substring "~/". If found, expand it
+  // Look for substring "~/". If found, expand it
   const std::string tilde = "~/";
   size_t pos = path.find(tilde);
   if (pos != std::string::npos) {
diff --git a/src/ShellService.cpp b/src/ShellService.cpp
index 972998c..d9a9608 100644
--- a/src/ShellService.cpp
+++ b/src/ShellService.cpp
@@ -1,4 +1,4 @@
-#include "../include/ShellService.h"
+#include "../include/ShellService.hpp"
 #include <pwd.h>
 #include <unistd.h>
 
diff --git a/src/WindowRule.cpp b/src/WindowRule.cpp
index 1da1ad7..e0d8a46 100644
--- a/src/WindowRule.cpp
+++ b/src/WindowRule.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include "../include/WindowRule.h"
+#include "../include/WindowRule.hpp"
 
 std::string WindowRule::toString() {
     std::string mode = this->tile ? "tile on" : "float on";
diff --git a/src/Workspace.cpp b/src/Workspace.cpp
index 28d08ee..3b47430 100644
--- a/src/Workspace.cpp
+++ b/src/Workspace.cpp
@@ -1,4 +1,4 @@
-#include "../include/Workspace.h"
+#include "../include/Workspace.hpp"
 
 void from_json(const nlohmann::json &j, Workspace &w) {
   j.at("id").get_to(w.id);
diff --git a/src/main.cpp b/src/main.cpp
index b33f7ba..60c5d25 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <stdexcept>
-#include "../include/HyprlandService.h"
+#include "../include/HyprlandService.hpp"
 
 void help(char* execPath) {
 	std::cerr << "Usage: " << execPath << " <config_file_path> (flags)\n\n";