Add headers to add_library call so they show up in QtCreator
Cleans up inclusions
Adds a much needed newline. (no semantic changes)