STM32CubeIDE 1.8.0 / MX 6.4.0 "Broken" Folders Not as Source Folders, Header files not in folders

[Skarel]

I upgraded from STM32CubeIDE 1.7.0 to STM32CubeIDE 1.8.0 and got new problems

1. Folders which used to be marked with a 'C' are no longer marked as such.
2. Header files which used to be visible e.g. main.h FreeRTOSConfig.h lwiopts.h are no longer visible, and they are not referenced during a file search nor are they referenced by the functionality of Eclipse which highlights/greys out condtional code e.g. #ifdef LWIP_DEBUG

In other words next to useless