No need to export these classes, just move them to the right library.
Silence some compiler warnings.