Fixed forward-dependency errors (Now we just need to fix the C++ module system)