Fix missing includes, broken route