Fix for inclusion in various situations and locations