diff --git a/samples/common.h b/samples/common.h
index f3e3bcf3dc..20be0db9c7 100644
--- a/samples/common.h
+++ b/samples/common.h
@@ -69,3 +69,15 @@ int ReconfigureFlushCallback(void *p_viddec_obj, uint32_t flush_mode, void *p_us
 
     return n_frames_flushed;
 }
+
+int GetEnvVar(const char *name, int &dev_count) {
+    char *v = std::getenv(name);
+    if (v) {
+        char* p_tkn = std::strtok(v, ",");
+        while (p_tkn != nullptr) {
+            dev_count++;
+            p_tkn = strtok(nullptr, ",");
+        }
+    }
+    return dev_count;
+}
\ No newline at end of file
diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt
index 9bff9597fd..b85656f0e0 100644
--- a/samples/videoDecodePerf/CMakeLists.txt
+++ b/samples/videoDecodePerf/CMakeLists.txt
@@ -74,7 +74,7 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND)
                       ${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR})
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
     # rocDecode and utils
-    include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode)
+    include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/..)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY})
     # threads
     set(THREADS_PREFER_PTHREAD_FLAG ON)
diff --git a/samples/videoDecodePerf/videodecodeperf.cpp b/samples/videoDecodePerf/videodecodeperf.cpp
index 89c987b43e..90d4ee1f14 100644
--- a/samples/videoDecodePerf/videodecodeperf.cpp
+++ b/samples/videoDecodePerf/videodecodeperf.cpp
@@ -35,6 +35,7 @@ THE SOFTWARE.
 #endif
 #include "video_demuxer.h"
 #include "roc_video_dec.h"
+#include "common.h"
 
 void DecProc(RocVideoDecoder *p_dec, VideoDemuxer *demuxer, int *pn_frame, double *pn_fps) {
     int n_video_bytes = 0, n_frame_returned = 0, n_frame = 0;
diff --git a/utils/rocvideodecode/roc_video_dec.cpp b/utils/rocvideodecode/roc_video_dec.cpp
index 6b4fed88e4..cda50e334e 100644
--- a/utils/rocvideodecode/roc_video_dec.cpp
+++ b/utils/rocvideodecode/roc_video_dec.cpp
@@ -1104,15 +1104,3 @@ bool RocVideoDecoder::InitHIP(int device_id) {
     HIP_API_CALL(hipStreamCreate(&hip_stream_));
     return true;
 }
-
-int GetEnvVar(const char *name, int &dev_count) {
-    char *v = std::getenv(name);
-    if (v) {
-        char* p_tkn = std::strtok(v, ",");
-        while (p_tkn != nullptr) {
-            dev_count++;
-            p_tkn = strtok(nullptr, ",");
-        }
-    }
-    return dev_count;
-}
diff --git a/utils/rocvideodecode/roc_video_dec.h b/utils/rocvideodecode/roc_video_dec.h
index 408e5f8493..7426a1056c 100644
--- a/utils/rocvideodecode/roc_video_dec.h
+++ b/utils/rocvideodecode/roc_video_dec.h
@@ -158,8 +158,6 @@ typedef struct ReconfigParams_t {
     uint32_t reconfig_flush_mode;
 } ReconfigParams;
 
-int GetEnvVar(const char *name, int &dev_count);
-
 class RocVideoDecoder {
     public:
       /**