minor changes
remove redundant #if guard
reorder header file references to more logical order