#include <assert.h>
#include <math.h>
-#include "chart-geometry.h"
-#include "str.h"
-#include "alloc.h"
+#include <math/chart-geometry.h>
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
#include "manager.h"
#include "output.h"
#else
void *lp;
#endif
- char *filename;
+ char *file_name;
FILE *file;
/* The geometry of the chart