diff --git a/AbstractFactory/cpp-source/CMakeLists.txt b/AbstractFactory/cpp-source/CMakeLists.txt
index 0f8460f..966bc17 100644
--- a/AbstractFactory/cpp-source/CMakeLists.txt
+++ b/AbstractFactory/cpp-source/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 project(IsaacAbstractFactory)
 
 add_executable(AbstractFactory main.cpp)
@@ -13,4 +13,4 @@ target_link_libraries(AbstractFactory ${ADDITIONAL_LIBRARIES})
 
 add_executable(AbstractFactorySerializer main_serializer.cpp ${SOURCES} ${HEADERS})
 target_include_directories(AbstractFactorySerializer PRIVATE rooms serializers factories)
-target_link_libraries(AbstractFactorySerializer ${ADDITIONAL_LIBRARIES})
\ No newline at end of file
+target_link_libraries(AbstractFactorySerializer ${ADDITIONAL_LIBRARIES})
diff --git a/AbstractFactory/cpp-source/factories/CMakeLists.txt b/AbstractFactory/cpp-source/factories/CMakeLists.txt
index 5a2d4fd..ac54a0a 100644
--- a/AbstractFactory/cpp-source/factories/CMakeLists.txt
+++ b/AbstractFactory/cpp-source/factories/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 project(IsaacFactories)
 
 set(SOURCES BasementFactory.cpp CavesFactory.cpp RoomFactory.cpp)
diff --git a/AbstractFactory/cpp-source/rooms/CMakeLists.txt b/AbstractFactory/cpp-source/rooms/CMakeLists.txt
index d9c46f9..765fb99 100644
--- a/AbstractFactory/cpp-source/rooms/CMakeLists.txt
+++ b/AbstractFactory/cpp-source/rooms/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 
 project(IsaacRooms)
 
diff --git a/AbstractFactory/cpp-source/serializers/CMakeLists.txt b/AbstractFactory/cpp-source/serializers/CMakeLists.txt
index 551ce1f..242aa47 100644
--- a/AbstractFactory/cpp-source/serializers/CMakeLists.txt
+++ b/AbstractFactory/cpp-source/serializers/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 project(Serializers)
 
 set(SOURCES ../rooms/HardRoom.cpp ../rooms/NormalRoom.cpp ../rooms/Room.cpp RoomSerializer.cpp RoomSerializer.h GameSerializer.cpp GameSerializer.h)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2e9ae0..9950211 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 
 
 option(ON_PI "Build on PI" OFF)
diff --git a/Command/cpp-source/commands/Command.h b/Command/cpp-source/commands/Command.h
index 746a734..e336cce 100644
--- a/Command/cpp-source/commands/Command.h
+++ b/Command/cpp-source/commands/Command.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 class Command {
  public:
diff --git a/Decorator/cpp-source/CMakeLists.txt b/Decorator/cpp-source/CMakeLists.txt
index 28302d8..6a612f6 100644
--- a/Decorator/cpp-source/CMakeLists.txt
+++ b/Decorator/cpp-source/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 
 project(Decorator)
 
@@ -77,4 +77,4 @@ add_custom_target(
     copy_configs ALL DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/configs/config.ini
 )
 
-add_dependencies(Decorator copy_configs)
\ No newline at end of file
+add_dependencies(Decorator copy_configs)
diff --git a/Facade/cpp-source/CMakeLists.txt b/Facade/cpp-source/CMakeLists.txt
index 0aefe1e..4c79b3b 100644
--- a/Facade/cpp-source/CMakeLists.txt
+++ b/Facade/cpp-source/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(Facade)
 
 add_executable(
diff --git a/FactoryMethod/cpp-source/CMakeLists.txt b/FactoryMethod/cpp-source/CMakeLists.txt
index c7f1f39..7dd8e00 100644
--- a/FactoryMethod/cpp-source/CMakeLists.txt
+++ b/FactoryMethod/cpp-source/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(FactoryMethod)
 
 set(
diff --git a/Memento/cpp-source/Memento.h b/Memento/cpp-source/Memento.h
index 9d5e68d..ddd20fc 100644
--- a/Memento/cpp-source/Memento.h
+++ b/Memento/cpp-source/Memento.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 namespace memento {
 
diff --git a/Observer/cpp-source/main.cpp b/Observer/cpp-source/main.cpp
index 571431a..3bcc44a 100644
--- a/Observer/cpp-source/main.cpp
+++ b/Observer/cpp-source/main.cpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <thread>
 #include <mutex>
+#include <memory>
 
 struct MessageStorage {
   std::queue<std::string> messages;
@@ -72,4 +73,4 @@ int main() {
   std::thread t2(ProcessMessages, std::ref(p1));
   t1.join();
   t2.join();
-}
\ No newline at end of file
+}