Removing inclusion and exclusion filter concept, introducing
annotations.
Adding missing headers to the two annotations