diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
index 65f98ae1ff..aba04a75b7 100644
--- a/bitmap2component/CMakeLists.txt
+++ b/bitmap2component/CMakeLists.txt
@@ -16,6 +16,7 @@ set( BITMAP2COMPONENT_SRCS
     bitmap2component.cpp
     bitmap2cmp_gui_base.cpp
     bitmap2cmp_gui.cpp
+    ../common/env_vars.cpp      # needed on MSW to avoid a link issue (a symbol not found)
     )
 
 set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIES
@@ -50,7 +51,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
 
 target_link_libraries( bitmap2component
     common
-    gal
     ${wxWidgets_LIBRARIES}
     potrace
     )
diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt
index 5fa93b0d2d..ecf308338a 100644
--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@@ -36,6 +36,7 @@ set( PCB_CALCULATOR_SRCS
     attenuators/attenuator_classes.cpp
     dialogs/pcb_calculator_frame_base.cpp
     dialogs/dialog_regulator_data_base.cpp
+    ../common/env_vars.cpp      # needed on MSW to avoid a link issue (a symbol not found)
     )
 
 if( MINGW )
@@ -68,8 +69,6 @@ target_link_libraries( pcb_calculator
     #singletop  # replaces common, giving us restrictive control and link warnings.
     # There's way too much crap coming in from common yet.
     common
-    gal
-    common
     ${wxWidgets_LIBRARIES}
     )