More cleanup regarding headers, declarations, etc.#13

pprindeville wants to merge 1 commit intophokz:masterphokz/pwauth:masterfrom

pprindeville:const-stringspprindeville/pwauth:const-stringsCopy head branch name to clipboard