Separate head into include, clean up some details.