Remove references to old headers

16 files changed, 33 insertions, 60 deletions

diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c
index 19c4d5c3..c79b5e70 100644
--- a/libcrystfel/src/image-cbf.c
+++ b/libcrystfel/src/image-cbf.c
@@ -32,7 +32,6 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
-#include <hdf5.h>
 #include <zlib.h>
 
 #include "image.h"
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index 603403bd..57a73cbc 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -629,10 +629,6 @@ struct image *image_new()
        image->peak_resolution = -1.0;
        image->features = NULL;
 
-       /* Deprecated stuff */
-       image->beam = NULL;
-       image->det = NULL;
-
        return image;
 }
 
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index 0235e0c2..f8497a3c 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -196,16 +196,6 @@ extern void image_add_crystal(struct image *image, Crystal *cryst);
 extern int remove_flagged_crystals(struct image *image);
 extern void free_all_crystals(struct image *image);
 
-/* Image files (old API) */
-extern struct imagefile *imagefile_open(const char *filename);
-extern int imagefile_read(struct imagefile *f, struct image *image,
-                          struct event *event);
-extern int imagefile_read_simple(struct imagefile *f, struct image *image);
-extern struct hdfile *imagefile_get_hdfile(struct imagefile *f);
-extern enum imagefile_type imagefile_get_type(struct imagefile *f);
-extern void imagefile_close(struct imagefile *f);
-extern signed int is_cbf_file(const char *filename);
-
 
 /* New API */
 extern struct image *image_new(void);
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index 593da481..2a80fabe 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -50,7 +50,6 @@
 #include "asdf.h"
 #include "mosflm.h"
 #include "xds.h"
-#include "detector.h"
 #include "index.h"
 #include "geometry.h"
 #include "cell-utils.h"
diff --git a/libcrystfel/src/render.c b/libcrystfel/src/render.c
index 8e18a2c7..f39fcde2 100644
--- a/libcrystfel/src/render.c
+++ b/libcrystfel/src/render.c
@@ -44,7 +44,6 @@
 #include "peaks.h"
 #include "colscale.h"
 #include "detgeom.h"
-#include "detector.h"
 
 /** \file render.h */
 
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index 411274a1..fb532dc9 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -34,6 +34,7 @@
 #include <math.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libcrystfel/src/xds.c b/libcrystfel/src/xds.c
index ab6335db..03e01179 100644
--- a/libcrystfel/src/xds.c
+++ b/libcrystfel/src/xds.c
@@ -56,7 +56,6 @@
 #include "image.h"
 #include "utils.h"
 #include "peaks.h"
-#include "detector.h"
 #include "cell-utils.h"
 
 /** \file xds.h */
diff --git a/src/cell_explorer.c b/src/cell_explorer.c
index 5648ac3c..e481f85e 100644
--- a/src/cell_explorer.c
+++ b/src/cell_explorer.c
@@ -1999,8 +1999,6 @@ int main(int argc, char *argv[])
 		struct image cur;
 		int i;
 
-		cur.det = NULL;
-
 		if ( read_chunk(st, &cur, NULL, STREAM_READ_UNITCELL) != 0 ) {
 			break;
 		}
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 660c2ae1..83594585 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -59,8 +59,6 @@
 #endif
 
 #include <events.h>
-#include <hdf5-file.h>
-#include <detector.h>
 
 #include "im-sandbox.h"
 #include "process_image.h"
diff --git a/src/im-zmq.c b/src/im-zmq.c
index 09230938..492b399e 100644
--- a/src/im-zmq.c
+++ b/src/im-zmq.c
@@ -41,11 +41,12 @@
 #include <zmq.h>
 #include <msgpack.h>
 
-#include "events.h"
-#include "image.h"
-#include "hdf5-file.h"
-#include "utils.h"
+#include <events.h>
+#include <image.h>
+#include <utils.h>
+
 #include "im-zmq.h"
+
 #include "datatemplate_priv.h"
 
 
diff --git a/src/indexamajig.c b/src/indexamajig.c
index bff9e90f..2081580b 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -50,23 +50,21 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "utils.h"
-#include "hdf5-file.h"
-#include "index.h"
-#include "peaks.h"
-#include "detector.h"
-#include "filters.h"
-#include "thread-pool.h"
-#include "geometry.h"
-#include "stream.h"
-#include "reflist-utils.h"
-#include "cell-utils.h"
-#include "integration.h"
-#include "taketwo.h"
-#include "im-sandbox.h"
-#include "image.h"
-#include "datatemplate.h"
+#include <utils.h>
+#include <index.h>
+#include <peaks.h>
+#include <filters.h>
+#include <thread-pool.h>
+#include <geometry.h>
+#include <stream.h>
+#include <reflist-utils.h>
+#include <cell-utils.h>
+#include <integration.h>
+#include <taketwo.h>
+#include <image.h>
+#include <datatemplate.h>
 
+#include "im-sandbox.h"
 
 struct indexamajig_arguments
 {
diff --git a/src/partialator.c b/src/partialator.c
index b7641d08..959548d1 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -1378,7 +1378,6 @@ int main(int argc, char *argv[])
 
 		cur.div = NAN;
 		cur.bw = NAN;
-		cur.det = NULL;
 		if ( read_chunk(st, &cur, NULL,
 		                STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL) != 0 )
 		{
diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 9a144a36..2f9a228e 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -48,7 +48,6 @@
 #include "cell.h"
 #include "cell-utils.h"
 #include "utils.h"
-#include "hdf5-file.h"
 #include "detector.h"
 #include "peaks.h"
 #include "symmetry.h"
diff --git a/src/process_hkl.c b/src/process_hkl.c
index ec980db1..4e1b71cf 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -426,8 +426,6 @@ static int merge_all(Stream *st, RefList *model, RefList *reference,
 		struct image image;
 		int i;
 
-		image.det = NULL;
-
 		/* Get data from next chunk */
 		rval = read_chunk(st, &image, NULL,
 		                  STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL);
diff --git a/src/process_image.c b/src/process_image.c
index 1d8def8b..2c4ec61c 100644
--- a/src/process_image.c
+++ b/src/process_image.c
@@ -40,23 +40,23 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "utils.h"
-#include "hdf5-file.h"
-#include "index.h"
-#include "peaks.h"
-#include "filters.h"
-#include "thread-pool.h"
-#include "geometry.h"
-#include "stream.h"
-#include "reflist-utils.h"
+#include <utils.h>
+#include <index.h>
+#include <peaks.h>
+#include <filters.h>
+#include <thread-pool.h>
+#include <geometry.h>
+#include <stream.h>
+#include <reflist-utils.h>
+#include <integration.h>
+#include <detgeom.h>
+#include <image-msgpack.h>
+
 #include "process_image.h"
-#include "integration.h"
 #include "predict-refine.h"
 #include "im-sandbox.h"
-#include "time-accounts.h"
 #include "im-zmq.h"
-#include "detgeom.h"
-
+#include "time-accounts.h"
 
 static float **backup_image_data(float **dp, struct detgeom *det)
 {
diff --git a/src/whirligig.c b/src/whirligig.c
index 843403ec..9a8dd07f 100644
--- a/src/whirligig.c
+++ b/src/whirligig.c
@@ -718,7 +718,6 @@ int main(int argc, char *argv[])
 
 		cur.div = NAN;
 		cur.bw = NAN;
-		cur.det = NULL;
 		if ( read_chunk(st, &cur, NULL,
 		                STREAM_READ_REFLECTIONS | STREAM_READ_UNITCELL) != 0 )
 		{