more cleanup, still needs resource.h cleanup

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