diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f21ef3a8d3a..4a5827e644a 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -198,7 +198,6 @@ set(SRC
   intern/mball.cc
   intern/mball_tessellate.cc
   intern/mesh.cc
-  intern/mesh_boolean_convert.cc
   intern/mesh_calc_edges.cc
   intern/mesh_compare.cc
   intern/mesh_convert.cc
@@ -446,7 +445,6 @@ set(SRC
   BKE_mball_tessellate.hh
   BKE_mesh.h
   BKE_mesh.hh
-  BKE_mesh_boolean_convert.hh
   BKE_mesh_compare.hh
   BKE_mesh_fair.hh
   BKE_mesh_iterators.hh
@@ -822,14 +820,6 @@ if(WITH_TBB)
   )
 endif()
 
-if(WITH_GMP)
-  add_definitions(-DWITH_GMP)
-
-  list(APPEND INC_SYS
-    ${GMP_INCLUDE_DIRS}
-  )
-endif()
-
 # # Warnings as errors, this is too strict!
 # if(MSVC)
 #    string(APPEND CMAKE_C_FLAGS " /WX")
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index 596fead5be0..3b3e60f7cb5 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -20,6 +20,7 @@ set(SRC
   intern/extend_curves.cc
   intern/fillet_curves.cc
   intern/join_geometries.cc
+  intern/mesh_boolean_convert.cc
   intern/mesh_copy_selection.cc
   intern/mesh_merge_by_distance.cc
   intern/mesh_primitive_cuboid.cc
@@ -53,6 +54,7 @@ set(SRC
   GEO_extend_curves.hh
   GEO_fillet_curves.hh
   GEO_join_geometries.hh
+  GEO_mesh_boolean_convert.hh
   GEO_mesh_copy_selection.hh
   GEO_mesh_merge_by_distance.hh
   GEO_mesh_primitive_cuboid.hh
@@ -116,4 +118,12 @@ if(WITH_TBB)
   )
 endif()
 
+if(WITH_GMP)
+  add_definitions(-DWITH_GMP)
+
+  list(APPEND INC_SYS
+    ${GMP_INCLUDE_DIRS}
+  )
+endif()
+
 blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/blenkernel/BKE_mesh_boolean_convert.hh b/source/blender/geometry/GEO_mesh_boolean_convert.hh
similarity index 97%
rename from source/blender/blenkernel/BKE_mesh_boolean_convert.hh
rename to source/blender/geometry/GEO_mesh_boolean_convert.hh
index 51c74691f8a..370f67e4aee 100644
--- a/source/blender/blenkernel/BKE_mesh_boolean_convert.hh
+++ b/source/blender/geometry/GEO_mesh_boolean_convert.hh
@@ -4,10 +4,6 @@
 
 #pragma once
 
-/** \file
- * \ingroup bke
- */
-
 #include "BLI_array.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_mesh_boolean.hh"
diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/geometry/intern/mesh_boolean_convert.cc
similarity index 99%
rename from source/blender/blenkernel/intern/mesh_boolean_convert.cc
rename to source/blender/geometry/intern/mesh_boolean_convert.cc
index 3bac225f7f8..fce8eb7bdf5 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/geometry/intern/mesh_boolean_convert.cc
@@ -11,7 +11,6 @@
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_boolean_convert.hh"
 
 #include "BLI_alloca.h"
 #include "BLI_array.hh"
@@ -26,6 +25,8 @@
 #include "BLI_task.hh"
 #include "BLI_virtual_array.hh"
 
+#include "GEO_mesh_boolean_convert.hh"
+
 namespace blender::meshintersect {
 
 #ifdef WITH_GMP
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc
index 7e624747a76..9eb2e8cddc7 100644
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@ -31,7 +31,6 @@
 #include "BKE_lib_query.hh"
 #include "BKE_material.h"
 #include "BKE_mesh.hh"
-#include "BKE_mesh_boolean_convert.hh"
 #include "BKE_mesh_wrapper.hh"
 #include "BKE_modifier.hh"
 
@@ -45,6 +44,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "GEO_mesh_boolean_convert.hh"
 #include "GEO_randomize.hh"
 
 #include "bmesh.hh"
diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
index 60622c4bf77..d4b6ccc75ea 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
@@ -4,7 +4,6 @@
 
 #include "BKE_geometry_set_instances.hh"
 #include "BKE_instances.hh"
-#include "BKE_mesh_boolean_convert.hh"
 
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
@@ -14,6 +13,7 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 
+#include "GEO_mesh_boolean_convert.hh"
 #include "GEO_randomize.hh"
 
 #include "node_geometry_util.hh"