move static to root, remove redundant headers

Signed-off-by: Darrel Clute <darrel@darrelclute.net>