put headers which Mali needs back. plus missing defs