diff --git a/apps/apps.make b/apps/apps.make
index 78ae121247..3717c5bd34 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -15,9 +15,9 @@ SRC += $(call preprocess, $(APPSDIR)/SOURCES)
 # to genlang and thus (translated) phrases can be used based on those names.
 # button.h is included for the HAS_BUTTON_HOLD define.
 #
-# Kludge: depends on errno.o only to depend on config-*.h ...
+# Kludge: depends on ctype.o only to depend on config-*.h ...
 #
-features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/errno.o
+features $(BUILDDIR)/apps/features $(BUILDDIR)/apps/genlang-features: $(APPSDIR)/features.txt $(BUILDDIR)/firmware/common/ctype.o
 	$(SILENT)mkdir -p $(BUILDDIR)/apps
 	$(SILENT)mkdir -p $(BUILDDIR)/lang
 	$(call PRINTS,PP $(<F))
diff --git a/apps/lang/lang.make b/apps/lang/lang.make
index f7366c9225..1b006a7468 100644
--- a/apps/lang/lang.make
+++ b/apps/lang/lang.make
@@ -32,6 +32,8 @@ $(BUILDDIR)/lang/lang_core.o: $(APPSDIR)/lang/$(LANGUAGE).lang $(BUILDDIR)/apps/
 		perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $<
 	$(call PRINTS,CC lang_core.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang/lang_core.c -o $@
 
+$(BUILDDIR)/lang/lang.h: $(BUILDDIR)/lang/lang_core.o
+
 $(BUILDDIR)/%.lng : $(ROOTDIR)/%.lang $(BUILDDIR)/apps/genlang-features
 	$(call PRINTS,GENLANG $(subst $(ROOTDIR)/,,$<))
 	$(SILENT)mkdir -p $(dir $@)
diff --git a/apps/plugins/chessbox/chessbox.make b/apps/plugins/chessbox/chessbox.make
index 43df3ab264..7611b5bb1a 100644
--- a/apps/plugins/chessbox/chessbox.make
+++ b/apps/plugins/chessbox/chessbox.make
@@ -53,6 +53,6 @@ $(CHESSBOX_OBJDIR)/chessbox.ovl: $(CHESSBOX_OBJ) $(CHESSBOX_OUTLDS)
 	$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
 
 # special pattern rule for compiling chessbox with extra flags
-$(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(CHESSBOX_SRCDIR)/chessbox.make
+$(CHESSBOX_OBJDIR)/%.o: $(CHESSBOX_SRCDIR)/%.c $(CHESSBOX_SRCDIR)/chessbox.make
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(CHESSBOXFLAGS) -c $< -o $@
diff --git a/apps/plugins/pacbox/pacbox.make b/apps/plugins/pacbox/pacbox.make
index 83e19f8051..ae0147dead 100644
--- a/apps/plugins/pacbox/pacbox.make
+++ b/apps/plugins/pacbox/pacbox.make
@@ -22,6 +22,6 @@ PACBOXFLAGS = $(filter-out -O%,$(PLUGINFLAGS)) -O2
 
 $(PACBOXBUILDDIR)/pacbox.rock: $(PACBOX_OBJ)
 
-$(PACBOXBUILDDIR)/%.o: $(PACBOXSRCDIR)/%.c $(PLUGINBITMAPLIB) $(PACBOXSRCDIR)/pacbox.make
+$(PACBOXBUILDDIR)/%.o: $(PACBOXSRCDIR)/%.c $(PACBOXSRCDIR)/pacbox.make
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PACBOXFLAGS) -c $< -o $@
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make
index c4bc5d2fa9..75af9c06c0 100644
--- a/apps/plugins/pdbox/pdbox.make
+++ b/apps/plugins/pdbox/pdbox.make
@@ -26,7 +26,6 @@ PDBOXFLAGS = $(PLUGINFLAGS) \
              -I$(PDBOXSRCDIR)/TLSF-2.4.4/src
 
 # Compile PDBox with extra flags (adapted from ZXBox)
-$(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PLUGINBITMAPLIB) $(PDBOXSRCDIR)/pdbox.make
+$(PDBOXBUILDDIR)/%.o: $(PDBOXSRCDIR)/%.c $(PDBOXSRCDIR)/pdbox.make
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PDBOXFLAGS) -c $< -o $@
-
diff --git a/apps/plugins/pictureflow/pictureflow.make b/apps/plugins/pictureflow/pictureflow.make
index c1fb1f3957..28ad2aa39e 100644
--- a/apps/plugins/pictureflow/pictureflow.make
+++ b/apps/plugins/pictureflow/pictureflow.make
@@ -53,6 +53,6 @@ $(PICTUREFLOW_OBJDIR)/pictureflow.ovl: $(PICTUREFLOW_OBJ) $(PICTUREFLOW_OUTLDS)
 	$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
 
 # special pattern rule for compiling pictureflow with extra flags
