#include <config.h>
#include "chart.h"
#include "htmlP.h"
-#include <libpspp/message.h>
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <data/filename.h>
+#include <data/file-name.h>
#include "error.h"
#include "getline.h"
#include "getlogin_r.h"
const char *content);
static bool
-html_open_driver (struct outp_driver *this, const char *options)
+html_open_driver (struct outp_driver *this, const struct string *options)
{
struct html_driver_ext *x;