diff --git a/pkg/tinydtls/Makefile b/pkg/tinydtls/Makefile
index 6722bc15bd..1d80257018 100644
--- a/pkg/tinydtls/Makefile
+++ b/pkg/tinydtls/Makefile
@@ -11,10 +11,9 @@ CFLAGS += -Wno-implicit-fallthrough
 CFLAGS += -D_XOPEN_SOURCE=600
 
 all:
-	@cp $(PKG_BUILDDIR)/Makefile.riot $(PKG_BUILDDIR)/Makefile
-	@cp $(PKG_BUILDDIR)/aes/Makefile.riot $(PKG_BUILDDIR)/aes/Makefile
-	@cp $(PKG_BUILDDIR)/ecc/Makefile.riot $(PKG_BUILDDIR)/ecc/Makefile
-	"$(MAKE)" -C $(PKG_BUILDDIR)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(PKG_BUILDDIR)/Makefile.riot
+	"$(MAKE)" -C $(PKG_BUILDDIR)/aes -f $(PKG_BUILDDIR)/aes/Makefile.riot
+	"$(MAKE)" -C $(PKG_BUILDDIR)/ecc -f $(PKG_BUILDDIR)/ecc/Makefile.riot
 
 ifeq (llvm,$(TOOLCHAIN))
   CFLAGS += -Wno-format-nonliteral
diff --git a/pkg/tinydtls/Makefile.include b/pkg/tinydtls/Makefile.include
index 6387d19d44..8c87c0611b 100644
--- a/pkg/tinydtls/Makefile.include
+++ b/pkg/tinydtls/Makefile.include
@@ -41,14 +41,6 @@ else
   CFLAGS += -DTINYDTLS_LOG_LVL=0
 endif
 
-ifneq (,$(filter tinydtls_aes,$(USEMODULE)))
-  DIRS += $(PKG_BUILDDIR)/aes
-endif
-
-ifneq (,$(filter tinydtls_ecc,$(USEMODULE)))
-  DIRS += $(PKG_BUILDDIR)/ecc
-endif
-
 # For now contrib only contains sock_dtls adaption
 ifneq (,$(filter tinydtls_sock_dtls,$(USEMODULE)))
   DIRS += $(RIOTBASE)/pkg/tinydtls/contrib