Remove forward declarations from these files. You should use forward declarations, above other classes, when your not including the header file, not in the header files for the actual classes, and then only if you actually refrence the class in the declaration of the other.
If that makes sense to you...