diff --git a/src/edit/src/editor.cpp b/src/edit/src/editor.cpp
index 6d1f7bc4974a7f1ec48684492f1d660e674a85f4..c1f47e4a3d4cd425463660aa746d3c5743d26ce1 100644
--- a/src/edit/src/editor.cpp
+++ b/src/edit/src/editor.cpp
@@ -1326,7 +1326,7 @@ void Editor::setModuleTypeBuffer(const build_mode_I build_mode)
     }
 
     auto type_c_str = type.c_str();
-    strncpy_s(module_type_buffer, type_c_str, type.length());
+    strncpy(module_type_buffer, type_c_str, type.length());
 }
 
 bool Editor::isConType(rofi::component component)
@@ -1546,6 +1546,7 @@ bool Editor::checkConnectorRequestOnVoxel(node_ptr selection)
     {
         using enum rofi::connector_type;
         case rotation:
+        {
             if (!voxel->hasSharedRotation())
                 return false;
 
@@ -1562,7 +1563,9 @@ bool Editor::checkConnectorRequestOnVoxel(node_ptr selection)
             }
 
             break;
+        }
         case shared_rotation:
+        {
             if (!voxel->hasNoConnections())
             {
                 setError("Add Connector Error: Voxel already connected, cannot add Shared Connector");
@@ -1582,6 +1585,7 @@ bool Editor::checkConnectorRequestOnVoxel(node_ptr selection)
                 }
             }
             // No break here is correct
+        }
         case fixed:
         {
             auto world_direction = voxel->getNode()->getRotationMatWorld() * glm::vec4(voxel_local_direction, 1.0f);
@@ -1602,12 +1606,14 @@ bool Editor::checkConnectorRequestOnVoxel(node_ptr selection)
         }
         // No break here is correct
         case open:
+        {
             if (voxel->hasSharedRotation() && !voxel->hasRotationConnector())
             {
                 setError("Add Connector Error: Voxel of Body type has no Connector Shoe");
                 return false;
             }
             break;
+        }
         default:
             ASSUMPTION(false);
             break;
diff --git a/src/filein/include/filein/json_loader.hpp b/src/filein/include/filein/json_loader.hpp
index 29046299c4098991a51ab1233b34ef678e967243..38504122c1e7f6d5a25057bfe24f4f4180454237 100644
--- a/src/filein/include/filein/json_loader.hpp
+++ b/src/filein/include/filein/json_loader.hpp
@@ -3,6 +3,7 @@
 
 #include <boost/json.hpp>
 
+#include <filesystem>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
diff --git a/src/filein/src/json_loader.cpp b/src/filein/src/json_loader.cpp
index 50299f01730f29e23b5b3b31f058e59d8f8963d9..c597c23af3fb1b8611166d4e62168bd100411025 100644
--- a/src/filein/src/json_loader.cpp
+++ b/src/filein/src/json_loader.cpp
@@ -1,7 +1,5 @@
 #include <filein/json_loader.hpp>
 
-#include <filesystem>
-
 void save_configuration(const boost::json::value &value, const std::filesystem::path directory, const char* file_name)
 {
     std::filesystem::path file_path = directory / std::filesystem::path(file_name);
diff --git a/src/gfx/include/gfx/texture.hpp b/src/gfx/include/gfx/texture.hpp
index 988b8cb5057ee03f2c2f9a9c6fd4178954b2a247..fcd8e4ce9874bd5ca86b336e0b3f18250acc1575 100644
--- a/src/gfx/include/gfx/texture.hpp
+++ b/src/gfx/include/gfx/texture.hpp
@@ -5,6 +5,7 @@
 
 #include <filesystem>
 #include <memory>
+#include <vector>
 
 class Texture;