fixed some really annoying forward declaration errors, goood riddance.