Add header include universally

@iuloshi do you mind reviewing when you get a chance? Gracias!