diff --git a/.gitignore b/.gitignore
index 75c2cea..fc54c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 /bin/msdfgen
 output.png
 render.png
+CMakeUserPresets.json
 out/
 /build_xcode/
 /cmake-gen.bat
diff --git a/core/BitmapRef.hpp b/core/BitmapRef.hpp
index 6f9620d..32ba20a 100644
--- a/core/BitmapRef.hpp
+++ b/core/BitmapRef.hpp
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <cstdlib>
+#include <cstddef>
 
 namespace msdfgen {
 
diff --git a/core/EdgeHolder.cpp b/core/EdgeHolder.cpp
index 1a8c5f6..1edd26c 100644
--- a/core/EdgeHolder.cpp
+++ b/core/EdgeHolder.cpp
@@ -1,6 +1,8 @@
 
 #include "EdgeHolder.h"
 
+#include <cstddef>
+
 namespace msdfgen {
 
 void EdgeHolder::swap(EdgeHolder &a, EdgeHolder &b) {
diff --git a/core/Vector2.cpp b/core/Vector2.cpp
index 896963f..1459bec 100644
--- a/core/Vector2.cpp
+++ b/core/Vector2.cpp
@@ -1,6 +1,9 @@
 
 #include "Vector2.h"
 
+#include <cstddef>
+#include <cmath>
+
 namespace msdfgen {
 
 Vector2::Vector2(double val) : x(val), y(val) { }
diff --git a/core/Vector2.h b/core/Vector2.h
index 47ca637..43d245b 100644
--- a/core/Vector2.h
+++ b/core/Vector2.h
@@ -1,9 +1,6 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <cmath>
-
 namespace msdfgen {
 
 /**
diff --git a/core/arithmetics.hpp b/core/arithmetics.hpp
index 78c21d6..6da0132 100644
--- a/core/arithmetics.hpp
+++ b/core/arithmetics.hpp
@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include <cstdlib>
 #include <cmath>
 
 namespace msdfgen {
diff --git a/core/edge-coloring.cpp b/core/edge-coloring.cpp
index 6a87bba..873efd0 100644
--- a/core/edge-coloring.cpp
+++ b/core/edge-coloring.cpp
@@ -1,10 +1,10 @@
 
 #include "edge-coloring.h"
 
-#include <cstdlib>
 #include <cmath>
 #include <cstring>
 #include <cfloat>
+#include <vector>
 #include <queue>
 #include "arithmetics.hpp"
 
diff --git a/core/generator-config.h b/core/generator-config.h
index b430d37..f12206d 100644
--- a/core/generator-config.h
+++ b/core/generator-config.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <cstdlib>
+#include <cstddef>
 #include "BitmapRef.hpp"
 
 #ifndef MSDFGEN_PUBLIC
diff --git a/core/shape-description.h b/core/shape-description.h
index 5df7c50..6e2e223 100644
--- a/core/shape-description.h
+++ b/core/shape-description.h
@@ -1,7 +1,6 @@
 
 #pragma once
 
-#include <cstdlib>
 #include <cstdio>
 #include "Shape.h"
 
diff --git a/ext/import-font.h b/ext/import-font.h
index 491cba5..4a3be68 100644
--- a/ext/import-font.h
+++ b/ext/import-font.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <cstdlib>
+#include <cstddef>
 #include "../core/Shape.h"
 
 namespace msdfgen {
diff --git a/ext/import-svg.h b/ext/import-svg.h
index 88e7ebd..430fd0f 100644
--- a/ext/import-svg.h
+++ b/ext/import-svg.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <cstdlib>
+#include <cstddef>
 #include "../core/Shape.h"
 
 namespace msdfgen {
diff --git a/ext/save-png.cpp b/ext/save-png.cpp
index 1f40c2e..3fa8e96 100644
--- a/ext/save-png.cpp
+++ b/ext/save-png.cpp
@@ -1,7 +1,6 @@
 
 #include "save-png.h"
 
-#include <cstdlib>
 #include <cstdio>
 #include <cstring>
 #include <vector>