diff --git a/library/composables/poster/useMapPoster.js b/library/composables/poster/useMapPoster.js
index b69f773b6..1ca5e9b75 100644
--- a/library/composables/poster/useMapPoster.js
+++ b/library/composables/poster/useMapPoster.js
@@ -33,6 +33,7 @@
 
 import { ref, readonly } from 'vue';
 import { computeLayout } from './usePosterLayout.js';
+import { engineFor } from '../useMapProvider.js';
 
 const MAX_SINGLE_CANVAS = 4096;       // WebGL safe ceiling for most hardware
 const TILE_PX           = 2048;        // tile size for stitch path
@@ -370,7 +371,7 @@ async function _spawnHiddenMap(sourceMap, w, h, opts = {}) {
   // eslint-disable-next-line no-undef
   const W = (typeof window !== 'undefined' ? window : {});
   const isMaplibre = !!W.maplibregl && sourceMap instanceof W.maplibregl.Map;
-  const gl = isMaplibre ? W.maplibregl : W.mapboxgl;
+  const gl = engineFor(sourceMap);   // the one per-instance helper (useMapProvider.js)
   if (!gl) throw new Error('useMapPoster: ' + (isMaplibre ? 'maplibregl' : 'mapboxgl') + ' global not found');
 
   const styleObj = sourceMap.getStyle();
diff --git a/library/composables/useMapEvents.js b/library/composables/useMapEvents.js
index a5cc61f60..6871af20b 100644
--- a/library/composables/useMapEvents.js
+++ b/library/composables/useMapEvents.js
@@ -5,6 +5,7 @@
 // Import Vue functions from NPM package
 import { ref, inject } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { engineFor } from './useMapProvider.js';
 
 /**
  * useMapEvents composable - manages Mapbox layer event handlers
@@ -245,7 +246,7 @@ export function useMapEvents(options = {}) {
             }
 
             // Fallback: show popup (for non-prayer legend types)
-            new mapboxgl.Popup({
+            new (engineFor(map).Popup)({
                 maxWidth: '320px',
                 className: 'people-group-popup'
             })
@@ -290,7 +291,7 @@ export function useMapEvents(options = {}) {
             if (e.features && e.features.length > 0) {
                 const properties = e.features[0].properties;
 
-                new mapboxgl.Popup()
+                new (engineFor(map).Popup)()
                     .setLngLat(e.lngLat)
                     .setHTML(generateRegionPopupContent(properties))
                     .addTo(map);
diff --git a/library/composables/useMapProvider.js b/library/composables/useMapProvider.js
index 00cbf3557..f764575cb 100644
--- a/library/composables/useMapProvider.js
+++ b/library/composables/useMapProvider.js
@@ -61,6 +61,28 @@ export function isMapboxMap(map) {
   return typeof window !== 'undefined' && !!window.mapboxgl && map instanceof window.mapboxgl.Map
 }
 
+/**
+ * The engine namespace that built THIS map: window.maplibregl or window.mapboxgl. Use it for
+ * everything constructed alongside a map (Marker, Popup, a second Map, controls) instead of
+ * the bare `mapboxgl` global.
+ *
+ * ★ WHY. Every generated leaf <head> used to load mapbox-gl.js statically, whatever the provider,
+ * so a bare `new mapboxgl.Popup()` always found a global, even on a MapLibre map (where it
+ * built a MAPBOX popup and attached it to a MapLibre map). Removing that static peer (a visitor-IP
+ * leak to api.mapbox.com under MapLibre) turns each of those into a ReferenceError on the first
+ * pin select or click, and the poster's hidden map into 'mapboxgl global not found'.
+ * Asking the MAP which engine it is removes the dependency on what else the page loaded.
+ * @param {object} map  the live map instance
+ * @returns {object|undefined}  the engine namespace, or undefined when neither is loaded
+ */
+export function engineFor(map) {
+  if (typeof window === 'undefined') return undefined
+  const ml = window.maplibregl, mb = window.mapboxgl
+  if (ml && ml.Map && map instanceof ml.Map) return ml
+  if (mb && mb.Map && map instanceof mb.Map) return mb
+  return mb || ml
+}
+
 /** Mapbox-Standard-only lighting paint props, per engine. MapLibre rejects layers whose
  *  paint carries unknown properties (the whole layer is dropped → invisible pins), so
  *  spread this instead of writing '<kind>-emissive-strength' literally.
diff --git a/library/composables/useSelectedPin.js b/library/composables/useSelectedPin.js
index ca94a2ad6..64488cc42 100644
--- a/library/composables/useSelectedPin.js
+++ b/library/composables/useSelectedPin.js
@@ -3,7 +3,7 @@
 // floats an animated "GO" location pin above it with a pulsing light glow.
 
 import { watch, inject } from 'vue';
-import { emissivePaint, isMapboxMap } from './useMapProvider.js';
+import { emissivePaint, isMapboxMap, engineFor } from './useMapProvider.js';
 
 // ─────────────────────────────────────────────
 // Constants
@@ -151,7 +151,8 @@ export function useSelectedPin(options = {}) {
         // anchor:'bottom' pins the marker's bottom edge to the lat/lng.
         // After the wrapper resize to match the SVG (43px), the bottom edge
         // IS the pin's tip — no offset compensation needed.
-        _marker = new mapboxgl.Marker({
+        // engineFor, not the bare `mapboxgl` global: under MapLibre there may be no Mapbox global
+        _marker = new (engineFor(map).Marker)({
             element : _markerEl,
             anchor  : 'bottom',
             offset  : [0, 0]
diff --git a/plugin-designs/key-cities/cities-map.vue b/plugin-designs/key-cities/cities-map.vue
index 69e1a6740..a6e2b88cc 100644
--- a/plugin-designs/key-cities/cities-map.vue
+++ b/plugin-designs/key-cities/cities-map.vue
@@ -36,6 +36,7 @@ import { labelFont } from '@map/maps/label-font.js'
 import { computed, inject, ref, shallowRef, markRaw, onMounted, onBeforeUnmount } from 'vue'
 import { useShadowStyles } from '@map/composables/useShadowStyles.js'
 import { addMapAttribution } from '@map/composables/useMapAttribution'
+import { ensureEngineScript, engineGlobal } from '@map/composables/useMapInstance.js'
 import { resolveAssetsBase } from '@map/utils/embedBase.js'
 
 const profileConfig = inject('profileConfig', ref(null))
@@ -131,7 +132,10 @@ function paint(map) {
 }
 
 onMounted(async () => {
-  const gl = window.mapboxgl
+  // Load the engine rather than assume the page did: leaf <head>s no longer preload mapbox-gl.js
+  // (it leaked every visitor's IP to Mapbox under provider=maplibre). This map is Mapbox-only.
+  try { await ensureEngineScript('mapbox') } catch (_) {}
+  const gl = engineGlobal('mapbox')
   if (!gl || !mapEl.value) { err.value = 'mapbox-gl not loaded'; return }
   try {
     await load()
diff --git a/plugin-designs/pplr-data-maps/src/components/MapboxGeocoder.vue b/plugin-designs/pplr-data-maps/src/components/MapboxGeocoder.vue
index 9d1d73ed0..96d3148b2 100644
--- a/plugin-designs/pplr-data-maps/src/components/MapboxGeocoder.vue
+++ b/plugin-designs/pplr-data-maps/src/components/MapboxGeocoder.vue
@@ -21,6 +21,7 @@
 import { ref, watch, onMounted, onBeforeUnmount, computed, inject } from 'vue'
 import { ensureGeocoder, GEOCODER } from '../utils/pplrData.js'
 import { resolveMapProvider } from '@map/composables/useMapProvider.js'
+import { ensureEngineScript, engineGlobal } from '@map/composables/useMapInstance.js'
 import { useInstance } from '../composables/usePplrInstance.js'
 
 const props = defineProps({
@@ -155,7 +156,7 @@ function setup() {
         render: renderSuggestion,
       })
     } else {
-    if (!window.MapboxGeocoder || !window.mapboxgl) {
+    if (!window.MapboxGeocoder || !engineGlobal('mapbox')) {
       console.warn('[MapboxGeocoder] mapbox-gl-geocoder or mapbox-gl not on window — check CDN <script> tags')
       return
     }
@@ -164,7 +165,7 @@ function setup() {
     }
     geocoder = new window.MapboxGeocoder({
       accessToken: props.mapboxToken,
-      mapboxgl: window.mapboxgl,
+      mapboxgl: engineGlobal('mapbox'),
       placeholder: props.placeholder,
       localGeocoder: buildLocalGeocoder(),
       localGeocoderOnly: false,
@@ -252,7 +253,10 @@ function onGlobalKey(e) {
 
 onMounted(() => {
   // setup() swallows its own errors; a failed script load leaves the map working without search.
-  ensureGeocoder(provider).then(setup, (e) => console.warn('[MapboxGeocoder]', e.message))
+  // The ENGINE first, then its geocoder: the Mapbox path hands mapboxgl to the geocoder, and it
+  // used to find it only because every leaf <head> preloaded mapbox-gl.js. ensureEngineScript is
+  // a no-op when the map already loaded it.
+  ensureEngineScript(provider).then(() => ensureGeocoder(provider)).then(setup, (e) => console.warn('[MapboxGeocoder]', e.message))
   document.addEventListener('keydown', onGlobalKey)
 })
 onBeforeUnmount(() => {
diff --git a/plugin-designs/pplr-data-maps/src/utils/pplrData.js b/plugin-designs/pplr-data-maps/src/utils/pplrData.js
index 51d2ed23b..d8502ee6e 100644
--- a/plugin-designs/pplr-data-maps/src/utils/pplrData.js
+++ b/plugin-designs/pplr-data-maps/src/utils/pplrData.js
@@ -60,13 +60,8 @@ export function ensureGeocoder(provider = 'mapbox') {
 
 // The engine namespace that built THIS map (Popup, Marker, NavigationControl…). The views were
 // written against the Mapbox global; under provider=maplibre that global does not exist and a
-// `new mapboxgl.Popup` throws on the first pin click.
-export function glFor(map) {
-  if (typeof window === 'undefined') return undefined
-  const ml = window.maplibregl
-  if (ml && map && ml.Map && map instanceof ml.Map) return ml
-  return window.mapboxgl || ml
-}
+// `new mapboxgl.Popup` throws on the first pin click. Now the library's engineFor (one copy).
+export { engineFor as glFor } from '@map/composables/useMapProvider.js'
 
 // Verification handle (the gospel-resources __grState contract): what the ACTIVE view's map
 // actually did, so a check can assert "loaded" rather than inferring it from missing requests.