Really fixed the #include issue this time (I think).