diff --git a/sys/Makefile b/sys/Makefile
index d4db3fb425..0c34be3a1d 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -140,9 +140,6 @@ endif
 ifneq (,$(filter ng_slip,$(USEMODULE)))
     DIRS += net/link_layer/ng_slip
 endif
-ifneq (,$(filter trickle,$(USEMODULE)))
-    DIRS += trickle
-endif
 ifneq (,$(filter nhdp,$(USEMODULE)))
     DIRS += net/routing/nhdp
 endif
diff --git a/sys/include/trickle.h b/sys/include/trickle.h
index febb81ff5c..f7178b97d7 100644
--- a/sys/include/trickle.h
+++ b/sys/include/trickle.h
@@ -22,8 +22,8 @@
  * @author  Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef _TRICKLE_H
-#define _TRICKLE_H
+#ifndef TRICKLE_H
+#define TRICKLE_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -110,5 +110,5 @@ void trickle_callback(trickle_t *trickle);
 }
 #endif
 
-#endif /* _TRICKLE_H */
+#endif /* TRICKLE_H */
 /** @} */
diff --git a/sys/trickle/Makefile b/sys/trickle/Makefile
index 9f9b64b8e8..48422e909a 100644
--- a/sys/trickle/Makefile
+++ b/sys/trickle/Makefile
@@ -1,3 +1 @@
-MODULE = trickle
-
 include $(RIOTBASE)/Makefile.base