Filtered out some of the invalid (dependent, private, etc.) type arguments. Included headers of templates.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>