Make filter structure the same across the projects

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Add missing header files

Signed-off-by: Sven Strickroth <email@cs-ware.de>