diff --git a/system/camerad/cameras/camera_common.h b/system/camerad/cameras/camera_common.h
index 0536ecc7f3..f745300e1c 100644
--- a/system/camerad/cameras/camera_common.h
+++ b/system/camerad/cameras/camera_common.h
@@ -11,11 +11,6 @@
 
 const int YUV_BUFFER_COUNT = 20;
 
-// for debugging
-const bool env_debug_frames = getenv("DEBUG_FRAMES") != NULL;
-const bool env_log_raw_frames = getenv("LOG_RAW_FRAMES") != NULL;
-const bool env_ctrl_exp_from_params = getenv("CTRL_EXP_FROM_PARAMS") != NULL;
-
 typedef struct FrameMetadata {
   uint32_t frame_id;
   uint32_t request_id;
diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index 3b2b9db330..9785ceef9b 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -25,6 +25,11 @@
 
 ExitHandler do_exit;
 
+// for debugging
+const bool env_debug_frames = getenv("DEBUG_FRAMES") != nullptr;
+const bool env_log_raw_frames = getenv("LOG_RAW_FRAMES") != nullptr;
+const bool env_ctrl_exp_from_params = getenv("CTRL_EXP_FROM_PARAMS") != nullptr;
+
 
 // high level camera state
 class CameraState : public SpectraCamera {