Fix demo dependent library design.