diff --git a/port/windows-h4-da14585/Makefile b/port/windows-h4-da14585/Makefile
index 7edbe0744..4fec7c410 100644
--- a/port/windows-h4-da14585/Makefile
+++ b/port/windows-h4-da14585/Makefile
@@ -18,7 +18,6 @@ include ${BTSTACK_ROOT}/example/Makefile.inc
 
 # CC = gcc-fsf-4.9
 CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
-# CFLAGS += -Werror
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/posix \
 		  -I${BTSTACK_ROOT}/platform/windows \
diff --git a/port/windows-h4-zephyr/Makefile b/port/windows-h4-zephyr/Makefile
index 1268e4d01..2bbe828cb 100644
--- a/port/windows-h4-zephyr/Makefile
+++ b/port/windows-h4-zephyr/Makefile
@@ -16,7 +16,6 @@ include ${BTSTACK_ROOT}/example/Makefile.inc
 
 # CC = gcc-fsf-4.9
 CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
-# CFLAGS += -Werror
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/posix \
 		  -I${BTSTACK_ROOT}/platform/windows \
diff --git a/port/windows-h4/Makefile b/port/windows-h4/Makefile
index a6238ef2e..650f90865 100644
--- a/port/windows-h4/Makefile
+++ b/port/windows-h4/Makefile
@@ -30,7 +30,6 @@ include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
 
 # CC = gcc-fsf-4.9
 CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
-# CFLAGS += -Werror
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/posix \
 		  -I${BTSTACK_ROOT}/platform/windows \
diff --git a/port/windows-winusb-intel/Makefile b/port/windows-winusb-intel/Makefile
index 612bf240e..a3fc662cc 100644
--- a/port/windows-winusb-intel/Makefile
+++ b/port/windows-winusb-intel/Makefile
@@ -10,8 +10,7 @@ include ${BTSTACK_ROOT}/example/Makefile.inc
 include ${BTSTACK_ROOT}/chipset/intel/Makefile.inc
 
 # CC = gcc-fsf-4.9
-CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wpedantic
-# CFLAGS += -Werror
+CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/windows \
 		  -I${BTSTACK_ROOT}/platform/posix \
diff --git a/port/windows-winusb/Makefile b/port/windows-winusb/Makefile
index 38585a003..876cfd025 100644
--- a/port/windows-winusb/Makefile
+++ b/port/windows-winusb/Makefile
@@ -9,8 +9,7 @@ COMMON  += rijndael.c
 include ${BTSTACK_ROOT}/example/Makefile.inc
 
 # CC = gcc-fsf-4.9
-CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wpedantic
-# CFLAGS += -Werror
+CFLAGS  += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/windows \
 		  -I${BTSTACK_ROOT}/platform/posix \