Merge "Fix some dependencies for openbox build."