CL: Drop serial dependency between files

Define dependencies between source files accurately.
Merge branch 'cl-dependency'

* cl-dependency:
  CL: Drop serial dependency between files