diff --git a/CMakeLists.txt b/CMakeLists.txt
index d976b54..ea78e36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,8 @@ if (DOUBLE_PRECISION)
     add_definitions(-DAC_DOUBLE_PRECISION=1)
 endif ()
 if (MPI_ENABLED)
+    find_package(MPI REQUIRED)
+    include_directories(${MPI_CXX_INCLUDE_DIRS})
     add_definitions(-DAC_MPI_ENABLED=1)
 endif ()
 if (MULTIGPU_ENABLED)
@@ -92,11 +94,6 @@ include_directories(src/common)                                # Common headers
 include_directories(${CMAKE_BINARY_DIR})                       # DSL headers
 include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) # CUDA headers
 
-if (MPI_ENABLED)
-    find_package(MPI REQUIRED)
-    include_directories(${MPI_CXX_INCLUDE_DIRS})
-endif()
-
 ## Subdirectories
 add_subdirectory(src/utils)
 add_subdirectory(src/core/kernels)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 9e2a556..145cd4c 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,12 +6,5 @@ target_link_libraries(astaroth_core astaroth_kernels CUDA::cudart CUDA::cuda_dri
 
 ## Options
 if (MPI_ENABLED)
-    #find_package(MPI REQUIRED)
-    #find_package(OpenMP)
-    #target_link_libraries(astaroth_core MPI::MPI_CXX OpenMP::OpenMP_CXX)
     target_link_libraries(astaroth_core MPI::MPI_CXX)
 endif()
-
-if (MULTIGPU_ENABLED)
-    target_compile_definitions(astaroth_core PRIVATE -DAC_MULTIGPU_ENABLED=1)
-endif ()