Moved a few definitions used in only one source file out of module.h.