diff --git a/spectral/dispatcher/inc/spectral_ioctl.h b/spectral/dispatcher/inc/spectral_ioctl.h
index 19c58b2407..c015c7cb71 100644
--- a/spectral/dispatcher/inc/spectral_ioctl.h
+++ b/spectral/dispatcher/inc/spectral_ioctl.h
@@ -85,11 +85,20 @@ struct spectral_ioctl_params {
 	uint16_t spectral_pri;
 };
 
-struct ath_spectral_caps {
+/**
+ * struct spectral_caps - Spectral capabilities structure
+ * @phydiag_cap:         Phydiag capability
+ * @radar_cap:           Radar detection capability
+ * @spectral_cap:        Spectral capability
+ * @advncd_spectral_cap: Advanced spectral capability
+ * @hw_gen: Spectral hw generation
+ */
+struct spectral_caps {
 	uint8_t phydiag_cap;
 	uint8_t radar_cap;
 	uint8_t spectral_cap;
 	uint8_t advncd_spectral_cap;
+	uint32_t hw_gen;
 };
 
 #define SPECTRAL_IOCTL_PARAM_NOVAL (65535)
diff --git a/spectral/dispatcher/inc/wlan_spectral_public_structs.h b/spectral/dispatcher/inc/wlan_spectral_public_structs.h
index 3217811bb6..3d39a66805 100644
--- a/spectral/dispatcher/inc/wlan_spectral_public_structs.h
+++ b/spectral/dispatcher/inc/wlan_spectral_public_structs.h
@@ -19,6 +19,7 @@
 
 #include <qdf_types.h>
 #include "wlan_dfs_ioctl.h"
+#include <spectral_ioctl.h>
 
 #ifndef _WLAN_SPECTRAL_PUBLIC_STRUCTS_H_
 #define _WLAN_SPECTRAL_PUBLIC_STRUCTS_H_
@@ -43,31 +44,6 @@
 /* 5 categories x (lower + upper) bands */
 #define MAX_INTERF                   10
 
-/* ioctl parameter types */
-#define SPECTRAL_PARAM_FFT_PERIOD        (1)
-#define SPECTRAL_PARAM_SCAN_PERIOD       (2)
-#define SPECTRAL_PARAM_SCAN_COUNT        (3)
-#define SPECTRAL_PARAM_SHORT_REPORT      (4)
-#define SPECTRAL_PARAM_SPECT_PRI         (5)
-#define SPECTRAL_PARAM_FFT_SIZE          (6)
-#define SPECTRAL_PARAM_GC_ENA            (7)
-#define SPECTRAL_PARAM_RESTART_ENA       (8)
-#define SPECTRAL_PARAM_NOISE_FLOOR_REF   (9)
-#define SPECTRAL_PARAM_INIT_DELAY        (10)
-#define SPECTRAL_PARAM_NB_TONE_THR       (11)
-#define SPECTRAL_PARAM_STR_BIN_THR       (12)
-#define SPECTRAL_PARAM_WB_RPT_MODE       (13)
-#define SPECTRAL_PARAM_RSSI_RPT_MODE     (14)
-#define SPECTRAL_PARAM_RSSI_THR          (15)
-#define SPECTRAL_PARAM_PWR_FORMAT        (16)
-#define SPECTRAL_PARAM_RPT_MODE          (17)
-#define SPECTRAL_PARAM_BIN_SCALE         (18)
-#define SPECTRAL_PARAM_DBM_ADJ           (19)
-#define SPECTRAL_PARAM_CHN_MASK          (20)
-#define SPECTRAL_PARAM_ACTIVE            (21)
-#define SPECTRAL_PARAM_STOP              (22)
-#define SPECTRAL_PARAM_ENABLE            (23)
-
 #ifdef SPECTRAL_USE_EMU_DEFAULTS
 /* Use defaults from emulation */
 #define SPECTRAL_SCAN_ACTIVE_DEFAULT           (0x0)
@@ -224,22 +200,6 @@ struct spectral_diag_stats {
 	uint64_t spectral_vhtseg2id_mismatch;
 };
 
-/**
- * struct spectral_caps - Spectral capabilities structure
- * @phydiag_cap:         Phydiag capability
- * @radar_cap:           Radar detection capability
- * @spectral_cap:        Spectral capability
- * @advncd_spectral_cap: Advanced spectral capability
- * @hw_gen: Spectral hw generation
- */
-struct spectral_caps {
-	uint8_t phydiag_cap;
-	uint8_t radar_cap;
-	uint8_t spectral_cap;
-	uint8_t advncd_spectral_cap;
-	uint32_t hw_gen;
-};
-
 /**
  * struct spectral_config - spectral config parameters
  * @ss_fft_period:        Skip interval for FFT reports