diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/main.c b/demos/ARMCM3-STM32F100-DISCOVERY/main.c
index d638b5926..bc7e5f632 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/main.c
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/main.c
@@ -63,6 +63,8 @@ static const ADCConversionGroup adcgrpcfg = {
  * the active state is a logic one.
  */
 static PWMConfig pwmcfg = {
+  10000,                                    /* 10KHz PWM clock frequency.   */
+  10000,                                    /* PWM period 1S (in ticks).    */
   pwmpcb,
   {
     {PWM_OUTPUT_DISABLED, NULL},
@@ -71,8 +73,6 @@ static PWMConfig pwmcfg = {
     {PWM_OUTPUT_ACTIVE_HIGH, NULL}
   },
   /* HW dependent part.*/
-  PWM_COMPUTE_PSC(STM32_TIMCLK1, 10000),    /* 10KHz PWM clock frequency.   */
-  PWM_COMPUTE_ARR(10000, 1000000000),       /* PWM period 1S (in nS).       */
   0
 };
 
@@ -115,7 +115,7 @@ void adccb(ADCDriver *adcp, adcsample_t *buffer, size_t n) {
   (void) buffer; (void) n;
   /* Note, only in the ADC_COMPLETE state because the ADC driver fires an
      intermediate callback when the buffer is half full.*/
-  if (adcp->ad_state == ADC_COMPLETE) {
+  if (adcp->state == ADC_COMPLETE) {
     adcsample_t avg_ch1, avg_ch2;
 
     /* Calculates the average values from the ADC samples.*/
diff --git a/os/hal/include/gpt.h b/os/hal/include/gpt.h
index c65cd7cee..5bb385078 100644
--- a/os/hal/include/gpt.h
+++ b/os/hal/include/gpt.h
@@ -58,6 +58,18 @@ typedef enum {
   GPT_ONESHOT = 4                   /**< Active in one shot mode.           */
 } gptstate_t;
 
+/**
+ * @brief   Type of a structure representing a GPT driver.
+ */
+typedef struct GPTDriver GPTDriver;
+
+/**
+ * @brief   GPT notification callback type.
+ *
+ * @param[in] gptp      pointer to a @p GPTDriver object
+ */
+typedef void (*gptcallback_t)(GPTDriver *gptp);
+
 #include "gpt_lld.h"
 
 /*===========================================================================*/
diff --git a/os/hal/platforms/LPC11xx/gpt_lld.h b/os/hal/platforms/LPC11xx/gpt_lld.h
index a1a516d6e..1aa1e3b90 100644
--- a/os/hal/platforms/LPC11xx/gpt_lld.h
+++ b/os/hal/platforms/LPC11xx/gpt_lld.h
@@ -126,18 +126,6 @@ typedef uint32_t gptfreq_t;
  */
 typedef uint32_t gptcnt_t;
 
-/**
- * @brief   Type of a structure representing a GPT driver.
- */
-typedef struct GPTDriver GPTDriver;
-
-/**
- * @brief   GPT notification callback type.
- *
- * @param[in] gptp      pointer to a @p GPTDriver object
- */
-typedef void (*gptcallback_t)(GPTDriver *gptp);
-
 /**
  * @brief   Driver configuration structure.
  * @note    It could be empty on some architectures.
@@ -170,10 +158,6 @@ struct GPTDriver {
    */
   const GPTConfig           *config;
   /* End of the mandatory fields.*/
-  /**
-   * @brief Timer base clock.
-   */
-  uint32_t                  clock;
   /**
    * @brief Pointer to the CTxxBy registers block.
    */
diff --git a/os/hal/platforms/LPC13xx/gpt_lld.h b/os/hal/platforms/LPC13xx/gpt_lld.h
index 8ea7f375b..e4a53224b 100644
--- a/os/hal/platforms/LPC13xx/gpt_lld.h
+++ b/os/hal/platforms/LPC13xx/gpt_lld.h
@@ -126,18 +126,6 @@ typedef uint32_t gptfreq_t;
  */
 typedef uint32_t gptcnt_t;
 
-/**
- * @brief   Type of a structure representing a GPT driver.
- */
-typedef struct GPTDriver GPTDriver;
-
-/**
- * @brief   GPT notification callback type.
- *
- * @param[in] gptp      pointer to a @p GPTDriver object
- */
-typedef void (*gptcallback_t)(GPTDriver *gptp);
-
 /**
  * @brief   Driver configuration structure.
  * @note    It could be empty on some architectures.
diff --git a/os/hal/platforms/STM32/gpt_lld.h b/os/hal/platforms/STM32/gpt_lld.h
index 2d7fd13f1..cf749077f 100644
--- a/os/hal/platforms/STM32/gpt_lld.h
+++ b/os/hal/platforms/STM32/gpt_lld.h
@@ -163,18 +163,6 @@ typedef uint32_t gptfreq_t;
  */
 typedef uint16_t gptcnt_t;
 
-/**
- * @brief   Type of a structure representing a GPT driver.
- */
-typedef struct GPTDriver GPTDriver;
-
-/**
- * @brief   GPT notification callback type.
- *
- * @param[in] gptp      pointer to a @p GPTDriver object
- */
-typedef void (*gptcallback_t)(GPTDriver *gptp);
-
 /**
  * @brief   Driver configuration structure.
  * @note    It could be empty on some architectures.