diff --git a/.gitignore b/.gitignore
index c0d8eab1..a55641ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ aclocal.m4
 autom4te.cache/
 configure
 depcomp
-include/
 install-sh
 missing
 
diff --git a/include/.config.h.in.swp b/include/.config.h.in.swp
new file mode 100644
index 00000000..fa8ca5fc
Binary files /dev/null and b/include/.config.h.in.swp differ
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 00000000..03f44076
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,109 @@
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <extractor.h> header file. */
+#undef HAVE_EXTRACTOR_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+#undef HAVE_LIBAVCODEC
+
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+#undef HAVE_LIBAVFORMAT
+
+/* Define to 1 if you have the `avutil' library (-lavutil). */
+#undef HAVE_LIBAVUTIL
+
+/* Define to 1 if you have the `boost_date_time' library (-lboost_date_time).
+   */
+#undef HAVE_LIBBOOST_DATE_TIME
+
+/* Define to 1 if you have the `boost_filesystem' library
+   (-lboost_filesystem). */
+#undef HAVE_LIBBOOST_FILESYSTEM
+
+/* Define to 1 if you have the `boost_iostreams' library (-lboost_iostreams).
+   */
+#undef HAVE_LIBBOOST_IOSTREAMS
+
+/* Define to 1 if you have the `boost_signals' library (-lboost_signals). */
+#undef HAVE_LIBBOOST_SIGNALS
+
+/* Define to 1 if you have the `boost_system' library (-lboost_system). */
+#undef HAVE_LIBBOOST_SYSTEM
+
+/* Define to 1 if you have the `boost_thread' library (-lboost_thread). */
+#undef HAVE_LIBBOOST_THREAD
+
+/* Define to 1 if you have the `extractor' library (-lextractor). */
+#undef HAVE_LIBEXTRACTOR
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the `wt' library (-lwt). */
+#undef HAVE_LIBWT
+
+/* Define to 1 if you have the `wtdbo' library (-lwtdbo). */
+#undef HAVE_LIBWTDBO
+
+/* Define to 1 if you have the `wtdbosqlite3' library (-lwtdbosqlite3). */
+#undef HAVE_LIBWTDBOSQLITE3
+
+/* Define to 1 if you have the `wthttp' library (-lwthttp). */
+#undef HAVE_LIBWTHTTP
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <Wt/WApplication> header file. */
+#undef HAVE_WT_WAPPLICATION
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff --git a/include/config.h.in~ b/include/config.h.in~
new file mode 100644
index 00000000..03f44076
--- /dev/null
+++ b/include/config.h.in~
@@ -0,0 +1,109 @@
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <extractor.h> header file. */
+#undef HAVE_EXTRACTOR_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `avcodec' library (-lavcodec). */
+#undef HAVE_LIBAVCODEC
+
+/* Define to 1 if you have the `avformat' library (-lavformat). */
+#undef HAVE_LIBAVFORMAT
+
+/* Define to 1 if you have the `avutil' library (-lavutil). */
+#undef HAVE_LIBAVUTIL
+
+/* Define to 1 if you have the `boost_date_time' library (-lboost_date_time).
+   */
+#undef HAVE_LIBBOOST_DATE_TIME
+
+/* Define to 1 if you have the `boost_filesystem' library
+   (-lboost_filesystem). */
+#undef HAVE_LIBBOOST_FILESYSTEM
+
+/* Define to 1 if you have the `boost_iostreams' library (-lboost_iostreams).
+   */
+#undef HAVE_LIBBOOST_IOSTREAMS
+
+/* Define to 1 if you have the `boost_signals' library (-lboost_signals). */
+#undef HAVE_LIBBOOST_SIGNALS
+
+/* Define to 1 if you have the `boost_system' library (-lboost_system). */
+#undef HAVE_LIBBOOST_SYSTEM
+
+/* Define to 1 if you have the `boost_thread' library (-lboost_thread). */
+#undef HAVE_LIBBOOST_THREAD
+
+/* Define to 1 if you have the `extractor' library (-lextractor). */
+#undef HAVE_LIBEXTRACTOR
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the `wt' library (-lwt). */
+#undef HAVE_LIBWT
+
+/* Define to 1 if you have the `wtdbo' library (-lwtdbo). */
+#undef HAVE_LIBWTDBO
+
+/* Define to 1 if you have the `wtdbosqlite3' library (-lwtdbosqlite3). */
+#undef HAVE_LIBWTDBOSQLITE3
+
+/* Define to 1 if you have the `wthttp' library (-lwthttp). */
+#undef HAVE_LIBWTHTTP
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <Wt/WApplication> header file. */
+#undef HAVE_WT_WAPPLICATION
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION