diff --git a/os/hal/templates/pal_lld.h b/os/hal/templates/pal_lld.h
index b1baeafa5..e96cc1d96 100644
--- a/os/hal/templates/pal_lld.h
+++ b/os/hal/templates/pal_lld.h
@@ -186,7 +186,8 @@ typedef uint32_t ioportid_t;
  *
  * @notapi
  */
-#define pal_lld_readgroup(port, mask, offset) 0
+#define pal_lld_readgroup(port, mask, offset)                               \
+  (void)port,(void)mask,(void)offset,0
 
 /**
  * @brief   Writes a group of bits.
@@ -202,7 +203,8 @@ typedef uint32_t ioportid_t;
  *
  * @notapi
  */
-#define pal_lld_writegroup(port, mask, offset, bits) (void)bits
+#define pal_lld_writegroup(port, mask, offset, bits)                        \
+  (void)port,(void)mask,(void)offset,(void)bits
 
 /**
  * @brief   Pads group mode setup.
diff --git a/testhal/common/testbuild/Makefile b/testhal/common/testbuild/Makefile
index d92412e26..274ff455d 100644
--- a/testhal/common/testbuild/Makefile
+++ b/testhal/common/testbuild/Makefile
@@ -86,10 +86,13 @@ include $(CHIBIOS)/os/hal/templates/platform.mk
 include $(CHIBIOS)/os/hal/templates/osal/osal.mk
 
 # Define linker script file here
+PORTLD  = ${CHIBIOS}/os/common/ports/ARMCMx/compilers/GCC/ld
 LDSCRIPT= $(PORTLD)/STM32F407xG.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
+PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0.c \
+          $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c
 CSRC = $(PORTSRC) \
        $(KERNSRC) \
        $(TESTSRC) \
@@ -126,6 +129,9 @@ TCPPSRC =
 # List ASM source files here
 ASMSRC = $(PORTASM)
 
+PORTINC = ${CHIBIOS}/os/ext/CMSIS/include \
+          ${CHIBIOS}/os/ext/CMSIS/ST \
+          ${CHIBIOS}/os/common/ports/ARMCMx/devices/STM32F4xx
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
          $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
          $(CHIBIOS)/os/various
@@ -178,7 +184,7 @@ CPPWARN = -Wall -Wextra
 #
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS =
+UDEFS = -DSTM32F407xx
 
 # Define ASM defines here
 UADEFS =