Fixing the include statements so that it is guaranteed to maintain backwards compatibility.