- Added include detection. (Very naive right now.)