Introduced dependencies where needed. Master now builds.