Correct name of header-file lockout macro
Start on proxy for upstream LDM-7