Updated includes file
A fresh look at the API, and fixing a whole bunch of bothersome things.