Should work now.
Also fix some issues with header files: - Added ifndef .. define .. endif blocks to be sure headers are not including twice. - DO not include WM stuff in headers, use anonymous structure names instead.
Was missed some scons rules after recent collada changes