From: Andreas Öman <andreas@lonelycoder.com>
Date: Mon, 29 Nov 2010 19:25:24 +0000 (+0000)
Subject: Rename tvhead.h -> tvheadend.h
X-Git-Tag: 2.99~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42adea653d7e08162e614958ab9827d10f86677b;p=thirdparty%2Ftvheadend.git

Rename tvhead.h -> tvheadend.h
---

diff --git a/src/access.c b/src/access.c
index 869361831..dd21ed635 100644
--- a/src/access.c
+++ b/src/access.c
@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "access.h"
 #include "dtable.h"
 #include "settings.h"
diff --git a/src/avahi.c b/src/avahi.c
index ae32decc8..4dc14f32b 100644
--- a/src/avahi.c
+++ b/src/avahi.c
@@ -49,7 +49,7 @@
 #include <avahi-common/error.h>
 #include <avahi-common/timeval.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "avahi.h"
 
 static AvahiEntryGroup *group = NULL;
diff --git a/src/capmt.c b/src/capmt.c
index dd72e69ec..939250bb6 100644
--- a/src/capmt.c
+++ b/src/capmt.c
@@ -35,7 +35,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb/dvb.h"
 #include "tcp.h"
 #include "psi.h"
diff --git a/src/channels.c b/src/channels.c
index 460e0880a..d4ee932d6 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -30,7 +30,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "psi.h"
 #include "channels.h"
 #include "transports.h"
diff --git a/src/cwc.c b/src/cwc.c
index a9896cbed..ef774de48 100644
--- a/src/cwc.c
+++ b/src/cwc.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <rpc/des_crypt.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "tcp.h"
 #include "psi.h"
 #include "tsdemux.h"
diff --git a/src/dtable.c b/src/dtable.c
index 710033f59..f86100f11 100644
--- a/src/dtable.c
+++ b/src/dtable.c
@@ -29,7 +29,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dtable.h"
 #include "notify.h"
 
diff --git a/src/dvb/dvb.c b/src/dvb/dvb.c
index 3543c4016..0cb78d5c0 100644
--- a/src/dvb/dvb.c
+++ b/src/dvb/dvb.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "dvb_support.h"
 
diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index 6f909bf6c..f5317939b 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -35,7 +35,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "transports.h"
 #include "dvb.h"
 #include "dvb_support.h"
diff --git a/src/dvb/dvb_fe.c b/src/dvb/dvb_fe.c
index c9e39d7f3..c4e4d15ff 100644
--- a/src/dvb/dvb_fe.c
+++ b/src/dvb/dvb_fe.c
@@ -33,7 +33,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "dvb_support.h"
 #include "diseqc.h"
diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index ea5262c46..6c81cba28 100644
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -36,7 +36,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "channels.h"
 #include "transports.h"
diff --git a/src/dvb/dvb_preconf.c b/src/dvb/dvb_preconf.c
index 26e329618..b4b6eb9b0 100644
--- a/src/dvb/dvb_preconf.c
+++ b/src/dvb/dvb_preconf.c
@@ -26,7 +26,7 @@
 
 #include <linux/dvb/frontend.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "dvb_preconf.h"
 
diff --git a/src/dvb/dvb_satconf.c b/src/dvb/dvb_satconf.c
index b4ed2f8d2..964754ea6 100644
--- a/src/dvb/dvb_satconf.c
+++ b/src/dvb/dvb_satconf.c
@@ -28,7 +28,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "dtable.h"
 #include "notify.h"
diff --git a/src/dvb/dvb_support.c b/src/dvb/dvb_support.c
index b102fcd47..b7098a553 100644
--- a/src/dvb/dvb_support.c
+++ b/src/dvb/dvb_support.c
@@ -31,7 +31,7 @@
 
 #include <linux/dvb/frontend.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb_support.h"
 #include "dvb.h"
 
diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c
index c3c6136fa..253623c81 100644
--- a/src/dvb/dvb_tables.c
+++ b/src/dvb/dvb_tables.c
@@ -33,7 +33,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "dvb_support.h"
 #include "epg.h"
diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c
index 15fbbeb9f..8acaec752 100644
--- a/src/dvb/dvb_transport.c
+++ b/src/dvb/dvb_transport.c
@@ -36,7 +36,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvb.h"
 #include "channels.h"
 #include "transports.h"
diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index bc75702cb..91f18fa5b 100644
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 #include <math.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "settings.h"
 #include "dvr.h"
 #include "notify.h"
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 0764a4852..c7933c62c 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -24,7 +24,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "dvr.h"
 #include "notify.h"
 #include "htsp.h"
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index b6f935443..190d55d2c 100644
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -25,7 +25,7 @@
 
 #include "htsstr.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "streaming.h"
 #include "dvr.h"
 #include "spawn.h"
diff --git a/src/dvr/mkmux.c b/src/dvr/mkmux.c
index 5c967e988..d0f94bf4e 100644
--- a/src/dvr/mkmux.c
+++ b/src/dvr/mkmux.c
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "streaming.h"
 #include "dvr.h"
 #include "mkmux.h"
diff --git a/src/epg.c b/src/epg.c
index 6a8778c2c..c5f05ba37 100644
--- a/src/epg.c
+++ b/src/epg.c
@@ -23,7 +23,7 @@
 #include <regex.h>
 #include <assert.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "channels.h"
 #include "epg.h"
 #include "dvr/dvr.h"
diff --git a/src/ffdecsa/ffdecsa_interface.c b/src/ffdecsa/ffdecsa_interface.c
index 117fba4e8..607519a73 100644
--- a/src/ffdecsa/ffdecsa_interface.c
+++ b/src/ffdecsa/ffdecsa_interface.c
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "FFdecsa.h"
 
 
diff --git a/src/htsbuf.c b/src/htsbuf.c
index 68cc9850c..afc88c71e 100644
--- a/src/htsbuf.c
+++ b/src/htsbuf.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include "htsbuf.h"
-#include "tvhead.h"
+#include "tvheadend.h"
 
 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
diff --git a/src/htsmsg_xml.c b/src/htsmsg_xml.c
index 975cc4a93..87ba64944 100644
--- a/src/htsmsg_xml.c
+++ b/src/htsmsg_xml.c
@@ -50,7 +50,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 
 #include "htsmsg_xml.h"
 #include "htsbuf.h"
diff --git a/src/htsp.c b/src/htsp.c
index 99fb63277..c37c0281d 100644
--- a/src/htsp.c
+++ b/src/htsp.c
@@ -29,7 +29,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "channels.h"
 #include "subscriptions.h"
 #include "tcp.h"
diff --git a/src/http.c b/src/http.c
index 7608e8661..def767d8d 100644
--- a/src/http.c
+++ b/src/http.c
@@ -29,7 +29,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "tcp.h"
 #include "http.h"
 #include "rtsp.h"
diff --git a/src/iptv_input.c b/src/iptv_input.c
index e0cbac794..4d83efa31 100644
--- a/src/iptv_input.c
+++ b/src/iptv_input.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <linux/netdevice.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "htsmsg.h"
 #include "channels.h"
 #include "transports.h"
diff --git a/src/main.c b/src/main.c
index 055fdb4c1..b8ba18a03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "tcp.h"
 #include "access.h"
 #include "http.h"
diff --git a/src/notify.c b/src/notify.c
index 2f096bf67..bdad26efe 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "notify.h"
 #include "webui/webui.h"
 
diff --git a/src/packet.c b/src/packet.c
index c3efdb0f2..f84a8a11e 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "packet.h"
 #include "string.h"
 #include "atomic.h"
diff --git a/src/parser_h264.c b/src/parser_h264.c
index 8b17fb826..7137172d9 100644
--- a/src/parser_h264.c
+++ b/src/parser_h264.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "parsers.h"
 #include "parser_h264.h"
 #include "bitstream.h"
diff --git a/src/parser_latm.c b/src/parser_latm.c
index 08656a649..6097d2c4d 100644
--- a/src/parser_latm.c
+++ b/src/parser_latm.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "parsers.h"
 #include "parser_latm.h"
 #include "bitstream.h"
diff --git a/src/parsers.c b/src/parsers.c
index e7a0442d4..282133582 100644
--- a/src/parsers.c
+++ b/src/parsers.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "parsers.h"
 #include "parser_h264.h"
 #include "parser_latm.h"
diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
index d99c56c43..2c5df1f77 100644
--- a/src/plumbing/globalheaders.c
+++ b/src/plumbing/globalheaders.c
@@ -17,7 +17,7 @@
  */
 
 #include <assert.h>
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "streaming.h"
 #include "globalheaders.h"
 
diff --git a/src/plumbing/globalheaders.h b/src/plumbing/globalheaders.h
index 160ee12ef..dff742e5f 100644
--- a/src/plumbing/globalheaders.h
+++ b/src/plumbing/globalheaders.h
@@ -19,7 +19,7 @@
 #ifndef GLOBALHEADERS_H__
 #define GLOBALHEADERS_H__
 
