diff --git a/ChangeLog b/ChangeLog
index f5944dbb7ddc91e75387d8608e6e660ea9106395..76da1278cc3523a5371e2e8dfe9bb0afa491a9ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+1999-06-04  Per Cederqvist  <ceder@lysator.liu.se>
+
+	Clean up file inclusion.  Avoid including files from .h files.
+	Avoid underscores in dubious places.
+	* src/server/admin.c: Don't include <stdarg.h>.
+	* src/server/conf-file.c: Likewise.
+	* src/server/conference.c: Likewise.
+	* src/server/connections.c: Likewise.
+	* src/server/dbck-cache.c: Likewise.
+	* src/server/internal-connections.c: Likewise.
+	* src/server/membership.c: Likewise.
+	* src/server/memory.c: Likewise.
+	* src/server/person.c: Likewise.
+	* src/server/prot-a-parse.c: Likewise.
+	* src/server/ram-output.c: Likewise.
+	* src/server/ram-parse.c: Likewise.
+	* src/server/ramkomd.c: Likewise.
+	* src/server/regex-match.c: Likewise.
+	* src/server/rfc931.c: Likewise.
+	* src/server/send-async.c: Likewise.
+	* src/server/server-config.c: Likewise.
+	* src/server/session.c: Likewise.
+	* src/server/simple-cache.c: Likewise.
+	* src/server/text-garb.c: Likewise.
+	* src/server/text.c: Likewise.
+	* src/server/testsuite/test-l2g.c: Include "kom-types.h".
+	* src/server/local-to-global.h: Don't include "kom-types.h".
+	* src/server/log.h: Don't include <stdarg.h>.  Don't declare
+	kom_logv.  Don't use leading underscores or double underscores in
+	symbols we define.
+	* src/server/log.c (kom_logv): Now static.
+	* src/include/compiler.h: Don't use leading underscores or double
+	underscores in symbols we define.
+	* src/include/kom-errno.h: Likewise.
+	* src/include/kom-types.h: Likewise.
+	* src/include/misc-types.h: Likewise.
+	* src/include/services.h: Likewise.
+
+	Distribute new test suite files.
+	* src/server/testsuite/Makefile.am (EXTRA_DIST): Added
+	lyskomd.0/09.exp and lyskomd.0/10.exp.
+
+	Some systems lack strdup.
+	* configure.in: Added AC_REPLACE_FUNCS(strdup).
+	* src/libraries/libansi/strdup.c (strdup): Replacement implementation.
+
 1999-05-31  Per Cederqvist  <ceder@gratia>
 
 	Fixed typo in the test suite.