diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 93bed31dd8..38f2fa3f21 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -72,6 +72,7 @@ target_link_libraries( cvpcb_kiface
     3d-viewer
     gal
     common
+    gal       # Circular dependency between gal and common now
     kimath
     ${PCBNEW_IO_LIBRARIES}
     Boost::headers
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 39abaa286c..dd7f9e0d73 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -437,6 +437,7 @@ target_link_libraries( eeschema
     # There's way too much crap coming in from common yet.
     gal
     common
+    gal       # Circular dependency between gal and common now
     argparse::argparse
     ${wxWidgets_LIBRARIES}
     )
@@ -480,6 +481,7 @@ target_link_libraries( eeschema_kiface
     PRIVATE
         common
         eeschema_kiface_objects
+        gal       # Circular dependency between gal and common now
         markdown_lib
         scripting
         sexpr
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 6a6a588c60..389b1b68d2 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -112,6 +112,7 @@ target_link_libraries( gerbview
     # There's way too much crap coming in from common yet.
     gal
     common
+    gal       # Circular dependency between gal and common now
     core
     nlohmann_json
     ${wxWidgets_LIBRARIES}
@@ -155,6 +156,7 @@ target_link_libraries( gerbview_kiface
         nlohmann_json
         gal
         common
+        gal       # Circular dependency between gal and common now
         core
         gerbview_kiface_objects
         ${wxWidgets_LIBRARIES}
diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index f61d62b5da..b4dd41490a 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -85,6 +85,7 @@ target_link_libraries( pl_editor
     # There's way too much crap coming in from common yet.
     gal
     common
+    gal       # Circular dependency between gal and common now
     core
     ${wxWidgets_LIBRARIES}
     )
@@ -103,6 +104,7 @@ add_library( pl_editor_kiface MODULE
 target_link_libraries( pl_editor_kiface
     gal
     common
+    gal       # Circular dependency between gal and common now
     core
     ${wxWidgets_LIBRARIES}
     )
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index e72e2492f4..720dd9b415 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -626,6 +626,7 @@ make_lexer(
 target_link_libraries( pcbnew_kiface_objects
     PRIVATE
         common
+        gal       # Circular dependency between gal and common now
         core
         dxflib_qcad
         nanosvg