Add GMP_INCLUDE_DIRS in a couple of places