diff --git a/cores/libretro-imageviewer/Makefile b/cores/libretro-imageviewer/Makefile
index 2699b3c5a5..9916b3eeee 100644
--- a/cores/libretro-imageviewer/Makefile
+++ b/cores/libretro-imageviewer/Makefile
@@ -1,20 +1,20 @@
 image_core.so: image_core.c
 	gcc \
 		-g \
+		-DHAVE_STB_IMAGE \
 		image_core.c \
-		../../libretro-common/file/file_path.c \
-		../../libretro-common/lists/dir_list.c \
-		../../libretro-common/compat/compat_strl.c \
+		-I../../libretro-common/include/ \
+		-I../../deps/stb/ \
 		../../libretro-common/compat/compat_strcasestr.c \
-		../../libretro-common/lists/string_list.c \
+		../../libretro-common/compat/compat_strl.c \
+		../../libretro-common/file/file_path.c \
 		../../libretro-common/file/retro_dirent.c \
+		../../libretro-common/lists/dir_list.c \
+		../../libretro-common/lists/string_list.c \
 		../../libretro-common/streams/file_stream.c \
 		../../libretro-common/vfs/vfs_implementation.c \
-		-o image_core.so \
-		-DHAVE_STB_IMAGE \
-		-I ../../libretro-common/include/ \
-		-I../../deps/stb \
-		-Wl,--no-undefined \
 		-shared \
 		-fPIC \
-		-lm
+		-Wl,--no-undefined \
+		-lm \
+		-o image_core.so
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 991e2768a5..29462ea91e 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -587,7 +587,6 @@ bool video_shader_resolve_parameters(config_file_t *conf,
 
       free(line);
       intfstream_close(file);
-      free(file);
    }
 
    if (conf && !video_shader_resolve_current_parameters(conf, shader))