diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/cmsis_nvic.h
index 9642914dd3..613cb2e45f 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/cmsis_nvic.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/cmsis_nvic.h
@@ -37,7 +37,7 @@
 // MCU Peripherals: 102 vectors = 408 bytes from 0x40 to 0x1D7
 // Total: 118 vectors = 472 bytes (0x1D8) to be reserved in RAM
 #define NVIC_NUM_VECTORS      118
-#define NVIC_USER_IRQ_OFFSET  16
+#define NVIC_RAM_VECTOR_ADDRESS   (0x20000000)  // Vectors positioned at start of RAM
 
 
 #endif
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/hal_tick.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/hal_tick.h
index 6da89992a8..e428968d4a 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/hal_tick.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/device/hal_tick.h
@@ -40,14 +40,15 @@
 #endif
 
 #include "stm32f4xx.h"
+#include "stm32f4xx_ll_tim.h"
 #include "cmsis_nvic.h"
    
 #define TIM_MST      TIM5
 #define TIM_MST_IRQ  TIM5_IRQn
-#define TIM_MST_RCC  __TIM5_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM5_CLK_ENABLE()
 
-#define TIM_MST_RESET_ON   __TIM5_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM5_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM5_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM5_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer