diff --git a/umac/dfs/core/src/dfs_ioctl.h b/umac/cmn_services/dfs/inc/dfs_ioctl.h
similarity index 96%
rename from umac/dfs/core/src/dfs_ioctl.h
rename to umac/cmn_services/dfs/inc/dfs_ioctl.h
index cf2e23eb6f..a7451631ef 100644
--- a/umac/dfs/core/src/dfs_ioctl.h
+++ b/umac/cmn_services/dfs/inc/dfs_ioctl.h
@@ -48,6 +48,9 @@
 #define DFS_GET_CAC_VALID_TIME   20
 #define DFS_SET_CAC_VALID_TIME   21
 #define DFS_SHOW_NOLHISTORY      22
+#define DFS_SECOND_SEGMENT_BANGRADAR  23
+#define DFS_SHOW_PRECAC_LISTS    24
+#define DFS_RESET_PRECAC_LISTS   25
 
 /*
  * Spectral IOCTLs use DFS_LAST_IOCTL as the base.
diff --git a/umac/dfs/core/src/dfs.h b/umac/dfs/core/src/dfs.h
index 005f87331f..66cd26b648 100644
--- a/umac/dfs/core/src/dfs.h
+++ b/umac/dfs/core/src/dfs.h
@@ -30,9 +30,9 @@
 #include <qdf_time.h>
 #include <qdf_timer.h>
 
+#include <dfs_ioctl.h>
 #include "dfs_structs.h"
 #include "dfs_channel.h"
-#include "dfs_ioctl.h"
 #include "dfs_ioctl_private.h"
 #include <i_qdf_types.h>     /* For qdf_packed*/
 #include <queue.h>           /* For STAILQ_ENTRY */
diff --git a/umac/dfs/core/src/dfs_zero_cac.h b/umac/dfs/core/src/dfs_zero_cac.h
index 4bb050cc86..e729299219 100644
--- a/umac/dfs/core/src/dfs_zero_cac.h
+++ b/umac/dfs/core/src/dfs_zero_cac.h
@@ -33,10 +33,6 @@
 
 #include "dfs.h"
 
-#define DFS_SECOND_SEGMENT_BANGRADAR  23
-#define DFS_SHOW_PRECAC_LISTS         24
-#define DFS_RESET_PRECAC_LISTS        25
-
 #define VHT160_IEEE_FREQ_DIFF 16
 #define TARGET_TYPE_AR900B    9
 #define TARGET_TYPE_QCA9984   10
diff --git a/umac/dfs/core/src/misc/dfs.c b/umac/dfs/core/src/misc/dfs.c
index 8643acc8a1..1fc944e4c6 100644
--- a/umac/dfs/core/src/misc/dfs.c
+++ b/umac/dfs/core/src/misc/dfs.c
@@ -22,6 +22,7 @@
  * various ioctls to set and get radar detection thresholds.
  */
 
+#include <dfs_ioctl.h>
 #include "../dfs_zero_cac.h"
 #include "wlan_dfs_lmac_api.h"
 #include "wlan_dfs_mlme_api.h"
diff --git a/umac/dfs/core/src/misc/dfs_nol.c b/umac/dfs/core/src/misc/dfs_nol.c
index 025375839f..5543c89cbe 100644
--- a/umac/dfs/core/src/misc/dfs_nol.c
+++ b/umac/dfs/core/src/misc/dfs_nol.c
@@ -26,9 +26,9 @@
  * NOL when its time is up.
  */
 
+#include <dfs_ioctl.h>
 #include "../dfs.h"
 #include "../dfs_channel.h"
-#include "../dfs_ioctl.h"
 #include "../dfs_ioctl_private.h"
 #include "qdf_time.h"
 #include "wlan_dfs_mlme_api.h"