file guards changes into pragmas
added underscore to private names