diff --git a/Makefile.dep b/Makefile.dep
index b17ed8e60b5c2a13acf2fda25e7eb74bdf885f86..7a39984d2b02d9b4c4fb765b27646c77cc083609 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -358,3 +358,11 @@ endif
 ifneq (,$(filter sht11,$(USEMODULE)))
     USEMODULE += xtimer
 endif
+
+ifneq (,$(filter srf02,$(USEMODULE)))
+    USEMODULE += xtimer
+endif
+
+ifneq (,$(filter pcd8544,$(USEMODULE)))
+    USEMODULE += xtimer
+endif
diff --git a/drivers/pcd8544/pcd8544.c b/drivers/pcd8544/pcd8544.c
index 054cabd87be825473c725b3e2a3f588ad12ecf0c..65f7ef97f3eb8d90da946317801745bc3f0c1b05 100644
--- a/drivers/pcd8544/pcd8544.c
+++ b/drivers/pcd8544/pcd8544.c
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "hwtimer.h"
+#include "xtimer.h"
 #include "periph/spi.h"
 #include "periph/gpio.h"
 #include "pcd8544.h"
@@ -243,7 +243,7 @@ int pcd8544_init(pcd8544_t *dev, spi_t spi, gpio_t cs, gpio_t reset, gpio_t mode
     DEBUG("done initializing SPI master\n");
     /* reset display */
     gpio_clear(reset);
-    hwtimer_wait(RESET_DELAY);
+    xtimer_usleep(RESET_DELAY);
     gpio_set(reset);
 
     /* clear display memory */