Modified makefiles to remove compilation errors.