Expanded includes

I added some more include functionality on top of what @keymon provided (which I found extremely useful).