Adjust makefile for real, some files have been moved or renamed
Fix gcc 4.7.1 warnings
Fix warnings