this completes the first pass of header changes Signed-off-by: Brian S. Stephan <bss@incorporeal.org>