Fixed make defs so that they actually compile for bulldozer