Fixes location listings.

Avoid nesting includes. Please. It was painful.