Add missing build dependencies

Add missing build dependencies.  Without these dependencies edmCheckClassVersion can return the wrong checksum.  Also, one unnecesary build dependency was removed.
This problem is being fixed in 7_4_X with a different pull request.
Please merge this request in time for the next IB if possible.