-#include "tvhead.h"
+#include "tvheadend.h"
 
 streaming_target_t *globalheaders_create(streaming_target_t *output);
 
diff --git a/src/plumbing/tsfix.c b/src/plumbing/tsfix.c
index 40ac23034..c88d52d9a 100644
--- a/src/plumbing/tsfix.c
+++ b/src/plumbing/tsfix.c
@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "streaming.h"
 #include "tsfix.h"
 
diff --git a/src/plumbing/tsfix.h b/src/plumbing/tsfix.h
index 1692afa86..7e6f7bd0b 100644
--- a/src/plumbing/tsfix.h
+++ b/src/plumbing/tsfix.h
@@ -19,7 +19,7 @@
 #ifndef TSFIX_H__
 #define TSFIX_H__
 
-#include "tvhead.h"
+#include "tvheadend.h"
 
 streaming_target_t *tsfix_create(streaming_target_t *output);
 
diff --git a/src/psi.c b/src/psi.c
index ba30d89e5..84fab16c6 100644
--- a/src/psi.c
+++ b/src/psi.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "psi.h"
 #include "transports.h"
 #include "dvb/dvb_support.h"
diff --git a/src/rawtsinput.c b/src/rawtsinput.c
index 3c39e1206..0d86ce158 100644
--- a/src/rawtsinput.c
+++ b/src/rawtsinput.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "transports.h"
 #include "rawtsinput.h"
 #include "psi.h"
diff --git a/src/rtp.c b/src/rtp.c
index 866f1d462..990dd6a36 100644
--- a/src/rtp.c
+++ b/src/rtp.c
@@ -27,7 +27,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "rtp.h"
 
 void
diff --git a/src/rtsp.c b/src/rtsp.c
index 1e165dde3..7d54bb299 100644
--- a/src/rtsp.c
+++ b/src/rtsp.c
@@ -29,7 +29,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "channels.h"
 #include "subscriptions.h"
 #include "tcp.h"
diff --git a/src/serviceprobe.c b/src/serviceprobe.c
index 1c7494934..c13fe8ac1 100644
--- a/src/serviceprobe.c
+++ b/src/serviceprobe.c
@@ -27,7 +27,7 @@
 
 
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "channels.h"
 #include "subscriptions.h"
 #include "serviceprobe.h"
diff --git a/src/settings.c b/src/settings.c
index 2b207c756..1c5128b3f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -30,7 +30,7 @@
 #include "htsmsg.h"
 #include "htsmsg_json.h"
 #include "settings.h"
-#include "tvhead.h"
+#include "tvheadend.h"
 
 static char *settingspath;
 
diff --git a/src/spawn.c b/src/spawn.c
index ad784b605..9d59c5977 100644
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -27,7 +27,7 @@
 #include <syslog.h>
 #include <fcntl.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "spawn.h"
 
 extern char **environ;
diff --git a/src/streaming.c b/src/streaming.c
index 0110cd004..66b1f3f6c 100644
--- a/src/streaming.c
+++ b/src/streaming.c
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "streaming.h"
 #include "packet.h"
 #include "atomic.h"
diff --git a/src/streaming.h b/src/streaming.h
index 48b0c865e..eb2919c92 100644
--- a/src/streaming.h
+++ b/src/streaming.h
@@ -19,7 +19,6 @@
 #ifndef STREAMING_H_
 #define STREAMING_H_
 
-#include "tvhead.h"
 #include "packet.h"
 #include "htsmsg.h"
 
diff --git a/src/subscriptions.c b/src/subscriptions.c
index 72ab88242..2f4ca1b12 100644
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "transports.h"
 #include "subscriptions.h"
 #include "streaming.h"
diff --git a/src/tcp.c b/src/tcp.c
index fa2f91949..171a4dc65 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -33,7 +33,7 @@
 #include <arpa/inet.h>
 
 #include "tcp.h"
