diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake
index fbf744aa48a..ebe05936859 100644
--- a/cmake/configs/posix_eagle_release.cmake
+++ b/cmake/configs/posix_eagle_release.cmake
@@ -4,8 +4,6 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linu
 
 set(CONFIG_SHMEM "1")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_SHMEM")
-
 include(${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon/qurt_app.cmake)
 
 set(config_module_list
diff --git a/src/platforms/posix/px4_layer/CMakeLists.txt b/src/platforms/posix/px4_layer/CMakeLists.txt
index a4f533d7bd7..d80b6083ad9 100644
--- a/src/platforms/posix/px4_layer/CMakeLists.txt
+++ b/src/platforms/posix/px4_layer/CMakeLists.txt
@@ -35,6 +35,8 @@ if("${CONFIG_SHMEM}" STREQUAL "1")
 	list(APPEND SHMEM_SRCS
 		shmem_posix.c
 	)
+	# TODO: This didn't seem to be tracked correctly from posix_eagle_release.cmake
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCONFIG_SHMEM")
 endif()
 
 px4_add_module(
@@ -52,4 +54,4 @@ px4_add_module(
 	DEPENDS
 		platforms__common
 	)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix : 
+# vim: set noet ft=cmake fenc=utf-8 ff=unix :
diff --git a/src/platforms/posix/px4_layer/px4_posix_impl.cpp b/src/platforms/posix/px4_layer/px4_posix_impl.cpp
index 074afc1f419..6adeb397317 100644
--- a/src/platforms/posix/px4_layer/px4_posix_impl.cpp
+++ b/src/platforms/posix/px4_layer/px4_posix_impl.cpp
@@ -58,7 +58,7 @@ __BEGIN_DECLS
 
 long PX4_TICKS_PER_SEC = sysconf(_SC_CLK_TCK);
 
-#ifdef ENABLE_SHMEM
+#ifdef CONFIG_SHMEM
 extern void init_params(void);
 #endif
 
@@ -77,7 +77,7 @@ void init_once(void)
 	hrt_work_queue_init();
 	hrt_init();
 
-#ifdef ENABLE_SHMEM
+#ifdef CONFIG_SHMEM
 	PX4_INFO("Syncing params to shared memory\n");
 	init_params();
 #endif