This required a somewhat more substantial include reshuffling. Some typedefs have been moved to gtkiconfactory.h and to gtksettings.h.
Matthias Clasen