Removed dependency on non-included code.