***************
*** 395,403 ****
  	d->cp = 0;
  	d->userCounter = 0;
  
- #ifdef AVATARS
  	d->avatarFactory = new AvatarFactory(this);
- #endif
  
  	d->blockTransportPopupList = new BlockTransportPopupList();
  
--- 395,401 ----
  	d->cp = 0;
  	d->userCounter = 0;
  
  	d->avatarFactory = new AvatarFactory(this);
  
  	d->blockTransportPopupList = new BlockTransportPopupList();
  
***************
*** 423,431 ****
  	d->self.setSubscription(Subscription::Both);
  	d->nickFromVCard = false;
  
- #ifdef AVATARS
  	d->self.setAvatarFactory(d->avatarFactory);
- #endif
  
  	d->messageQueue.setAutoDelete(true);
  	d->ppdlg = 0;
--- 421,427 ----
  	d->self.setSubscription(Subscription::Both);
  	d->nickFromVCard = false;
  
  	d->self.setAvatarFactory(d->avatarFactory);
  
  	d->messageQueue.setAutoDelete(true);
  	d->ppdlg = 0;
***************
*** 1298,1306 ****
  		// we don't have it at all, so add it
  		u = new UserListItem;
  		u->setRosterItem(r);
- #ifdef AVATARS
  		u->setAvatarFactory(d->avatarFactory);
- #endif
  		d->userList.append(u);
  	}
  	u->setInList(true);
--- 1294,1300 ----
  		// we don't have it at all, so add it
  		u = new UserListItem;
  		u->setRosterItem(r);
  		u->setAvatarFactory(d->avatarFactory);
  		d->userList.append(u);
  	}
  	u->setInList(true);
***************
*** 2545,2553 ****
  
  void PsiAccount::actionRemove(const Jid &j)
  {
- #ifdef AVATARS
  	avatarFactory()->removeManualAvatar(j);
- #endif
  	dj_remove(j);
  }
  
--- 2539,2545 ----
  
  void PsiAccount::actionRemove(const Jid &j)
  {
  	avatarFactory()->removeManualAvatar(j);
  	dj_remove(j);
  }
  
***************
*** 3393,3401 ****
  		u = new UserListItem;
  		u->setJid(e->jid());
  		u->setInList(false);
- #ifdef AVATARS
  		u->setAvatarFactory(d->avatarFactory);
- #endif
  
  		// is it a private groupchat?
  		Jid j = u->jid();
--- 3385,3391 ----
  		u = new UserListItem;
  		u->setJid(e->jid());
  		u->setInList(false);
  		u->setAvatarFactory(d->avatarFactory);
  
  		// is it a private groupchat?
  		Jid j = u->jid();
***************
*** 4225,4233 ****
  	u->setInList(false);
  	u->setName(j.resource());
  	u->setPrivate(true);
- #ifdef AVATARS
  	u->setAvatarFactory(d->avatarFactory);
- #endif
  
  	// make a resource so the contact appears online
  	UserResource ur;
--- 4215,4221 ----
  	u->setInList(false);
  	u->setName(j.resource());
  	u->setPrivate(true);
  	u->setAvatarFactory(d->avatarFactory);
  
  	// make a resource so the contact appears online
  	UserResource ur;
***************
*** 4252,4260 ****
  	u->setInList(false);
  	u->setName(j.resource());
  	u->setPrivate(true);
- #ifdef AVATARS
  	u->setAvatarFactory(d->avatarFactory);
- #endif
  
  	// make a resource so the contact appears online
  	UserResource ur;
--- 4240,4246 ----
  	u->setInList(false);
  	u->setName(j.resource());
  	u->setPrivate(true);
  	u->setAvatarFactory(d->avatarFactory);
  
  	// make a resource so the contact appears online
  	UserResource ur;