This allows us to use them in vcl as well without introducing dependency
problems.

Change-Id: Ib97af2d559902f1a6b47f9255bb0426411670647