Fix includes and appcompv7 req