fdo#65108 inter-module includes <>

Change-Id: Iac3debc892d420ab50c1b38446334d30488648dc