make: improved clean and mrproper commands (also renamed some variables in includes_general)