Neatened it up a little

I like this solution because it allows consolidation of all the
includes in the same way.