Fiddle about with "Makefile".

  - Remove unnecessary header files from build rules; GCC silently
  	ignores them while Clang produces an error, see
  	<http://llvm.org/bugs/show_bug.cgi?id=9712> for more information.
  - Do a little refactoring and reorganising.