diff --git a/conf/Makefile.am b/conf/Makefile.am
deleted file mode 100644
index 75b3c9f..0000000
--- a/conf/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-if COND_BNETD
-bnetd_confs = bnetd.conf ad.conf anongame_infos.conf address_translation.conf \
-	autoupdate.conf bnalias.conf bnban.conf bnetd_default_user.cdb \
-	bnetd_default_user.plain bnissue.txt bnmaps.conf \
-	bnmotd.txt bnxpcalc.conf bnxplevel.conf channel.conf \
-	command_groups.conf realm.conf sql_DB_layout.conf \
-	supportfile.conf topics.conf tournament.conf versioncheck.conf \
-	sql_DB_layout2.conf
-bnetd_extras = bnetd.conf.in bnetd.conf.win32 ad.conf.in anongame_infos.conf.in \
-	address_translation.conf.in autoupdate.conf.in bnalias.conf.in \
-	bnban.conf.in bnetd_default_user.plain.in bnissue.txt.in \
-	bnmaps.conf.in bnxpcalc.conf.in bnxplevel.conf.in \
-	channel.conf.in command_groups.conf.in realm.conf.in \
-	sql_DB_layout.conf.in supportfile.conf.in topics.conf.in \
-	tournament.conf.in versioncheck.conf.in sql_DB_layout2.conf.in
-else
-bnetd_confs =
-bnetd_extras =
-endif
-
-if COND_D2CS
-d2cs_confs = d2cs.conf address_translation.conf d2server.ini
-d2cs_extras = d2cs.conf.in d2cs.conf.win32 address_translation.conf.in
-else
-d2cs_confs =
-d2cs_extras =
-endif
-
-if COND_D2DBS
-d2dbs_confs = d2dbs.conf
-d2dbs_extras = d2dbs.conf.in d2dbs.conf.win32
-else
-d2dbs_confs =
-d2dbs_extras =
-endif
-
-dist_sysconf_DATA = $(bnetd_confs) $(d2cs_confs) $(d2dbs_confs)
-
-EXTRA_DIST = $(bnetd_extras) $(d2cs_extras) $(d2dbs_extras)
-
-%.conf : %.conf.in $(top_builddir)/config.status
-	$(CP) $< $@
-
-%.txt : %.txt.in $(top_builddir)/config.status
-	$(CP) $< $@
-
-bnetd_default_user.plain : bnetd_default_user.plain.in $(top_builddir)/config.status
-	$(CP) $< $@
-
-bnetd.conf:bnetd.conf.in $(top_builddir)/config.status
-	$(SED) -e "s,\$${LOCALSTATEDIR}/,$(localstatedir)/,g" -e "s,\$${SYSCONFDIR}/,$(sysconfdir)/,g" $(top_srcdir)/conf/bnetd.conf.in > $@
-
-d2cs.conf:d2cs.conf.in $(top_builddir)/config.status
-	$(SED) -e "s,\$${LOCALSTATEDIR}/,$(localstatedir)/,g" -e "s,\$${SYSCONFDIR}/,$(sysconfdir)/,g" $(top_srcdir)/conf/d2cs.conf.in > $@
-
-d2dbs.conf:d2dbs.conf.in $(top_builddir)/config.status
-	$(SED) -e "s,\$${LOCALSTATEDIR}/,$(localstatedir)/,g" -e "s,\$${SYSCONFDIR}/,$(sysconfdir)/,g" $(top_srcdir)/conf/d2dbs.conf.in > $@
-
-CONFIG_CLEAN_FILES = bnetd.conf d2cs.conf d2dbs.conf ad.conf \
-	anongame_infos.conf address_translation.conf autoupdate.conf \
-	bnalias.conf bnban.conf bnetd_default_user.plain \
-	bnissue.txt bnmaps.conf bnxpcalc.conf bnxplevel.conf \
-	channel.conf command_groups.conf realm.conf \
-	sql_DB_layout.conf supportfile.conf topics.conf tournament.conf \
-	versioncheck.conf sql_DB_layout2.conf 
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 87363f7..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-dist_data_DATA = bnmotd.txt INDEX INSTALL.unix PORTS README.fdwatch README.storage
-
-EXTRA_DIST = Compile.Instructions.Win32.Borland.txt \
-	Compile.Instructions.Win32.Dev-C++.txt \
-	Compile.Instructions.Win32.VS.Net.txt
diff --git a/files/Makefile.am b/files/Makefile.am
deleted file mode 100644
index 177753a..0000000
--- a/files/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-filesdir = $(localstatedir)/files
-dist_files_DATA = ad000001.mng ad000001.smk ad000002.mng ad000003.mng \
-	ad000004.mng ad000075.mng \
-	newbie.save
-
-usersdir = $(localstatedir)/users
-users_DATA =
-
-userscdbdir = $(localstatedir)/userscdb
-userscdb_DATA =
-
-bnmaildir = $(localstatedir)/bnmail
-bnmail_DATA =
-
-clandir = $(localstatedir)/clans
-clan_DATA =
-
-teamdir = $(localstatedir)/teams
-team_DATA =
-
-reportsdir = $(localstatedir)/reports
-reports_DATA =
-
-chanlogsdir = $(localstatedir)/chanlogs
-chanlogs_DATA =
-
-charinfodir = $(localstatedir)/charinfo
-charinfo_DATA =
-
-charsavedir = $(localstatedir)/charsave
-charsave_DATA =
-
-ladderdir = $(localstatedir)/ladders
-ladder_DATA =
-
-statusdir = $(localstatedir)/status
-status_DATA =
-
-bakcharsavedir = $(localstatedir)/bak/charsave
-bakcharsave_DATA =
-
-bakcharinfodir = $(localstatedir)/bak/charinfo
-bakcharinfo_DATA =
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index cb6312f..0000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-man_MANS = bnbot.1 bnchat.1 bnetd.1 bnetd.conf.5 bnftp.1 bni2tga.1 bnibuild.1 \
-	bniextract.1 bnilist.1 bnpass.1 bnpcap.1 bnproxy.1 bnstat.1 bntext.5 \
-	bntrackd.1 tgainfo.1
-
-EXTRA_DIST = $(man_MANS)
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index e736047..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = compat common tinycdb win32 bntrackd client bnpass bniutils autoconf
-
-if COND_BNETD
-SUBDIRS += bnetd
-endif
-
-if COND_D2CS
-SUBDIRS += d2cs
-endif
-
-if COND_D2DBS
-SUBDIRS += d2dbs
-endif
-
-if COND_BNPCAP
-SUBDIRS += bnpcap
-endif
diff --git a/src/autoconf/Makefile.am b/src/autoconf/Makefile.am
deleted file mode 100644
index 922c034..0000000
--- a/src/autoconf/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = ccstdc.m4 mkdir.m4
diff --git a/src/bnetd/Makefile.am b/src/bnetd/Makefile.am
deleted file mode 100644
index b7c06ac..0000000
--- a/src/bnetd/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src -DBNETD_DEFAULT_CONF_FILE=\"$(sysconfdir)/bnetd.conf\" ${DEFINES}
-
-sbin_PROGRAMS = bnetd
-
-bnetd_SOURCES = account.cpp account_wrap.cpp adbanner.cpp alias_command.cpp anongame.cpp \
-	anongame_gameresult.cpp anongame_infos.cpp anongame_maplists.cpp attrgroup.cpp \
-	attrlayer.cpp autoupdate.cpp channel.cpp channel_conv.cpp character.cpp clan.cpp \
-	cmdline.cpp command.cpp command_groups.cpp connection.cpp file.cpp file_cdb.cpp \
-	file_plain.cpp friends.cpp game.cpp game_conv.cpp handle_anongame.cpp \
-	handle_bnet.cpp handle_bot.cpp handle_d2cs.cpp handle_file.cpp handle_init.cpp \
-	handle_irc.cpp handle_telnet.cpp handle_udp.cpp helpfile.cpp ipban.cpp irc.cpp \
-	ladder.cpp ladder_calc.cpp mail.cpp main.cpp message.cpp news.cpp \
-	output.cpp prefs.cpp realm.cpp runprog.cpp server.cpp sql_dbcreator.cpp \
-	sql_mysql.cpp sql_odbc.cpp sql_pgsql.cpp sql_sqlite3.cpp storage.cpp \
-	storage_file.cpp storage_sql.cpp support.cpp team.cpp tick.cpp timer.cpp topic.cpp \
-	tournament.cpp tracker.cpp udptest_send.cpp versioncheck.cpp watch.cpp \
-	storage_sql2.cpp sql_common.cpp handle_wol.cpp handle_irc_common.cpp handle_apireg.cpp \
-	handle_wserv.cpp luafunctions.cpp luainterface.cpp luaobjects.cpp luawrapper.cpp \
-	i18n.cpp icons.cpp
-
-bnetd_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a \
-	$(top_builddir)/src/tinycdb/libtinycdb.a \
-	$(top_builddir)/src/win32/libwin32.a
-
-noinst_HEADERS = account.h account_wrap.h adbanner.h alias_command.h \
-	anongame_gameresult.h anongame.h anongame_infos.h anongame_maplists.h \
-	attrgroup.h attr.h attrlayer.h autoupdate.h channel_conv.h channel.h \
-	character.h clan.h cmdline.h command_groups.h command.h connection.h \
-	file_cdb.h file.h file_plain.h friends.h game_conv.h game.h ipban.h \
-	handle_anongame.h handle_bnet.h handle_bot.h handle_d2cs.h helpfile.h \
-	handle_file.h handle_init.h handle_irc.h handlers.h handle_telnet.h \
-	handle_udp.h irc.h ladder_calc.h ladder.h mail.h \
-	message.h news.h output.h prefs.h quota.h realm.h runprog.h server.h \
-	sql_dbcreator.h sql_mysql.h sql_odbc.h sql_pgsql.h sql_sqlite3.h \
-	storage_file.h storage.h storage_sql.h support.h team.h tick.h \
-	timer.h topic.h tournament.h udptest_send.h versioncheck.h watch.h \
-	tracker.h storage_sql2.h sql_common.h handle_wol.h handle_irc_common.h handle_apireg.h \
-	handle_wserv.h luafunctions.h luainterface.h luaobjects.h luawrapper.h \
-	i18n.h icons.h
diff --git a/src/bniutils/Makefile.am b/src/bniutils/Makefile.am
deleted file mode 100644
index 73c5a9c..0000000
--- a/src/bniutils/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-bin_PROGRAMS = bnilist bni2tga bniextract bnibuild tgainfo
-
-bnilist_SOURCES = bnilist.cpp fileio.cpp tga.cpp
-bnilist_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-bni2tga_SOURCES = bni2tga.cpp fileio.cpp
-bni2tga_LDADD = $(top_builddir)/src/common/libcommon.a
-
-bniextract_SOURCES = bniextract.cpp fileio.cpp tga.cpp bni.cpp
-bniextract_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-bnibuild_SOURCES = bnibuild.cpp fileio.cpp bni.cpp tga.cpp
-bnibuild_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-tgainfo_SOURCES = tgainfo.cpp fileio.cpp tga.cpp
-tgainfo_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-noinst_HEADERS = bni.h fileio.h tga.h
diff --git a/src/bnpass/Makefile.am b/src/bnpass/Makefile.am
deleted file mode 100644
index bfd84a1..0000000
--- a/src/bnpass/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-bin_PROGRAMS = bnpass sha1hash
-
-bnpass_SOURCES = bnpass.cpp
-
-bnpass_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-sha1hash_SOURCES = sha1hash.cpp
-
-sha1hash_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
diff --git a/src/bnpcap/Makefile.am b/src/bnpcap/Makefile.am
deleted file mode 100644
index 70d3c25..0000000
--- a/src/bnpcap/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-bin_PROGRAMS = bnpcap
-
-bnpcap_SOURCES = bnpcap.cpp
-
-bnpcap_LDADD = $(top_builddir)/src/common/libcommon.a
diff --git a/src/bntrackd/Makefile.am b/src/bntrackd/Makefile.am
deleted file mode 100644
index 0373578..0000000
--- a/src/bntrackd/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-sbin_PROGRAMS = bntrackd
-
-bntrackd_SOURCES = bntrackd.cpp
-
-bntrackd_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
deleted file mode 100644
index 33d681c..0000000
--- a/src/client/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-bin_PROGRAMS = bnchat bnftp bnbot bnstat
-
-bnchat_SOURCES = bnchat.cpp client.cpp client_connect.cpp udptest.cpp
-bnchat_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-bnftp_SOURCES = bnftp.cpp client.cpp
-bnftp_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-bnbot_SOURCES = bnbot.cpp client.cpp
-bnbot_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-bnstat_SOURCES = bnstat.cpp client.cpp client_connect.cpp udptest.cpp
-bnstat_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-noinst_HEADERS = ansi_term.h client_connect.h client.h udptest.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
deleted file mode 100644
index dac98ee..0000000
--- a/src/common/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-noinst_LIBRARIES = libcommon.a
-
-libcommon_a_SOURCES = conf.cpp list.cpp eventlog.cpp hexdump.cpp bn_type.cpp util.cpp \
-	addr.cpp d2char_checksum.cpp xalloc.cpp network.cpp packet.cpp xstring.cpp \
-	asnprintf.cpp bnethash.cpp bnethashconv.cpp bnettime.cpp bn_type.cpp \
-	fdwatch.cpp fdwatch_epoll.cpp fdwatch_kqueue.cpp fdwatch_poll.cpp \
-	fdwatch_select.cpp give_up_root_privileges.cpp hashtable.cpp \
-	proginfo.cpp queue.cpp rcm.cpp rlimit.cpp tag.cpp token.cpp trans.cpp \
-	fdwbackend.cpp xstr.cpp systemerror.cpp wolhash.cpp \
-	format.cpp pugixml.cpp
-
-noinst_HEADERS = addr.h anongame_protocol.h asnprintf.h bnethashconv.h \
-	bnethash.h bnet_protocol.h bnettime.h bn_type.h bot_protocol.h \
-	conf.h d2char_checksum.h d2char_file.h d2game_protocol.h elist.h \
-	eventlog.h fdwatch_epoll.h fdwatch.h fdwatch_kqueue.h fdwatch_poll.h \
-	fdwatch_select.h field_sizes.h file_protocol.h flags.h hashtable.h \
-	give_up_root_privileges.h hexdump.h init_protocol.h introtate.h \
-	irc_protocol.h list.h lstr.h network.h packet.h proginfo.h queue.h \
-	rcm.h rlimit.h setup_after.h setup_before.h tag.h token.h tracker.h \
-	trans.h udp_protocol.h util.h version.h xalloc.h xstring.h \
-	d2cs_bnetd_protocol.h d2cs_d2dbs_ladder.h d2cs_d2gs_character.h \
-	d2cs_d2gs_protocol.h d2cs_protocol.h scoped_array.h scoped_ptr.h \
-	fdwbackend.h xstr.h systemerror.h wolhash.h \
-	format.h pugiconfig.h pugixml.h
diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am
deleted file mode 100644
index 357248f..0000000
--- a/src/compat/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-noinst_LIBRARIES = libcompat.a
-
-libcompat_a_SOURCES = psock.cpp strerror.cpp strsep.cpp pgetopt.cpp \
-	gettimeofday.cpp inet_aton.cpp inet_ntoa.cpp mmap.cpp pdir.cpp \
-	snprintf.cpp strcasecmp.cpp strdup.cpp strncasecmp.cpp strtoul.cpp \
-	uname.cpp vsnprintf.cpp
-
-noinst_HEADERS = access.h gethostname.h gettimeofday.h inet_aton.h \
-	inet_ntoa.h mkdir.h mmap.h netinet_in.h pdir.h psock.h read.h recv.h \
-	rename.h send.h snprintf.h socket.h statmacros.h stdfileno.h \
-	strcasecmp.h strdup.h strerror.h strncasecmp.h strsep.h strtoul.h \
-	termios.h uint.h uname.h vsnprintf.h pgetpid.h pgetopt.h
diff --git a/src/d2cs/Makefile.am b/src/d2cs/Makefile.am
deleted file mode 100644
index 55c695b..0000000
--- a/src/d2cs/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src -DD2CS_DEFAULT_CONF_FILE=\"$(sysconfdir)/d2cs.conf\"
-
-sbin_PROGRAMS = d2cs
-
-d2cs_SOURCES = bnetd.cpp cmdline.cpp connection.cpp d2charfile.cpp d2charlist.cpp \
-	d2gs.cpp d2ladder.cpp game.cpp gamequeue.cpp handle_bnetd.cpp handle_d2cs.cpp \
-	handle_d2gs.cpp handle_init.cpp handle_signal.cpp main.cpp net.cpp prefs.cpp \
-	s2s.cpp server.cpp serverqueue.cpp
-d2cs_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a \
-	$(top_builddir)/src/win32/libwin32.a
-
-noinst_HEADERS = bit.h bnetd.h cmdline.h connection.h d2charfile.h \
-	d2charlist.h d2gs.h d2ladder.h game.h gamequeue.h handle_bnetd.h \
-	handle_d2cs.h handle_d2gs.h handle_init.h handle_signal.h net.h \
-	prefs.h s2s.h server.h serverqueue.h setup.h version.h
diff --git a/src/d2dbs/Makefile.am b/src/d2dbs/Makefile.am
deleted file mode 100644
index 8af1043..0000000
--- a/src/d2dbs/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src -DD2DBS_DEFAULT_CONF_FILE=\"$(sysconfdir)/d2dbs.conf\"
-
-sbin_PROGRAMS = d2dbs
-
-d2dbs_SOURCES = charlock.cpp d2ladder.cpp dbserver.cpp dbspacket.cpp cmdline.cpp \
-	prefs.cpp handle_signal.cpp dbsdupecheck.cpp main.cpp
-d2dbs_LDADD = $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a \
-	$(top_builddir)/src/win32/libwin32.a
-
-noinst_HEADERS = charlock.h cmdline.h d2ladder.h dbsdupecheck.h dbserver.h \
-	dbspacket.h handle_signal.h prefs.h setup.h version.h
diff --git a/src/tinycdb/Makefile.am b/src/tinycdb/Makefile.am
deleted file mode 100644
index d61bd6d..0000000
--- a/src/tinycdb/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-noinst_LIBRARIES = libtinycdb.a
-libtinycdb_a_SOURCES = cdb_find.cpp cdb_findnext.cpp cdb_hash.cpp cdb_init.cpp \
-	cdb_make_add.cpp cdb_make.cpp cdb_make_find.cpp cdb_make_put.cpp cdb_seek.cpp \
-	cdb_seq.cpp cdb_unpack.cpp
-
-bin_PROGRAMS = bncdb
-bncdb_SOURCES = cdb.cpp
-bncdb_LDADD = libtinycdb.a $(top_builddir)/src/common/libcommon.a \
-	$(top_builddir)/src/compat/libcompat.a
-
-noinst_HEADERS = cdb.h cdb_int.h
diff --git a/src/win32/Makefile.am b/src/win32/Makefile.am
deleted file mode 100644
index 2a07730..0000000
--- a/src/win32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS=-I$(top_srcdir)/src
-
-noinst_LIBRARIES = libwin32.a
-
-libwin32_a_SOURCES = service.cpp
-
-noinst_HEADERS = service.h