diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8faf514e6..17c3ed15b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ get_poet_version()
 # set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS") add_definitions(${GCC_CXX_FLAGS})
 
 find_package(MPI REQUIRED)
-
+find_package(OpenMP)
 find_package(RRuntime REQUIRED)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc7c1c1ce..c61b8ee04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,6 +39,10 @@ if (POET_PHT_ADDITIONAL_INFO)
   target_compile_definitions(poetlib PRIVATE POET_PHT_ADD)
 endif()
 
+if (OpenMP_FOUND)
+  target_link_libraries(poetlib PUBLIC OpenMP::OpenMP_CXX)
+endif()
+
 file(READ "${PROJECT_SOURCE_DIR}/R_lib/kin_r_library.R" R_KIN_LIB )
 
 configure_file(poet.hpp.in poet.hpp @ONLY)
diff --git a/src/Transport/AdvectionModule.cpp b/src/Transport/AdvectionModule.cpp
index 7636499cb..5635ad29b 100644
--- a/src/Transport/AdvectionModule.cpp
+++ b/src/Transport/AdvectionModule.cpp
@@ -1,5 +1,7 @@
 #include "AdvectionModule.hpp"
 
+#include "../Base/Macros.hpp"
+
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
diff --git a/src/poet.cpp b/src/poet.cpp
index ec16b868d..7f5168482 100644
--- a/src/poet.cpp
+++ b/src/poet.cpp
@@ -23,6 +23,7 @@
 #include "Base/RInsidePOET.hpp"
 #include "Base/SimParams.hpp"
 #include "Chemistry/ChemistryModule.hpp"
+#include "Transport/AdvectionModule.hpp"
 #include "Transport/DiffusionModule.hpp"
 
 #include <poet.hpp>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 01fc0cda1..6d353d8de 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,5 +17,5 @@ add_custom_target(check
 )
 
 add_executable(advection advection/testAdvection.cpp)
-target_include_directories(advection PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
-target_link_libraries(advection poet_lib)
+target_include_directories(advection PRIVATE "${CMAKE_CURRENT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src")
+target_link_libraries(advection poetlib)
diff --git a/test/advection/testAdvection.cpp b/test/advection/testAdvection.cpp
index 136dec371..61bb64b29 100644
--- a/test/advection/testAdvection.cpp
+++ b/test/advection/testAdvection.cpp
@@ -1,5 +1,6 @@
+#include <Transport/AdvectionModule.hpp>
+
 #include <cstddef>
-#include <poet/AdvectionModule.hpp>
 #include <string>
 
 #include "InputFiles.hpp"