Fixing some makefiles and headers