More work on headers and include to make it work with external plugins