Header refactoring: break out qr.h dependencies
3 files changed