* switch to CriticalSectionLocker * that's just about all * clean up last usage * include hpp for sim * need the cpp wrappers in the makefile too * include dir * include