do not pollute namespace in the headers with using (Closes: #500198)