diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 813099473f..65b6883cbc 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -654,7 +654,7 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons kernel busses usb ;
 	EnableWerror src add-ons kernel console ;
 	EnableWerror src add-ons kernel cpu ;
-#	EnableWerror src add-ons kernel debugger ; # gcc2
+	EnableWerror src add-ons kernel debugger ;
 #	EnableWerror src add-ons kernel drivers audio ;
 	EnableWerror src add-ons kernel drivers bluetooth ;
 #	EnableWerror src add-ons kernel drivers bus ;
diff --git a/src/add-ons/kernel/debugger/hangman/hangman.c b/src/add-ons/kernel/debugger/hangman/hangman.c
index 7578864efb..3e51cea0b9 100644
--- a/src/add-ons/kernel/debugger/hangman/hangman.c
+++ b/src/add-ons/kernel/debugger/hangman/hangman.c
@@ -117,8 +117,8 @@ status_t
 init_words(char *from)
 {
 	int fd;
-	size_t sz, got;
-	int current, beg, end, i;
+	size_t sz, got, beg, end, i;
+	int current;
 	struct stat st;
 
 	memset((void *)words, 0, sizeof(words));
@@ -173,8 +173,8 @@ init_words(char *from)
 status_t
 init_words_from_threadnames(void)
 {
-	size_t sz, got;
-	int current, beg, end, i;
+	size_t sz, got, beg, end, i;
+	int current;
 	thread_info ti;
 
 	memset((void *)words, 0, sizeof(words));
diff --git a/src/libs/udis86/decode.c b/src/libs/udis86/decode.c
index a64af08ff6..73c5a22d37 100644
--- a/src/libs/udis86/decode.c
+++ b/src/libs/udis86/decode.c
@@ -26,6 +26,7 @@
 #include "udint.h"
 #include "types.h"
 #include "decode.h"
+#include "extern.h"
 
 #ifndef __UD_STANDALONE__
 # include <string.h>