removed unused functions
fixed include guard names