diff --git a/build/windows/2_bundle-gimp-uni_base.py b/build/windows/2_bundle-gimp-uni_base.py
index 33e0b51ddd..67827e955b 100644
--- a/build/windows/2_bundle-gimp-uni_base.py
+++ b/build/windows/2_bundle-gimp-uni_base.py
@@ -217,8 +217,7 @@ for dir in ["bin", "lib"]:
 
 
 ## .PDB/CODEVIEW DEBUG SYMBOLS (from babl, gegl and GIMP binaries)
-if "32" not in MSYSTEM_PREFIX:
-  bundle(GIMP_PREFIX, "bin/*.pdb")
+bundle(GIMP_PREFIX, "bin/*.pdb")
 ### Remove .pdb without corresponding binaries (depends on what was choosen to be bundled above)
 files = os.listdir(GIMP_DISTRIB / "bin")
 binaries = {os.path.splitext(file)[0] for file in files if file.endswith(('.exe', '.dll'))}
diff --git a/build/windows/installer/gimp-setup.iss b/build/windows/installer/gimp-setup.iss
index 4c9e890ee8..6ec2a1d244 100644
--- a/build/windows/installer/gimp-setup.iss
+++ b/build/windows/installer/gimp-setup.iss
@@ -413,7 +413,7 @@ Source: "{#BUNDLE}\bin\*"; DestDir: "{app}\bin"; Excludes: "libgimp*.dll,gimp*.e
 Source: "{#BUNDLE}\lib\*"; DestDir: "{app}\lib"; Excludes: "gimp,Gimp*.typelib,*.pdb,*.a,*.pc,lua,gluas.dll,python{#PYTHON_VERSION}"; Components: deps{#COMPONENT}; Flags: {#COMMON_FLAGS}
 
 ; Optional arch-specific components (full installation)
-#if defined(DEBUG_SYMBOLS) && COMPONENT != "X86"
+#if defined(DEBUG_SYMBOLS)
 Source: "{#BUNDLE}\*.pdb"; DestDir: "{app}"; Components: debug{#COMPONENT}; Flags: {#COMMON_FLAGS}
 #endif
 
diff --git a/meson.build b/meson.build
index 093ff0ebf9..a71bf67c98 100644
--- a/meson.build
+++ b/meson.build
@@ -355,7 +355,7 @@ if buildtype == 'debug' or buildtype == 'debugoptimized'
   elif cc.get_argument_syntax() == 'msvc'
     # CodeView symbols for DIA or DbgHelp debuggers and LLDB on Windows
     debugging_format = 'Native'
-  elif platform_windows and get_option('win-debugging') == 'native' and cc.has_argument('-gcodeview') and cc.has_link_argument('-Wl,--pdb=') and cc.get_id() == 'clang'
+  elif platform_windows and get_option('win-debugging') == 'native' and cc.has_argument('-gcodeview') and cc.has_link_argument('-Wl,--pdb=')
     # CodeView symbols for DIA or DbgHelp debuggers and LLDB on Windows
     debugging_format = 'native'
     compiler_args += '-gcodeview'