diff --git a/src/Core/Bag.cpp b/src/Core/Bag.cpp
index 8704595..c7bb093 100644
--- a/src/Core/Bag.cpp
+++ b/src/Core/Bag.cpp
@@ -2,7 +2,7 @@
 
 #include "../Pieces/Piece.h"
 
-#include <Vector>
+#include <vector>
 #include <cstdlib>
 
 
diff --git a/src/Core/Bag.h b/src/Core/Bag.h
index bd8fc38..a7a4123 100644
--- a/src/Core/Bag.h
+++ b/src/Core/Bag.h
@@ -2,7 +2,7 @@
 
 #include "../Pieces/Piece.h"
 
-#include <Vector>
+#include <vector>
 
 
 /**
diff --git a/src/Core/Board.cpp b/src/Core/Board.cpp
index c217f9e..ed9fca0 100644
--- a/src/Core/Board.cpp
+++ b/src/Core/Board.cpp
@@ -2,8 +2,8 @@
 
 #include "../Pieces/Piece.h"
 
-#include <Vector>
-#include <Set>
+#include <vector>
+#include <set>
 #include <iostream>
 
 
diff --git a/src/Core/Board.h b/src/Core/Board.h
index 1723827..1c65170 100644
--- a/src/Core/Board.h
+++ b/src/Core/Board.h
@@ -2,7 +2,7 @@
 
 #include "../Pieces/Piece.h"
 
-#include <Vector>
+#include <vector>
 #include <iostream>
 
 
diff --git a/src/Core/Game.cpp b/src/Core/Game.cpp
index a2e5e2a..ed99d09 100644
--- a/src/Core/Game.cpp
+++ b/src/Core/Game.cpp
@@ -4,7 +4,7 @@
 #include "GameParameters.h"
 #include "Action.h"
 
-#include <Vector>
+#include <vector>
 
 static const int SUBPX_PER_ROW = 60; // the number of position the active piece can take "between" two rows
 static const int SOFT_DROP_SCORE = 1; // the score gained by line soft dropped
diff --git a/src/Core/Game.h b/src/Core/Game.h
index f710b29..9fa8c68 100644
--- a/src/Core/Game.h
+++ b/src/Core/Game.h
@@ -4,7 +4,7 @@
 #include "GameParameters.h"
 #include "Action.h"
 
-#include <Vector>
+#include <vector>
 
 
 /**
diff --git a/src/Core/GameBoard.cpp b/src/Core/GameBoard.cpp
index 0122700..4ffea4a 100644
--- a/src/Core/GameBoard.cpp
+++ b/src/Core/GameBoard.cpp
@@ -5,8 +5,8 @@
 #include "Bag.h"
 #include "LineClear.h"
 
-#include <Vector>
-#include <Set>
+#include <vector>
+#include <set>
 #include <memory>
 
 
diff --git a/src/Core/GameBoard.h b/src/Core/GameBoard.h
index 85a0f4a..c1f4266 100644
--- a/src/Core/GameBoard.h
+++ b/src/Core/GameBoard.h
@@ -5,7 +5,7 @@
 #include "Bag.h"
 #include "LineClear.h"
 
-#include <Vector>
+#include <vector>
 #include <memory>
 
 
diff --git a/src/Pieces/Color.h b/src/Pieces/Color.h
index ce8a9d6..a915ada 100644
--- a/src/Pieces/Color.h
+++ b/src/Pieces/Color.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <String>
-
+#include <string>
 
 /**
  * Every possible colors a block can take
diff --git a/src/Pieces/Generator.cpp b/src/Pieces/Generator.cpp
index 45fb95b..95efcfb 100644
--- a/src/Pieces/Generator.cpp
+++ b/src/Pieces/Generator.cpp
@@ -2,9 +2,9 @@
 
 #include "Polyomino.h"
 
-#include <Vector>
-#include <Set>
-#include <Map>
+#include <vector>
+#include <set>
+#include <map>
 #include <algorithm>
 
 
diff --git a/src/Pieces/Generator.h b/src/Pieces/Generator.h
index 890e3fb..7662ba7 100644
--- a/src/Pieces/Generator.h
+++ b/src/Pieces/Generator.h
@@ -2,9 +2,9 @@
 
 #include "Polyomino.h"
 
-#include <Vector>
-#include <Set>
-#include <Map>
+#include <vector>
+#include <set>
+#include <map>
 
 
 /**
diff --git a/src/Pieces/Piece.cpp b/src/Pieces/Piece.cpp
index 61471f2..ec4aa19 100644
--- a/src/Pieces/Piece.cpp
+++ b/src/Pieces/Piece.cpp
@@ -4,8 +4,8 @@
 #include "Rotation.h"
 #include "Color.h"
 
-#include <Set>
-#include <String>
+#include <set>
+#include <string>
 
 
 Piece::Piece(const Polyomino& polyomino, Color color) : polyomino(polyomino), color(color) {
diff --git a/src/Pieces/Piece.h b/src/Pieces/Piece.h
index aa90b36..c1ae83f 100644
--- a/src/Pieces/Piece.h
+++ b/src/Pieces/Piece.h
@@ -4,7 +4,7 @@
 #include "Rotation.h"
 #include "Color.h"
 
-#include <Set>
+#include <set>
 
 
 /**
diff --git a/src/Pieces/PiecesFiles.cpp b/src/Pieces/PiecesFiles.cpp
index 6f5e7ac..da4b78d 100644
--- a/src/Pieces/PiecesFiles.cpp
+++ b/src/Pieces/PiecesFiles.cpp
@@ -3,8 +3,8 @@
 #include "Generator.h"
 #include "Piece.h"
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 #include <iostream>
 #include <fstream>
 #include <filesystem>
diff --git a/src/Pieces/PiecesFiles.h b/src/Pieces/PiecesFiles.h
index 540a696..c1acf84 100644
--- a/src/Pieces/PiecesFiles.h
+++ b/src/Pieces/PiecesFiles.h
@@ -2,8 +2,8 @@
 
 #include "Piece.h"
 
-#include <Vector>
-#include <String>
+#include <vector>
+#include <string>
 
 
 /**
diff --git a/src/Pieces/Polyomino.cpp b/src/Pieces/Polyomino.cpp
index ec3a65f..9e8c626 100644
--- a/src/Pieces/Polyomino.cpp
+++ b/src/Pieces/Polyomino.cpp
@@ -2,8 +2,8 @@
 
 #include "Cell.h"
 
-#include <Vector>
-#include <Set>
+#include <vector>
+#include <set>
 #include <iostream>
 #include <climits>
 #include <algorithm>
diff --git a/src/Pieces/Polyomino.h b/src/Pieces/Polyomino.h
index 41aef17..c356de4 100644
--- a/src/Pieces/Polyomino.h
+++ b/src/Pieces/Polyomino.h
@@ -2,8 +2,8 @@
 
 #include "Cell.h"
 
-#include <Vector>
-#include <Set>
+#include <vector>
+#include <set>
 #include <iostream>