diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 804ebe9952..2a9309ea68 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -306,6 +306,7 @@ set( COMMON_SRCS
     eda_item.cpp
     eda_pattern_match.cpp
     eda_rect.cpp
+    eda_shape.cpp
     eda_units.cpp
     env_paths.cpp
     env_vars.cpp
@@ -507,7 +508,6 @@ target_include_directories( common SYSTEM PUBLIC
 set( PCB_COMMON_SRCS
     base_screen.cpp
     eda_text.cpp
-    eda_shape.cpp
     fp_lib_table.cpp
     hash_eda.cpp
     pg_properties.cpp
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index b36fcc414b..9532886e93 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -319,7 +319,6 @@ set( EESCHEMA_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/common/dialogs/panel_gal_display_options.cpp
 
     ${CMAKE_SOURCE_DIR}/common/base_units.cpp
-    ${CMAKE_SOURCE_DIR}/common/eda_shape.cpp
     ${CMAKE_SOURCE_DIR}/common/eda_text.cpp
     )
 
diff --git a/include/eda_shape.h b/include/eda_shape.h
index f8a3308906..8379a6d860 100644
--- a/include/eda_shape.h
+++ b/include/eda_shape.h
@@ -26,7 +26,6 @@
 #define EDA_SHAPE_H
 
 #include <eda_units.h>
-#include <convert_to_biu.h>
 #include <trigo.h>
 #include <geometry/shape_poly_set.h>
 #include <geometry/geometry_utils.h>