Fix #includes of i*.h => Instructions.h as per PR403: