Bug 918105 - Minimize the #includes in xpcom/ds; r=bsmedberg