Move include dir spec to Makefile
Fix misc cppcheck warnings.