And add missing header in one file
This is actually a domain library and thus should be put into the lib/domain/ folder.
