Some changes to #includes so everything compiles nicely on its own.