Merge "init: Adding header guard to tokenizer"