Proper collapse into single header file

Looks like I forgot I was working in another branch. Let's get those changes in.