-#include "tvhead.h"
+#include "tvheadend.h"
 
 
 /**
diff --git a/src/teletext.c b/src/teletext.c
index c8b4cebc8..7356dbe7c 100644
--- a/src/teletext.c
+++ b/src/teletext.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "teletext.h"
 #include "transports.h"
 #include "packet.h"
diff --git a/src/transports.c b/src/transports.c
index 144938d32..57850e571 100644
--- a/src/transports.c
+++ b/src/transports.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "transports.h"
 #include "subscriptions.h"
 #include "tsdemux.h"
diff --git a/src/trap.c b/src/trap.c
index f698ed222..b2ebf09b5 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -38,7 +38,7 @@ char tvh_binshasum[20];
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "sha1.h"
 
 #define MAXFRAMES 100
diff --git a/src/tsdemux.c b/src/tsdemux.c
index 83f91fcfa..3a6868098 100644
--- a/src/tsdemux.c
+++ b/src/tsdemux.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "teletext.h"
 #include "transports.h"
 #include "subscriptions.h"
diff --git a/src/tvhead.h b/src/tvheadend.h
similarity index 99%
rename from src/tvhead.h
rename to src/tvheadend.h
index 13ec36fb9..318d3d832 100644
--- a/src/tvhead.h
+++ b/src/tvheadend.h
@@ -1,5 +1,5 @@
 /*
- *  TV headend - structures
+ *  Tvheadend - structures
  *  Copyright (C) 2007 Andreas Öman
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TV_HEAD_H
-#define TV_HEAD_H
+#ifndef TVHEADEND_H
+#define TVHEADEND_H
 
 #include "config.h"
 
diff --git a/src/utils.c b/src/utils.c
index a3abf60fa..1a293dc82 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -20,7 +20,7 @@
 #include <limits.h>
 #include <string.h>
 #include <assert.h>
-#include "tvhead.h"
+#include "tvheadend.h"
 
 /**
  * CRC32 
diff --git a/src/v4l.c b/src/v4l.c
index df63647dc..7fb52217b 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -33,7 +33,7 @@
 
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "transports.h"
 #include "v4l.h"
 #include "parsers.h"
diff --git a/src/webui/comet.c b/src/webui/comet.c
index 30b34f890..f529eb54d 100644
--- a/src/webui/comet.c
+++ b/src/webui/comet.c
@@ -27,7 +27,7 @@
 #include "htsmsg.h"
 #include "htsmsg_json.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui/webui.h"
 #include "access.h"
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 76f76ae76..3ab99384d 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -29,7 +29,7 @@
 #include "htsmsg.h"
 #include "htsmsg_json.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui.h"
 #include "access.h"
diff --git a/src/webui/extjs_dvb.c b/src/webui/extjs_dvb.c
index a4da7b748..b87804fe4 100644
--- a/src/webui/extjs_dvb.c
+++ b/src/webui/extjs_dvb.c
@@ -29,7 +29,7 @@
 #include "htsmsg.h"
 #include "htsmsg_json.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui.h"
 #include "access.h"
diff --git a/src/webui/extjs_v4l.c b/src/webui/extjs_v4l.c
index 4b22e9388..734ad20a5 100644
--- a/src/webui/extjs_v4l.c
+++ b/src/webui/extjs_v4l.c
@@ -29,7 +29,7 @@
 #include "htsmsg.h"
 #include "htsmsg_json.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui.h"
 #include "access.h"
diff --git a/src/webui/simpleui.c b/src/webui/simpleui.c
index 590527506..197825af8 100644
--- a/src/webui/simpleui.c
+++ b/src/webui/simpleui.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui.h"
 #include "access.h"
diff --git a/src/webui/statedump.c b/src/webui/statedump.c
index e28cb5b16..caa9b4bdd 100644
--- a/src/webui/statedump.c
+++ b/src/webui/statedump.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "http.h"
 #include "webui.h"
 #include "access.h"
diff --git a/src/webui/webui.c b/src/webui/webui.c
index cff5f390d..495763737 100644
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <sys/sendfile.h>
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "access.h"
 #include "http.h"
 #include "webui.h"
diff --git a/src/wrappers.c b/src/wrappers.c
index 2ac2e8f53..ce38af946 100644
--- a/src/wrappers.c
+++ b/src/wrappers.c
@@ -1,7 +1,7 @@
 #include <fcntl.h>
 #include <sys/types.h>          /* See NOTES */
 #include <sys/socket.h>
-#include "tvhead.h"
+#include "tvheadend.h"
 
 int
 tvh_open(const char *pathname, int flags, mode_t mode)
diff --git a/src/xmltv.c b/src/xmltv.c
index 612f7a8a0..73b5580cb 100644
--- a/src/xmltv.c
+++ b/src/xmltv.c
@@ -28,7 +28,7 @@
 #include "htsmsg_xml.h"
 #include "settings.h"
 
-#include "tvhead.h"
+#include "tvheadend.h"
 #include "channels.h"
 #include "epg.h"
 #include "xmltv.h"