--- a/common/legacy_indexer.c
+++ b/common/legacy_indexer.c
@@ -235,9 +235,11 @@ legacy_openQfaState(QFA_State *s)
 static int
 legacy_updateQfaState(QFA_State *s)
 {
+#ifdef USE_QFA
 	if (gTapeposfd >= 0) {
 		s->cntntrecs += ntrec;
 	}
+#endif
 
 	return 0;
 }
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -1145,7 +1145,9 @@ doslave(int cmd,
 	transformation->startDiskIOProcess(transformation);
 #endif /* HAVE_BLOCK_TRANSFORMATION */
 
+#ifdef USE_QFA
 	indexer->openQfaState(&qfa_state);
+#endif
 
 	/*
 	 * Need our own seek pointer.
@@ -1285,7 +1287,9 @@ doslave(int cmd,
 		ready2 = 0;
 		caught2 = 0;
 
+#ifdef USE_QFA
 		indexer->updateQfa(&qfa_state);
+#endif
 						
 		while (eot_count < 10 && size < bufsize) {
 #ifdef RDUMP
@@ -1339,7 +1343,9 @@ doslave(int cmd,
 		 */
 		(void) kill(nextslave, SIGUSR2);
 
+#ifdef USE_QFA
 		indexer->updateQfaState(&qfa_state);
+#endif
 	}
 
 #ifdef HAVE_BLOCK_TRANSFORMATION
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -95,8 +95,9 @@ listfile(char *name, dump_ino_t ino, int
 		fprintf(stdout, "%10lu\t%ld\t%lld\t%s%c", (unsigned long)ino,
 						tnum, tpos, name, nullflag? '\0':'\n');
 	}
-	else {
+	else
 #endif
+	{
 		 fprintf(stdout, "%10lu\t%s%c", (unsigned long)ino, name,
 						 nullflag? '\0':'\n');
 	}
