diff --git a/cpu/cc2538/cpu.c b/cpu/cc2538/cpu.c
index dab8edf890..87092a1df1 100644
--- a/cpu/cc2538/cpu.c
+++ b/cpu/cc2538/cpu.c
@@ -18,7 +18,6 @@
  */
 
 #include "cpu.h"
-#include "sys-ctrl.h"
 
 #define BIT(n)          ( 1UL << (n) )
 
diff --git a/cpu/cc2538/include/cpu-conf.h b/cpu/cc2538/include/cpu-conf.h
index 6921050956..13edbfdd57 100644
--- a/cpu/cc2538/include/cpu-conf.h
+++ b/cpu/cc2538/include/cpu-conf.h
@@ -20,6 +20,13 @@
 #define __CPU_CONF_H
 
 #include "cc2538.h"
+#include "cc2538-gpio.h"
+#include "cc2538-uart.h"
+#include "gptimer.h"
+#include "ioc.h"
+#include "soc-adc.h"
+#include "rfcore.h"
+#include "sys-ctrl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpu/cc2538/include/hwtimer_cpu.h b/cpu/cc2538/include/hwtimer_cpu.h
index aacf01325d..e27ab6c2cf 100644
--- a/cpu/cc2538/include/hwtimer_cpu.h
+++ b/cpu/cc2538/include/hwtimer_cpu.h
@@ -19,8 +19,6 @@
 #ifndef __HWTIMER_CPU_H
 #define __HWTIMER_CPU_H
 
-#include "gptimer.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,7 +27,7 @@ extern "C" {
  * @name Hardware timer configuration
  * @{
  */
-#define HWTIMER_MAXTIMERS   NUM_CHANNELS_PER_GPTIMER /**< Number of hwtimers */
+#define HWTIMER_MAXTIMERS   2               /**< Number of hwtimers */
 #define HWTIMER_SPEED       1000000         /**< The hardware timer runs at 1MHz */
 #define HWTIMER_MAXTICKS    0xFFFFFFFF      /**< 32-bit timer */
 /** @} */
diff --git a/cpu/cc2538/periph/cpuid.c b/cpu/cc2538/periph/cpuid.c
index aba4bbaa46..5773703645 100644
--- a/cpu/cc2538/periph/cpuid.c
+++ b/cpu/cc2538/periph/cpuid.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "cpu.h"
-#include "cpu-conf.h"
 #include "periph/cpuid.h"
 
 #define BITS_PER_BYTE 8
diff --git a/cpu/cc2538/periph/gpio.c b/cpu/cc2538/periph/gpio.c
index 0820aeba26..74f7a7df7f 100644
--- a/cpu/cc2538/periph/gpio.c
+++ b/cpu/cc2538/periph/gpio.c
@@ -23,9 +23,6 @@
 #include "cpu.h"
 #include "sched.h"
 #include "thread.h"
-
-#include "cc2538-gpio.h"
-#include "ioc.h"
 #include "periph/gpio.h"
 #include "periph_conf.h"
 
diff --git a/cpu/cc2538/periph/random.c b/cpu/cc2538/periph/random.c
index e44448750d..795b5578f7 100644
--- a/cpu/cc2538/periph/random.c
+++ b/cpu/cc2538/periph/random.c
@@ -21,9 +21,6 @@
 #include <stdint.h>
 
 #include "cpu.h"
-#include "rfcore.h"
-#include "soc-adc.h"
-
 #include "periph_conf.h"
 #include "periph/random.h"
 
diff --git a/cpu/cc2538/periph/timer.c b/cpu/cc2538/periph/timer.c
index 11421f3729..2a9a379ad9 100644
--- a/cpu/cc2538/periph/timer.c
+++ b/cpu/cc2538/periph/timer.c
@@ -25,9 +25,6 @@
 #include "cpu.h"
 #include "sched.h"
 #include "thread.h"
-
-#include "gptimer.h"
-
 #include "periph/timer.h"
 #include "periph_conf.h"
 
diff --git a/cpu/cc2538/periph/uart.c b/cpu/cc2538/periph/uart.c
index 3404050093..b0b1ac2f98 100644
--- a/cpu/cc2538/periph/uart.c
+++ b/cpu/cc2538/periph/uart.c
@@ -24,12 +24,6 @@
 #include "cpu.h"
 #include "sched.h"
 #include "thread.h"
-
-#include "cc2538-gpio.h"
-#include "cc2538-uart.h"
-#include "ioc.h"
-#include "sys-ctrl.h"
-
 #include "periph/uart.h"
 #include "periph_conf.h"