main
display: rename access_str to access_mode in vgdisplay_full
headers: locking: add includes for locking_types.h cleanup