diff --git a/src/jtag/core.c b/src/jtag/core.c
index f0f74eb80..5abf832f8 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -953,12 +953,12 @@ int default_interface_jtag_execute_queue(void)
 
 	int result = jtag->jtag_ops->execute_queue();
 
-#if !BUILD_ZY1000
+#if !HAVE_JTAG_MINIDRIVER_H
 	/* Only build this if we use a regular driver with a command queue.
 	 * Otherwise jtag_command_queue won't be found at compile/link time. Its
 	 * definition is in jtag/commands.c, which is only built/linked by
 	 * jtag/Makefile.am if MINIDRIVER_DUMMY || !MINIDRIVER, but those variables
-	 * aren't accessible here. */
+	 * aren't accessible here. Use HAVE_JTAG_MINIDRIVER_H */
 	struct jtag_command *cmd = jtag_command_queue;
 	while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
 		switch (cmd->type) {
diff --git a/src/transport/transport.h b/src/transport/transport.h
index e04f78063..6bf6aaced 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -98,7 +98,7 @@ bool transport_is_dapdirect_jtag(void);
 bool transport_is_dapdirect_swd(void);
 bool transport_is_swim(void);
 
-#if BUILD_HLADAPTER
+#if BUILD_HLADAPTER && !HAVE_JTAG_MINIDRIVER_H
 bool transport_is_hla(void);
 #else
 static inline bool transport_is_hla(void)