Tweaks to make things prettier and get it compiling.
Also checking in the output h files to make building on Windows
(eventually) easier.