put headers which Mali needs. plus missing defs