diff -Nurd -x'*~' centericq-4.21.0.orig/libjabber-0.1/libxode.h centericq-4.21.0/libjabber-0.1/libxode.h
--- centericq-4.21.0.orig/libjabber-0.1/libxode.h	2005-02-09 19:36:26.000000000 -0500
+++ centericq-4.21.0/libjabber-0.1/libxode.h	2006-08-09 01:45:07.000000000 -0400
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff -Nurd -x'*~' centericq-4.21.0.orig/libmsn-0.1/Makefile.am centericq-4.21.0/libmsn-0.1/Makefile.am
--- centericq-4.21.0.orig/libmsn-0.1/Makefile.am	2005-09-02 10:45:58.000000000 -0400
+++ centericq-4.21.0/libmsn-0.1/Makefile.am	2006-08-09 01:43:47.000000000 -0400
@@ -4,15 +4,15 @@
 CPPFLAGS = 
 noinst_LIBRARIES = liblibmsn.a
 AUTOMAKE_OPTIONS = foreign
-liblibmsn_a_SOURCES = 
 
 if BUILD_MSN
 
+liblibmsn_a_SOURCES = 
 liblibmsn_a_LIBADD =  msn/authdata.o msn/buddy.o msn/connection.o msn/filetransfer.o msn/invitation.o msn/message.o msn/notificationserver.o msn/passport.o msn/switchboardserver.o msn/util.o
 
 else
 
-liblibmsn_a_LIBADD = dummy.o
+liblibmsn_a_SOURCES = dummy.c
 
 dummy.c:
 	touch dummy.c
diff -Nurd -x'*~' centericq-4.21.0.orig/src/Makefile.am centericq-4.21.0/src/Makefile.am
--- centericq-4.21.0.orig/src/Makefile.am	2005-09-02 10:45:50.000000000 -0400
+++ centericq-4.21.0/src/Makefile.am	2006-08-09 03:34:25.000000000 -0400
@@ -1,8 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/firetalk-0.1/../connwrap -I$(top_srcdir)/firetalk-0.1/../connwrap-0.1 -I$(top_srcdir)/kkconsui-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkconsui-0.1/../kkstrtext -I$(top_srcdir)/kkconsui-0.1/../kkstrtext-0.1 -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/kksystr-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/kksystr-0.1/../kkstrtext -I$(top_srcdir)/kksystr-0.1/../kkstrtext-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libjabber-0.1/../connwrap -I$(top_srcdir)/libjabber-0.1/../connwrap-0.1 -I$(top_srcdir)/libmsn-0.1 -I$(top_srcdir)/libmsn-0.1/../connwrap -I$(top_srcdir)/libmsn-0.1/../connwrap-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/libyahoo2-0.1/../connwrap -I$(top_srcdir)/libyahoo2-0.1/../connwrap-0.1 -I$(top_srcdir)/intl
 bin_PROGRAMS = centericq
 centericq_SOURCES = centericq.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc icqface.cc centermain.cc icqgroup.cc
-centericq_LDFLAGS = -L$(top_srcdir)/connwrap-0.1 -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/libgadu-0.1 -L$(top_srcdir)/libicq2000-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/libmsn-0.1 -L$(top_srcdir)/libyahoo2-0.1
-centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lconnwrap -lfiretalk -lkkconsui -lkkstrtext -lkksystr -llibgadu -llibicq2000 -llibjabber -llibmsn -llibyahoo2 @INTLLIBS@
+centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  $(top_srcdir)/connwrap-0.1/libconnwrap.a $(top_srcdir)/firetalk-0.1/libfiretalk.a $(top_srcdir)/kkconsui-0.1/libkkconsui.a $(top_srcdir)/kkstrtext-0.1/libkkstrtext.a $(top_srcdir)/kksystr-0.1/libkksystr.a $(top_srcdir)/libgadu-0.1/liblibgadu.a $(top_srcdir)/libicq2000-0.1/liblibicq2000.a $(top_srcdir)/libjabber-0.1/liblibjabber.a $(top_srcdir)/libmsn-0.1/liblibmsn.a $(top_srcdir)/libyahoo2-0.1/liblibyahoo2.a @INTLLIBS@
 SUBDIRS = hooks
 EXTRA_DIST = centericq.cc icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc impgp.cc icqface.cc centermain.cc icqgroup.cc icqmlist.h imcontroller.h icqcommon.h icqcontacts.h centericq.h icqgroup.h imcontact.h accountmanager.h eventmanager.h imevents.h icqcontact.h imlogger.h icqconf.h impgp.h icqface.h icqgroups.h icqhist.h imexternal.h
 AUTOMAKE_OPTIONS = foreign