diff --git a/src/tools/chdman.c b/src/tools/chdman.c
index 08b71cd858a..4ed70853c95 100644
--- a/src/tools/chdman.c
+++ b/src/tools/chdman.c
@@ -873,7 +873,7 @@ static avi_error read_avi_frame(avi_file *avi, UINT32 framenum, UINT32 first_sam
 	/* read the video data when we hit a new frame */
 	if (framenum % interlace_factor == 0)
 	{
-		avierr = avi_read_video_frame_yuy16(avi, framenum / interlace_factor, fullbitmap);
+		avierr = avi_read_video_frame_yuy16(avi, framenum / interlace_factor, *fullbitmap);
 		if (avierr != AVIERR_NONE)
 			goto cleanup;
 	}
@@ -1965,7 +1965,7 @@ static int do_extractav(int argc, char *argv[], int param)
 		/* write video */
 		if (!interlaced || (firstframe + framenum) % 2 == 1)
 		{
-			avierr = avi_append_video_frame_yuy16(avi, fullbitmap);
+			avierr = avi_append_video_frame_yuy16(avi, *fullbitmap);
 			if (avierr != AVIERR_NONE)
 			{
 				fprintf(stderr, "Error writing video for hunk %d to AVI file: %s\n", firstframe + framenum, avi_error_string(avierr));
diff --git a/src/tools/ldverify.c b/src/tools/ldverify.c
index 63f7adc7b6a..081e8a8a1a6 100644
--- a/src/tools/ldverify.c
+++ b/src/tools/ldverify.c
@@ -825,9 +825,9 @@ int main(int argc, char *argv[])
 
 	/* loop over frames */
 	frame = 0;
-	while (isavi ? read_avi(file, frame, bitmap, lsound, rsound, &samples) : read_chd(file, frame, bitmap, lsound, rsound, &samples))
+	while (isavi ? read_avi(file, frame, *bitmap, lsound, rsound, &samples) : read_chd(file, frame, *bitmap, lsound, rsound, &samples))
 	{
-		verify_video(&video, frame, bitmap);
+		verify_video(&video, frame, *bitmap);
 		verify_audio(&audio, lsound, rsound, samples);
 		frame++;
 	}
@@ -836,7 +836,7 @@ int main(int argc, char *argv[])
 	isavi ? close_avi(file) : close_chd(file);
 
 	/* final output */
-	verify_video_final(&video, frame, bitmap);
+	verify_video_final(&video, frame, *bitmap);
 	verify_audio_final(&audio);
 
 	/* free memory */
diff --git a/src/tools/regrep.c b/src/tools/regrep.c
index a8fb8fa79f0..d5180ce3ad2 100644
--- a/src/tools/regrep.c
+++ b/src/tools/regrep.c
@@ -1002,7 +1002,7 @@ static int generate_png_diff(const summary_file *curfile, const astring *destdir
 	filerr = core_fopen(astring_c(dstfilename), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &file);
 	if (filerr != FILERR_NONE)
 		goto error;
-	pngerr = png_write_bitmap(file, NULL, finalbitmap, 0, NULL);
+	pngerr = png_write_bitmap(file, NULL, *finalbitmap, 0, NULL);
 	core_fclose(file);
 	if (pngerr != PNGERR_NONE)
 		goto error;