diff --git a/makefile b/makefile
index 9e0f1b6e9c9..d83c746d365 100644
--- a/makefile
+++ b/makefile
@@ -677,10 +677,8 @@ GEN_FOLDERS :=  \
 	$(GENDIR) \
 	$(GENDIR)/$(TARGET)/$(SUBTARGET) \
 	$(GENDIR)/emu/layout/ \
-	$(GENDIR)/mame/layout/ \
-	$(GENDIR)/mess/layout/ \
+	$(GENDIR)/$(TARGET)/layout/ \
 	$(GENDIR)/mess/drivers/ \
-	$(GENDIR)/ldplayer/layout/ \
 	$(GENDIR)/emu/cpu/arcompact/ \
 	$(GENDIR)/emu/cpu/h8/ \
 	$(GENDIR)/emu/cpu/mcs96/ \