diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c
index a6016405..cdaee985 100644
--- a/ajaxui/ajaxui_config_dvb.c
+++ b/ajaxui/ajaxui_config_dvb.c
@@ -34,7 +34,6 @@
 #include "dvb.h"
 #include "dvb_support.h"
 #include "dvb_muxconfig.h"
-#include "strtab.h"
 #include "psi.h"
 #include "transports.h"
 
diff --git a/ajaxui/ajaxui_config_transport.c b/ajaxui/ajaxui_config_transport.c
index 32f7411b..88466124 100644
--- a/ajaxui/ajaxui_config_transport.c
+++ b/ajaxui/ajaxui_config_transport.c
@@ -31,7 +31,6 @@
 #include "http.h"
 #include "ajaxui.h"
 #include "channels.h"
-#include "strtab.h"
 #include "psi.h"
 #include "transports.h"
 
diff --git a/dvb_muxconfig.c b/dvb_muxconfig.c
index 4cf7f9f3..f3cab148 100644
--- a/dvb_muxconfig.c
+++ b/dvb_muxconfig.c
@@ -31,7 +31,6 @@
 #include "dvb_dvr.h"
 #include "dvb_muxconfig.h"
 #include "dvb_support.h"
-#include "strtab.h"
 #include "transports.h"
 
 static struct strtab fectab[] = {
diff --git a/dvb_support.c b/dvb_support.c
index 3611e3da..3fea3799 100644
--- a/dvb_support.c
+++ b/dvb_support.c
@@ -33,7 +33,6 @@
 
 #include "tvhead.h"
 #include "dvb_support.h"
-#include "strtab.h"
 #include "dvb.h"
 
 /*
diff --git a/http.c b/http.c
index b1d9d375..4b1df713 100644
--- a/http.c
+++ b/http.c
@@ -38,7 +38,6 @@
 #include "teletext.h"
 #include "dispatch.h"
 #include "dvb.h"
-#include "strtab.h"
 #include "rtp.h"
 #include "tsmux.h"
 #include "http.h"
diff --git a/psi.c b/psi.c
index 2f18b8ca..0bca4d23 100644
--- a/psi.c
+++ b/psi.c
@@ -30,7 +30,6 @@
 #include "transports.h"
 #include "dvb_support.h"
 #include "tsdemux.h"
-#include "strtab.h"
 #include "parsers.h"
 
 int
diff --git a/pvr.c b/pvr.c
index 56a10f39..69233f8f 100644
--- a/pvr.c
+++ b/pvr.c
@@ -42,7 +42,6 @@
 #include "epg.h"
 #include "dispatch.h"
 #include "buffer.h"
-#include "strtab.h"
 #include "ffmuxer.h"
 #include "spawn.h"
 
diff --git a/rtsp.c b/rtsp.c
index 64bd7def..36fe5ce2 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -36,7 +36,6 @@
 #include "teletext.h"
 #include "dispatch.h"
 #include "dvb.h"
-#include "strtab.h"
 #include "rtp.h"
 #include "tsmux.h"
 #include "tcp.h"
diff --git a/strtab.h b/strtab.h
deleted file mode 100644
index 98762097..00000000
--- a/strtab.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  tvheadend
- *  Copyright (C) 2007 Andreas Öman
- *
- *  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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef STRTAB_H_
-#define STRTAB_H_
-
-#include <string.h>
-
-struct strtab {
-  const char *str;
-  int val;
-};
-
-static int str2val0(const char *str, struct strtab tab[], int l)
-     __attribute((unused));
-
-static int
-str2val0(const char *str, struct strtab tab[], int l)
-{
-  int i;
-  for(i = 0; i < l; i++)
-    if(!strcasecmp(str, tab[i].str))
-      return tab[i].val;
-
-  return -1;
-}
-
-#define str2val(str, tab) str2val0(str, tab, sizeof(tab) / sizeof(tab[0]))
-
-static const char * val2str0(int val, struct strtab tab[], int l)
-     __attribute__((unused));
-
-static const char *
-val2str0(int val, struct strtab tab[], int l)
-{
-  int i;
-  for(i = 0; i < l; i++)
-    if(tab[i].val == val)
-      return tab[i].str;
-  return NULL;
-} 
-
-#define val2str(val, tab) val2str0(val, tab, sizeof(tab) / sizeof(tab[0]))
-
-#endif /* STRTAB_H_ */
diff --git a/transports.c b/transports.c
index 7c531edb..03ac77a6 100644
--- a/transports.c
+++ b/transports.c
@@ -52,7 +52,6 @@
 #include "buffer.h"
 #include "channels.h"
 #include "cwc.h"
-#include "strtab.h"
 
 #define TRANSPORT_HASH_WIDTH 101
 
diff --git a/tvhead.h b/tvhead.h
index cf023fb7..c0fbbea5 100644
--- a/tvhead.h
+++ b/tvhead.h
@@ -26,6 +26,7 @@
 #include <libhts/htstv.h>
 #include <libhts/htscfg.h>
 #include <libhts/avg.h>
+#include <libhts/hts_strtab.h>
 #include "refstr.h"
 #include <libavcodec/avcodec.h>