Add export.h to build and other stuff
Remove trailing whitespace