fdo#65108 inter-module includes <>

Change-Id: I419a1288bc6120d978fc301f127d5d29298f3ede