add missing pragma once, cleanup include headers

add missing pragma once, cleanup include headers #1047