-$(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(PICTUREFLOW_SRCDIR)/pictureflow.make
+$(PICTUREFLOW_OBJDIR)/%.o: $(PICTUREFLOW_SRCDIR)/%.c $(PICTUREFLOW_SRCDIR)/pictureflow.make
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PICTUREFLOWFLAGS) -c $< -o $@
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 4c20a84835..62640ab630 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -76,7 +76,7 @@ $(BUILDDIR)/apps/plugins/lib/%.o: $(ROOTDIR)/apps/plugins/lib/%.c
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -ffunction-sections -fdata-sections -c $< -o $@
 
 # special pattern rule for compiling plugins with extra flags
-$(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c $(PLUGINBITMAPLIB)
+$(BUILDDIR)/apps/plugins/%.o: $(ROOTDIR)/apps/plugins/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(PLUGINFLAGS) -c $< -o $@
 
diff --git a/apps/plugins/zxbox/zxbox.make b/apps/plugins/zxbox/zxbox.make
index 24f8e91f20..04c85407e1 100644
--- a/apps/plugins/zxbox/zxbox.make
+++ b/apps/plugins/zxbox/zxbox.make
@@ -48,6 +48,6 @@ $(ZXBOX_OBJDIR)/zxbox.ovl: $(ZXBOX_OBJ) $(ZXBOX_OUTLDS)
 	$(call PRINTS,LD $(@F))$(OC) -O binary $(basename $@).elf $@
 
 # special pattern rule for compiling zxbox with extra flags
-$(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(PLUGINBITMAPLIB) $(ZXBOX_SRCDIR)/zxbox.make
+$(ZXBOX_OBJDIR)/%.o: $(ZXBOX_SRCDIR)/%.c $(ZXBOX_SRCDIR)/zxbox.make
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(ZXBOXFLAGS) -c $< -o $@
diff --git a/tools/functions.make b/tools/functions.make
index 045354da66..748263359e 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -34,7 +34,7 @@ c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1))))
 # to a file $(1)_, to be later renamed to $(1).
 mkdepfile = $(shell \
 	perl $(TOOLSDIR)/multigcc.pl $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h -- $(2) | \
-	sed -e "s: lang.h: lang/lang_core.o:" \
+	sed -e "s: lang.h: lang/lang.h:" \
 	-e 's:_asmdefs.o:_asmdefs.h:' \
 	-e "s: max_language_size.h: lang/max_language_size.h:" | \
 	$(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) \
diff --git a/tools/make.inc b/tools/make.inc
index 601b892bfc..5521612f62 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -45,7 +45,7 @@ $(DEPFILE): $(SOURCES)
 	        rm $$del; \
 	        del=""; \
 	    fi \
-	done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang/lang_core.o:" \
+	done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang/lang.h:" \
 	-e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" \
 	-e "s:[^[:space:]]*max_language_size.h:$(BUILDDIR)/max_language_size.h:" \
 	-e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \