updates to headers and include stuff