Fixed missing include + simplify some stuff.

Thanks to Tasiro once again :)