diff --git a/qla2x00t/qla2x_tgt.h b/qla2x00t/qla2x_tgt.h
index b93a81e78..4a268d704 100644
--- a/qla2x00t/qla2x_tgt.h
+++ b/qla2x00t/qla2x_tgt.h
@@ -20,7 +20,6 @@
  * This should be included only from within qla2xxx module.
  */
 
-
 #ifndef __QLA2X_TGT_H
 #define __QLA2X_TGT_H
 
diff --git a/qla2x00t/qla2x_tgt_def.h b/qla2x00t/qla2x_tgt_def.h
index 707ff1507..0a594f6f3 100644
--- a/qla2x00t/qla2x_tgt_def.h
+++ b/qla2x00t/qla2x_tgt_def.h
@@ -326,12 +326,6 @@ typedef struct
 }ctio_ret_entry_t;
 #endif
 
-enum nexus_wait_type {
-	WAIT_HOST = 0,
-	WAIT_TARGET,
-	WAIT_LUN,
-};
-
 /********************************************************************\
  * Type Definitions used by initiator & target halves
 \********************************************************************/
@@ -356,7 +350,7 @@ struct qla2x_tgt_target
 {
 	int magic;
 
-	/* Callbacks - H/W lock MUST be held while calling any*/
+	/* Callbacks - H/W lock MUST be held while calling any */
 	request_t *(*req_pkt)(scsi_qla_host_t *ha);
 	void (*isp_cmd)(scsi_qla_host_t *ha);
 	void (*enable_lun)(scsi_qla_host_t *ha);
@@ -371,14 +365,4 @@ int qla2xxx_tgt_register_driver(/* IN */  struct qla2x_tgt_initiator *tgt,
 
 void qla2xxx_tgt_unregister_driver(void);
 
-
-/* from qla_os.c for __qla2x00_host_reset in qla_init.c*/
-int
-qla2x00_wait_for_loop_ready(scsi_qla_host_t *ha);
-int
-qla2x00_wait_for_hba_online(scsi_qla_host_t *ha);
-int
-qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha, unsigned int t,
-    unsigned int l, enum nexus_wait_type type);
-
 #endif
diff --git a/qla2x00t/qla_def.h b/qla2x00t/qla_def.h
index 1a1c67623..6c3498752 100644
--- a/qla2x00t/qla_def.h
+++ b/qla2x00t/qla_def.h
@@ -2616,6 +2616,12 @@ typedef struct scsi_qla_host {
 	struct qla_chip_state_84xx *cs84xx;
 } scsi_qla_host_t;
 
+/* Wait type for qla2x00_eh_wait_for_pending_commands() */
+enum nexus_wait_type {
+	WAIT_HOST = 0,
+	WAIT_TARGET,
+	WAIT_LUN,
+};
 
 /*
  * Macros to help code, maintain, etc.
diff --git a/qla2x00t/qla_gbl.h b/qla2x00t/qla_gbl.h
index e5229cdf7..e721301d7 100644
--- a/qla2x00t/qla_gbl.h
+++ b/qla2x00t/qla_gbl.h
@@ -366,4 +366,14 @@ extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
  */
 extern int qla2x00_dfs_setup(scsi_qla_host_t *);
 extern int qla2x00_dfs_remove(scsi_qla_host_t *);
+
+/* from qla_os.c for __qla2x00_host_reset in qla_init.c */
+int
+qla2x00_wait_for_loop_ready(scsi_qla_host_t *ha);
+int
+qla2x00_wait_for_hba_online(scsi_qla_host_t *ha);
+int
+qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha, unsigned int t,
+    unsigned int l, enum nexus_wait_type type);
+
 #endif /* _QLA_GBL_H */