Fixed broken dependencies, should build properly now under Xcode 5, 6, 6.1