diff --git a/src/Makefile.am b/src/Makefile.am
index ecc83d59..89deb155 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 mt_daapd_CPPFLAGS = -D_GNU_SOURCE @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @FFMPEG_CFLAGS@ @CONFUSE_CFLAGS@ @TAGLIB_CFLAGS@ @MINIXML_CFLAGS@
 mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @FFMPEG_LIBS@ @CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ @LIBAVL_LIBS@ @MINIXML_LIBS@
-mt_daapd_SOURCES = main.c daapd.h \
+mt_daapd_SOURCES = main.c \
 	err.c err.h \
 	conffile.c conffile.h \
 	filescanner.c filescanner.h \
diff --git a/src/conffile.c b/src/conffile.c
index 4b7ec636..f7c71d97 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -30,7 +30,6 @@
 
 #include <confuse.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "conffile.h"
 
diff --git a/src/daapd.h b/src/daapd.h
deleted file mode 100644
index ccde6bc7..00000000
--- a/src/daapd.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Header info for daapd server
- *
- * Copyright (C) 2003 Ron Pedde (ron@pedde.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/**
- * \file daapd.h
- *
- * header file for main.c.  Why it isn't main.h, I don't know.
- * In fact...
- *
- * \todo make daapd.h into main.h
- */
-
-#ifndef _DAAPD_H_
-#define _DAAPD_H_
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-#define PATHSEP '/'
-#define PATHSEP_STR "/"
-
-#ifdef DEBUG
-#  ifndef ASSERT
-#    define ASSERT(f)         \
-        if(f)                 \
-            {}                \
-        else                  \
-            err_log(0,"Assert error in %s, line %d\n",__FILE__,__LINE__)
-#  endif /* ndef ASSERT */
-#else /* ndef DEBUG */
-#  ifndef ASSERT
-#    define ASSERT(f)
-#  endif
-#endif
-
-
-#endif /* _DAAPD_H_ */
diff --git a/src/db-generic.c b/src/db-generic.c
index 8cb5211e..00555bb3 100644
--- a/src/db-generic.c
+++ b/src/db-generic.c
@@ -38,7 +38,6 @@
 # include <stdint.h>
 #endif
 
-#include "daapd.h"
 #include "db-generic.h"
 #include "err.h"
 
diff --git a/src/db-sql-sqlite3.c b/src/db-sql-sqlite3.c
index 49b082d0..82fc14a3 100644
--- a/src/db-sql-sqlite3.c
+++ b/src/db-sql-sqlite3.c
@@ -47,7 +47,6 @@
 # include <unistd.h>
 #endif
 
-#include "daapd.h"
 #include "err.h"
 #include "db-generic.h"
 #include "db-sql.h"
diff --git a/src/db-sql-updates.c b/src/db-sql-updates.c
index 32c88382..c59713a3 100644
--- a/src/db-sql-updates.c
+++ b/src/db-sql-updates.c
@@ -4,7 +4,6 @@
  */
 
 #include <stdio.h>
-#include "daapd.h"
 
 char *db_sqlite_updates[] = {
     /* version 0 -> version 1 -- initial update */
diff --git a/src/db-sql.c b/src/db-sql.c
index 970b4266..a4dc2f82 100644
--- a/src/db-sql.c
+++ b/src/db-sql.c
@@ -38,7 +38,6 @@
 #endif
 #include <inttypes.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "db-generic.h"
 #include "db-sql.h"
diff --git a/src/err.c b/src/err.c
index 64db2c7b..dbf751c1 100644
--- a/src/err.c
+++ b/src/err.c
@@ -48,7 +48,6 @@
 
 #include <syslog.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "misc.h"
 
diff --git a/src/filescanner.c b/src/filescanner.c
index ee1db31f..ee6fab1e 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -42,7 +42,6 @@
 #include <event.h>
 #include <avl.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "db-generic.h"
 #include "filescanner.h"
diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c
index 4b19617c..826f0664 100644
--- a/src/filescanner_ffmpeg.c
+++ b/src/filescanner_ffmpeg.c
@@ -36,7 +36,6 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "filescanner.h"
 
diff --git a/src/filescanner_m3u.c b/src/filescanner_m3u.c
index ff582ea3..4a415b44 100644
--- a/src/filescanner_m3u.c
+++ b/src/filescanner_m3u.c
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 #include "db-generic.h"
diff --git a/src/filescanner_urlfile.c b/src/filescanner_urlfile.c
index 9f609bf3..7cd6c15f 100644
--- a/src/filescanner_urlfile.c
+++ b/src/filescanner_urlfile.c
@@ -30,7 +30,6 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 #include "filescanner.h"
diff --git a/src/httpd.c b/src/httpd.c
index c4d5c4c2..85a79e57 100644
--- a/src/httpd.c
+++ b/src/httpd.c
@@ -34,7 +34,6 @@
 #include <event.h>
 #include "evhttp/evhttp.h"
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 #include "db-generic.h"
diff --git a/src/httpd_daap.c b/src/httpd_daap.c
index 0240622f..da4f9525 100644
--- a/src/httpd_daap.c
+++ b/src/httpd_daap.c
@@ -38,7 +38,6 @@
 #include "evhttp/evhttp.h"
 #include <avl.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 #include "db-generic.h"
diff --git a/src/httpd_rsp.c b/src/httpd_rsp.c
index 4531db31..fe69f06a 100644
--- a/src/httpd_rsp.c
+++ b/src/httpd_rsp.c
@@ -37,7 +37,6 @@
 
 #include <mxml.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 #include "db-generic.h"
diff --git a/src/main.c b/src/main.c
index a334b4b1..bf5d0b73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -80,15 +80,12 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include "daapd.h"
-
 #include "conffile.h"
 #include "err.h"
 #include "misc.h"
 #include "filescanner.h"
 #include "httpd.h"
 #include "db-generic.h"
-
 #include "mdns_avahi.h"
 
 #ifdef HAVE_GETOPT_H
diff --git a/src/mdns_avahi.c b/src/mdns_avahi.c
index 37897b18..d6cc608f 100644
--- a/src/mdns_avahi.c
+++ b/src/mdns_avahi.c
@@ -33,7 +33,6 @@
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "mdns_avahi.h"
 
diff --git a/src/misc.c b/src/misc.c
index f6b204bb..8b6235af 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <limits.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "misc.h"
 
diff --git a/src/scan-flac.c b/src/scan-flac.c
index af546b95..edc55a2a 100644
--- a/src/scan-flac.c
+++ b/src/scan-flac.c
@@ -39,7 +39,6 @@
 
 #include <sys/stat.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 
diff --git a/src/scan-mpc.c b/src/scan-mpc.c
index 59464556..fa44e55d 100644
--- a/src/scan-mpc.c
+++ b/src/scan-mpc.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <taglib/tag_c.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 
diff --git a/src/scan-wma.c b/src/scan-wma.c
index 6fcbd486..27977b5a 100644
--- a/src/scan-wma.c
+++ b/src/scan-wma.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "ff-dbstruct.h"
 
diff --git a/src/smart-parser.c b/src/smart-parser.c
index 795d637e..a83f6801 100644
--- a/src/smart-parser.c
+++ b/src/smart-parser.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "daapd.h"
 #include "err.h"
 
 extern int db_sql_escape(char *buffer, int *size, char *fmt, ...);
diff --git a/src/transcode.c b/src/transcode.c
index a3e7822e..bfd4018c 100644
--- a/src/transcode.c
+++ b/src/transcode.c
@@ -39,7 +39,6 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 
-#include "daapd.h"
 #include "err.h"
 #include "conffile.h"
 #include "ff-dbstruct.h"