NIOS II v14.1 Unresolved System Includes

I have several NIOS II C projects that after upgrading to 14.1 will not compile. All the system include files are marked "unresolved inclusion".

I noticed when I go into the properties -> C/C++ General -> Paths and Symbols, in the Languages column there are two entries for each

language. There are two "GNU C" entries but the first entry has no include directories. The second GNU C entry seems to have the correct

include directories, but I think it is getting ignored and the first blank entry is being used instead.

I can make it work if I manually add the same directories to the blank GNU C entry, but that is a tedious task to do for every NIOS project.

Has anyone else had this problem and found a more elegant solution?