Q-W1 code-review follow-ups: restore 104 trailing newlines, relocate reasampler_uid.h to core/wire, drop ext_keys namespaces shim, add slot_map_tests, golden serialize literals for 4 modules, namespaces.h/pragma-once ordering sweep. 60/60 green.

src/shell/instrument/reaper_bridge.h

@@ -1,4 +1,3 @@
-#include "core/namespaces.h"
 // reaper_bridge.h — the REAPER VST-host bridge (Phase S1 read spike). THIN shell:
 // resolves REAPER API functions by name over the host context and reads the live
 // "reasampler" project ext-state. The fiddly decode lives in bridge_marshal (pure).
@@ -17,6 +16,7 @@
 // reaper_vst3_interfaces.h + reaper_plugin_functions.h at the spike.
 
 #pragma once
+#include "core/namespaces.h"
 
 #include <optional>
 #include <string>

src/shell/instrument/reasampler_embed.h

@@ -1,4 +1,3 @@
-#include "core/namespaces.h"
 // reasampler_embed.h — the S6 embedded TCP/MCP UI shell. Implements REAPER's
 // IReaperUIEmbedInterface (vendor/reaper-sdk/sdk/reaper_plugin_fx_embed.h +
 // reaper_vst3_interfaces.h) so the instrument draws a compact keymap/level strip INLINE in
@@ -32,6 +31,7 @@
 // REAPER's messages to/from it and draws with the same LICE idiom as reasampler_editor.
 
 #pragma once
+#include "core/namespaces.h"
 
 #include <cstdint>
 #include <string>

src/shell/instrument/reasampler_uid.h

@@ -1,46 +0,0 @@
-#pragma once
-// reasampler_uid.h — the FOREVER-FROZEN VST3 class-UID constants, SDK-FREE.
-//
-// Split out of reasampler_vst.h (S-GA-DropFX) so the PURE extension side can derive the
-// class-ID string a .vstpreset file carries (instrument_drop::vstClassIdHex) WITHOUT
-// including the VST3 SDK: reasampler_vst.h needs Steinberg::FUID (SDK), but the UID VALUES
-// are plain integer macros. This header owns the values + the channel selection; nothing
-// else. reasampler_vst.h includes it to build the runtime FUID; instrument_drop includes it
-// to render the 32-char hex string. ONE source of truth — the frozen constants are written
-// exactly once, here.
-//
-// A class UID is FOREVER-STABLE once shipped: a REAPER project that instantiates the
-// instrument records the UID, so changing it orphans every saved instance. Minted once;
-// do not regenerate. See reasampler_vst.h for the full channel-isolation story (S18).
-
-#include "version_generated.h"  // REASAMPLER_CHANNEL_IS_BETA — the one channel bit
-
-// STABLE class UID (S-NAME-1). Minted at the S1 spike (2026-07-26), locked. FROZEN FOREVER.
-#define REASAMPLER_PROC_UID_1 0x5E45A11E
-#define REASAMPLER_PROC_UID_2 0x9C7B4D6A
-#define REASAMPLER_PROC_UID_3 0xB1E3F208
-#define REASAMPLER_PROC_UID_4 0x4A6C1D9F
-
-// BETA class UID (S18). Minted once (2026-07-26), locked FROM THIS WAVE per Daniel's
-// fast-track (fork S18-F1: mint now, not at first beta release). FROZEN FOREVER — the same
-// permanent lock as the stable UID; do not regenerate even though no beta VST has shipped.
-#define REASAMPLER_PROC_UID_BETA_1 0xCCFFEB3A
-#define REASAMPLER_PROC_UID_BETA_2 0x4FF532A6
-#define REASAMPLER_PROC_UID_BETA_3 0x9E181798
-#define REASAMPLER_PROC_UID_BETA_4 0x4256955F
-
-// The channel-selected UID macros — exactly one class UID per binary. The factory's
-// INLINE_UID (compile-time brace init) and the runtime FUID in reasampler_vst.h both source
-// these, as does the extension's vstClassIdHex (the .vstpreset class-ID string), so the
-// binary identity and the preset-file identity cannot diverge.
-#if REASAMPLER_CHANNEL_IS_BETA
-#define REASAMPLER_ACTIVE_UID_1 REASAMPLER_PROC_UID_BETA_1
-#define REASAMPLER_ACTIVE_UID_2 REASAMPLER_PROC_UID_BETA_2
-#define REASAMPLER_ACTIVE_UID_3 REASAMPLER_PROC_UID_BETA_3
-#define REASAMPLER_ACTIVE_UID_4 REASAMPLER_PROC_UID_BETA_4
-#else
-#define REASAMPLER_ACTIVE_UID_1 REASAMPLER_PROC_UID_1
-#define REASAMPLER_ACTIVE_UID_2 REASAMPLER_PROC_UID_2
-#define REASAMPLER_ACTIVE_UID_3 REASAMPLER_PROC_UID_3
-#define REASAMPLER_ACTIVE_UID_4 REASAMPLER_PROC_UID_4
-#endif

src/shell/instrument/reasampler_vst.h

@@ -1,4 +1,3 @@
-#include "core/namespaces.h"
 // reasampler_vst.h — shared identity constants for the ReaSampler VST3 instrument
 // (Phase S). One place for the plugin's class UID, name, vendor, and version so the
 // processor, factory, and editor agree.
@@ -19,10 +18,11 @@
 // binary UID identity — the string identity lives in the pure module).
 
 #pragma once
+#include "core/namespaces.h"
 
 #include "pluginterfaces/base/funknown.h"
 
-#include "shell/instrument/reasampler_uid.h"  // the FROZEN UID macros + channel selection (SDK-free values)
+#include "core/wire/reasampler_uid.h"  // the FROZEN UID macros + channel selection (SDK-free values)
 
 namespace reasampler::vst {