Include dir handling

@tfoote Please review.