Fix build problems on XOP systems