-#include "format.h"
-
-/* Flags. */
-enum
- {
- DI_IGNORE_ERROR = 01, /* Don't report errors to the user. */
- DI_IMPLIED_DECIMALS = 02 /* Insert decimals if no '.' in input. */
- };
-
-/* Information about parsing one data field. */
-struct data_in
- {
- const char *s; /* Source start. */
- const char *e; /* Source end. */
-
- union value *v; /* Destination. */
-
- int flags; /* Zero or more of DI_*. */
- int f1, f2; /* Columns the field was taken from. */
- struct fmt_spec format; /* Format specification to use. */
- };
-
-bool data_in (struct data_in *);
-
-void data_in_finite_line (struct data_in *di, const char *line, size_t len,
- int fc, int lc);
-
-#endif /* data-in.h */
+#include <libpspp/legacy-encoding.h>
+#include <libpspp/float-format.h>
+#include <libpspp/integer-format.h>
+#include <libpspp/str.h>
+#include <data/format.h>
+
+enum fmt_type;
+union value;
+bool data_in (struct substring input, enum legacy_encoding,
+ enum fmt_type, int implied_decimals,
+ int first_column, int last_column,
+ union value *output, int width);
+
+#endif /* data/data-in.h */