7 files changed, 1 insertions, 18 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 */