diff --git a/CMakeLists.txt b/CMakeLists.txt
index 082be49c3..4362d9c9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 list(APPEND CMAKE_MODULE_PATH "${POET_SOURCE_DIR}/CMake")
 
-set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS")
-add_definitions(${GCC_CXX_FLAGS})
+# set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS")
+# add_definitions(${GCC_CXX_FLAGS})
 
 find_package(MPI REQUIRED)
 
diff --git a/src/DHT/CMakeLists.txt b/src/DHT/CMakeLists.txt
index 086ec4903..0a0340a7d 100644
--- a/src/DHT/CMakeLists.txt
+++ b/src/DHT/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_library(DHT SHARED DHT.c DHT.h)
 target_include_directories(DHT PRIVATE ${MPI_C_INCLUDE_DIRS})
 target_link_libraries(DHT MPI::MPI_C)
+target_compile_definitions(DHT PUBLIC OMPI_SKIP_MPICXX)
 
 add_library(DHT_Wrapper STATIC DHT_Wrapper.cpp DHT_Wrapper.h)
 target_include_directories(DHT_Wrapper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/model/CMakeLists.txt b/src/model/CMakeLists.txt
index db68f3a5a..a2e770c25 100644
--- a/src/model/CMakeLists.txt
+++ b/src/model/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_library(POET_Model STATIC ChemSim.cpp ChemSim.h ChemMaster.cpp ChemWorker.cpp TransportSim.cpp Grid.cpp)
-target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(POET_Model POET_Util DHT_Wrapper)
\ No newline at end of file
+target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${MPI_C_INCLUDE_DIRS})
+target_link_libraries(POET_Model POET_Util DHT_Wrapper MPI::MPI_C)
+target_compile_definitions(POET_Model PUBLIC OMPI_SKIP_MPICXX)
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index aa6140de3..ea98f6797 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_library(POET_Util STATIC RRuntime.cpp Parser.cpp)
 target_include_directories(POET_Util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${R_INCLUDE_DIRS})
-target_link_libraries(POET_Util ${R_LIBRARIES})
\ No newline at end of file
+target_link_libraries(POET_Util ${R_LIBRARIES})
+target_compile_definitions(POET_Util PUBLIC STRICT_R_HEADERS)
\ No newline at end of file