diff --git a/core/math/triangulate.h b/core/math/triangulate.h
index b1a583d0c566..a0f56f5f2713 100644
--- a/core/math/triangulate.h
+++ b/core/math/triangulate.h
@@ -31,7 +31,7 @@
 #ifndef TRIANGULATE_H
 #define TRIANGULATE_H
 
-#include "math_2d.h"
+#include "vector2.h"
 
 /*
 http://www.flipcode.com/archives/Efficient_Polygon_Triangulation.shtml
diff --git a/drivers/convex_decomp/b2d_decompose.h b/drivers/convex_decomp/b2d_decompose.h
index 068689d73dd1..b21792047e27 100644
--- a/drivers/convex_decomp/b2d_decompose.h
+++ b/drivers/convex_decomp/b2d_decompose.h
@@ -31,8 +31,8 @@
 #ifndef B2D_DECOMPOSE_H
 #define B2D_DECOMPOSE_H
 
-#include "math_2d.h"
 #include "vector.h"
+#include "vector2.h"
 Vector<Vector<Vector2> > b2d_decompose(const Vector<Vector2> &p_polygon);
 
 #endif // B2D_DECOMPOSE_H
diff --git a/modules/gdnative/gdnative/pool_arrays.cpp b/modules/gdnative/gdnative/pool_arrays.cpp
index 6688be1a0d88..2b6b7a823a02 100644
--- a/modules/gdnative/gdnative/pool_arrays.cpp
+++ b/modules/gdnative/gdnative/pool_arrays.cpp
@@ -35,7 +35,7 @@
 #include "dvector.h"
 
 #include "core/color.h"
-#include "core/math/math_2d.h"
+#include "core/math/vector2.h"
 #include "core/math/vector3.h"
 
 #ifdef __cplusplus
diff --git a/modules/gdnative/gdnative/vector2.cpp b/modules/gdnative/gdnative/vector2.cpp
index 9e40b423733e..c7902e06ee04 100644
--- a/modules/gdnative/gdnative/vector2.cpp
+++ b/modules/gdnative/gdnative/vector2.cpp
@@ -30,7 +30,7 @@
 
 #include "gdnative/vector2.h"
 
-#include "core/math/math_2d.h"
+#include "core/math/vector2.h"
 #include "core/variant.h"
 
 #ifdef __cplusplus
diff --git a/scene/2d/line_builder.h b/scene/2d/line_builder.h
index b1c62f84e2be..edfdf97c4790 100644
--- a/scene/2d/line_builder.h
+++ b/scene/2d/line_builder.h
@@ -33,8 +33,8 @@
 
 #include "color.h"
 #include "line_2d.h"
-#include "math_2d.h"
 #include "scene/resources/color_ramp.h"
+#include "vector2.h"
 
 class LineBuilder {
 public:
diff --git a/thirdparty/b2d_convexdecomp/b2Glue.h b/thirdparty/b2d_convexdecomp/b2Glue.h
index 425486356ee8..10c2f62361fb 100644
--- a/thirdparty/b2d_convexdecomp/b2Glue.h
+++ b/thirdparty/b2d_convexdecomp/b2Glue.h
@@ -19,7 +19,7 @@
 #ifndef B2GLUE_H
 #define B2GLUE_H
 
-#include "math_2d.h"
+#include "vector2.h"
 #include <limits.h>
 
 namespace b2ConvexDecomp {
diff --git a/thirdparty/misc/triangulator.h b/thirdparty/misc/triangulator.h
index b6dd7e82364b..d1538cfae5f2 100644
--- a/thirdparty/misc/triangulator.h
+++ b/thirdparty/misc/triangulator.h
@@ -21,9 +21,9 @@
 #ifndef TRIANGULATOR_H
 #define TRIANGULATOR_H
 
-#include "math_2d.h"
 #include "list.h"
 #include "set.h"
+#include "vector2.h"
 //2D point structure