fixing includes in expipi