Fix includes and insert()