Fix build issues with headers, which I discovered by actually using them.