diff --git a/compiler/arm/aoptcpu.pas b/compiler/arm/aoptcpu.pas
index 428cd7748d..481dd90af8 100644
--- a/compiler/arm/aoptcpu.pas
+++ b/compiler/arm/aoptcpu.pas
@@ -25,8 +25,11 @@ Unit aoptcpu;
 
 {$i fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
+{$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
+
 { $define DEBUG_PREREGSCHEDULER}
-{ $define DEBUG_AOPTCPU}
 
 Interface
 
diff --git a/compiler/i8086/aoptcpu.pas b/compiler/i8086/aoptcpu.pas
index ef50ad81a2..e15c922b0e 100644
--- a/compiler/i8086/aoptcpu.pas
+++ b/compiler/i8086/aoptcpu.pas
@@ -25,7 +25,9 @@ unit aoptcpu;
 
 {$i fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
 {$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
   Interface
 
diff --git a/compiler/loongarch64/aoptcpu.pas b/compiler/loongarch64/aoptcpu.pas
index 91c9d55867..0d4e9043de 100644
--- a/compiler/loongarch64/aoptcpu.pas
+++ b/compiler/loongarch64/aoptcpu.pas
@@ -27,7 +27,9 @@ interface
 
 {$I fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
 {$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
 uses
   cpubase,
diff --git a/compiler/m68k/aoptcpu.pas b/compiler/m68k/aoptcpu.pas
index 12b0dda88e..49f6c56605 100644
--- a/compiler/m68k/aoptcpu.pas
+++ b/compiler/m68k/aoptcpu.pas
@@ -25,7 +25,9 @@ unit aoptcpu;
 
 {$i fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
 {$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
   Interface
 
diff --git a/compiler/mips/aoptcpu.pas b/compiler/mips/aoptcpu.pas
index 350829e9de..4ce933ef48 100644
--- a/compiler/mips/aoptcpu.pas
+++ b/compiler/mips/aoptcpu.pas
@@ -25,7 +25,9 @@ unit aoptcpu;
 
 {$i fpcdefs.inc}
 
-{ $define DEBUG_AOPTCPU}
+{$ifdef EXTDEBUG}
+{$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
   Interface
 
diff --git a/compiler/riscv/aoptcpurv.pas b/compiler/riscv/aoptcpurv.pas
index 51369ea18c..702a87cba2 100644
--- a/compiler/riscv/aoptcpurv.pas
+++ b/compiler/riscv/aoptcpurv.pas
@@ -27,7 +27,9 @@ interface
 
 {$I fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
 {$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
 uses
   cpubase,
diff --git a/compiler/riscv64/aoptcpu.pas b/compiler/riscv64/aoptcpu.pas
index 7eec20a0b1..8e9ba43ef0 100644
--- a/compiler/riscv64/aoptcpu.pas
+++ b/compiler/riscv64/aoptcpu.pas
@@ -27,7 +27,9 @@ interface
 
 {$I fpcdefs.inc}
 
-{ $define DEBUG_AOPTCPU}
+{$ifdef EXTDEBUG}
+{$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
 uses
   cpubase,
diff --git a/compiler/sparcgen/aoptcpu.pas b/compiler/sparcgen/aoptcpu.pas
index 5dc8cec746..a7b5de5685 100644
--- a/compiler/sparcgen/aoptcpu.pas
+++ b/compiler/sparcgen/aoptcpu.pas
@@ -25,7 +25,9 @@ unit aoptcpu;
 
 {$i fpcdefs.inc}
 
-{ $define DEBUG_AOPTCPU}
+{$ifdef EXTDEBUG}
+{$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
   Interface
 
diff --git a/compiler/xtensa/aoptcpu.pas b/compiler/xtensa/aoptcpu.pas
index b4c2321015..1027def632 100644
--- a/compiler/xtensa/aoptcpu.pas
+++ b/compiler/xtensa/aoptcpu.pas
@@ -25,7 +25,9 @@ Unit aoptcpu;
 
 {$i fpcdefs.inc}
 
-{ $define DEBUG_AOPTCPU}
+{$ifdef EXTDEBUG}
+{$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
 Interface
 
diff --git a/compiler/z80/aoptcpu.pas b/compiler/z80/aoptcpu.pas
index 55ad3e6b0a..cc217c2c73 100644
--- a/compiler/z80/aoptcpu.pas
+++ b/compiler/z80/aoptcpu.pas
@@ -26,7 +26,9 @@ Unit aoptcpu;
 
 {$i fpcdefs.inc}
 
+{$ifdef EXTDEBUG}
 {$define DEBUG_AOPTCPU}
+{$endif EXTDEBUG}
 
 Interface