diff --git a/configure b/configure
index 384da2b83b..65a8884d11 100755
--- a/configure
+++ b/configure
@@ -3123,6 +3123,8 @@ elif enabled armcc; then
     add_cflags -W${armcc_opt},--diag_suppress=1207
     add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition
     add_cflags -W${armcc_opt},--diag_suppress=3343 # hardfp compat
+    add_cflags -W${armcc_opt},--diag_suppress=167  # pointer sign
+    add_cflags -W${armcc_opt},--diag_suppress=513  # pointer sign
 elif enabled tms470; then
     add_cflags -pds=824 -pds=837
 elif enabled pathscale; then
@@ -3317,8 +3319,6 @@ config_files="$TMPH config.mak"
 
 cat > config.mak <<EOF
 # Automatically generated by configure - do not modify!
-ifndef FFMPEG_CONFIG_MAK
-FFMPEG_CONFIG_MAK=1
 FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
 prefix=$prefix
 LIBDIR=\$(DESTDIR)$libdir
@@ -3461,7 +3461,6 @@ SEEK_TESTS=$(print_enabled   -n _test $SEEK_TESTS)
 EOF
 
 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
-echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
 
 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
 cp_if_changed $TMPH config.h
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b6103af3c0..deff279627 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avcodec
 FFLIBS = avutil
 
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index baf9388398..f2b525694b 100644
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -377,9 +377,10 @@ static const uint8_t window_grouping[9] = {
  * Tell encoder which window types to use.
  * @see 3GPP TS26.403 5.4.1 "Blockswitching"
  */
-static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx,
-                                       const int16_t *audio, const int16_t *la,
-                                       int channel, int prev_type)
+static av_unused FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx,
+                                                 const int16_t *audio,
+                                                 const int16_t *la,
+                                                 int channel, int prev_type)
 {
     int i, j;
     int br               = ctx->avctx->bit_rate / ctx->avctx->channels;
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 60103a4864..63153bb18b 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME    = avdevice
 FFLIBS  = avformat avcodec avutil
 
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 461df37a10..93f852d9d8 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avfilter
 FFLIBS = avutil
 FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e5ec44bfb6..d11cd7eca7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avformat
 FFLIBS = avcodec avutil
 
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 0d8f01dd8d..304b288851 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avutil
 
 HEADERS = adler32.h                                                     \
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index bd0b71e3d4..7b359709dc 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = postproc
 FFLIBS = avutil
 
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 8bb06baae2..b2914113c0 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = swscale
 FFLIBS = avutil
 
diff --git a/subdir.mak b/subdir.mak
index 8b3807378f..f8473da596 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -39,15 +39,11 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
 	$(SLIB_CREATE_DEF_CMD)
 	$$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
-ifdef SUBDIR
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
-endif
-
 clean::
 	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
 	    $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \