diff --git a/Makefile b/Makefile
index f8036e2..898efc9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,25 +20,25 @@ INCLUDE	+= -I./lib/libco
 INCLUDE	+= -I./lib/miniz
 
 PRJ = MiSTer
-SRC = $(wildcard *.c)
-SRC2 = $(wildcard *.cpp)
-IMG = $(wildcard *.png)
-MINIMIG_SRC	= $(wildcard ./support/minimig/*.cpp)
-SHARPMZ_SRC	= $(wildcard ./support/sharpmz/*.cpp)
-ARCHIE_SRC	= $(wildcard ./support/archie/*.cpp)
-ST_SRC	= $(wildcard ./support/st/*.cpp)
-X86_SRC	= $(wildcard ./support/x86/*.cpp)
-SNES_SRC	= $(wildcard ./support/snes/*.cpp)
-LIBCO_SRC	= lib/libco/arm.c
-LODEPNG_SRC	= lib/lodepng/lodepng.cpp
-MINIZ_SRC	= $(wildcard ./lib/miniz/*.c)
+C_SRC =   $(wildcard *.c) \
+          $(wildcard ./lib/miniz/*.c) \
+          lib/libco/arm.c
+
+CPP_SRC = $(wildcard *.cpp) \
+          $(wildcard ./support/minimig/*.cpp) \
+          $(wildcard ./support/sharpmz/*.cpp) \
+          $(wildcard ./support/archie/*.cpp) \
+          $(wildcard ./support/st/*.cpp) \
+          $(wildcard ./support/x86/*.cpp) \
+          $(wildcard ./support/snes/*.cpp) \
+          lib/lodepng/lodepng.cpp
+
+IMG =     $(wildcard *.png)
 
 IMLIB2_LIB  = -Llib/imlib2 -lfreetype -lbz2 -lpng16 -lz -lImlib2
 
-VPATH	= ./:./support/minimig:./support/sharpmz:./support/archie:./support/st:./support/x86:./support/snes
-
-OBJ	= $(SRC:.c=.c.o) $(SRC2:.cpp=.cpp.o) $(IMG:.png=.png.o) $(MINIMIG_SRC:.cpp=.cpp.o) $(SHARPMZ_SRC:.cpp=.cpp.o) $(ARCHIE_SRC:.cpp=.cpp.o) $(ST_SRC:.cpp=.cpp.o) $(X86_SRC:.cpp=.cpp.o) $(SNES_SRC:.cpp=.cpp.o) $(LIBCO_SRC:.c=.c.o) $(MINIZ_SRC:.c=.c.o) $(LODEPNG_SRC:.cpp=.cpp.o)
-DEP	= $(SRC:.c=.cpp.d) $(SRC2:.cpp=.cpp.d) $(MINIMIG_SRC:.cpp=.cpp.d) $(SHARPMZ_SRC:.cpp=.cpp.d) $(ARCHIE_SRC:.cpp=.cpp.d) $(ST_SRC:.cpp=.cpp.d) $(X86_SRC:.cpp=.cpp.d) $(SNES_SRC:.cpp=.cpp.d) $(LIBCO_SRC:.c=.c.d) $(MINIZ_SRC:.c=.c.d) $(LODEPNG_SRC:.cpp=.cpp.d)
+OBJ	= $(C_SRC:.c=.c.o) $(CPP_SRC:.cpp=.cpp.o) $(IMG:.png=.png.o)
+DEP	= $(C_SRC:.c=.c.d) $(CPP_SRC:.cpp=.cpp.d)
 
 DFLAGS	= $(INCLUDE) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DVDATE=\"`date +"%y%m%d"`\"
 CFLAGS	= $(DFLAGS) -Wall -Wextra -Wno-strict-aliasing -c -O3