Various reorganisations to make sure that the compiler flags are not lost

Lots of compilers warnings to still resolve


Former-commit-id: 63fb4ac0f7e6f2885a11edc101108edc169f5c76