diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceb4b2c5b..7cd567a67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,11 +266,12 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
-
-IF(BUILD_OPENMW OR BUILD_OPENCS)
-
+if(BUILD_OPENMW OR BUILD_OPENCS OR BUILD_OPENMW_MP)
     find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow)
     include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
+endif()
+
+IF(BUILD_OPENMW OR BUILD_OPENCS)
 
     set(USED_OSG_PLUGINS
                     osgdb_bmp
@@ -648,7 +649,6 @@ endif(WIN32)
 # Extern
 IF(BUILD_OPENMW OR BUILD_OPENCS)
 set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries")
-
 add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL)
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
diff --git a/cmake/FindLuaJit.cmake b/cmake/FindLuaJit.cmake
index 1004e52ec..9bc5ceb25 100644
--- a/cmake/FindLuaJit.cmake
+++ b/cmake/FindLuaJit.cmake
@@ -7,6 +7,7 @@ include(LibFindMacros)
 
 libfind_pkg_detect(LuaJit luajit
         FIND_PATH luajit.h
+        PATH_SUFFIXES luajit
         FIND_LIBRARY NAMES luajit-5.1 luajit
         )
 
diff --git a/cmake/FindRakNet.cmake b/cmake/FindRakNet.cmake
index 27a22e823..a1d4c8f76 100644
--- a/cmake/FindRakNet.cmake
+++ b/cmake/FindRakNet.cmake
@@ -18,7 +18,7 @@ FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
     $ENV{RAKNET_ROOT}/lib
     )
 	
-FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStatic
+FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStaticd
     PATHS
     ENV LD_LIBRARY_PATH
     ENV LIBRARY_PATH
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index 4f2be8c42..dd84d7973 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -60,6 +60,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+include(LibFindMacros)
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(_sdl_lib_suffix lib/x64)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0481b9439..da22066ba 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -91,9 +91,11 @@ add_component_dir (misc
     gcd constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
     )
 
-add_component_dir (debug
-    debugging debuglog
-    )
+if (BUILD_OPENMW OR BUILD_OPENCS)
+    add_component_dir(debug
+            debugging debuglog
+            )
+endif ()
 
 IF(NOT WIN32 AND NOT APPLE)
     add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")
@@ -217,28 +219,32 @@ add_component_dir (fallback
     )
 
 if(NOT WIN32 AND NOT ANDROID)
-    add_component_dir (crashcatcher
-        crashcatcher
-    )
+    if (BUILD_OPENMW OR BUILD_OPENCS)
+        add_component_dir (crashcatcher
+            crashcatcher
+        )
+    endif()
 endif()
 
-add_component_dir(detournavigator
-    debug
-    makenavmesh
-    findsmoothpath
-    recastmeshbuilder
-    recastmeshmanager
-    cachedrecastmeshmanager
-    navmeshmanager
-    navigatorimpl
-    asyncnavmeshupdater
-    chunkytrimesh
-    recastmesh
-    tilecachedrecastmeshmanager
-    recastmeshobject
-    navmeshtilescache
-    settings
-    )
+add_component_dir(settings)
+
+if (BUILD_OPENMW OR BUILD_OPENCS)
+    add_component_dir(detournavigator
+            makenavmesh
+            findsmoothpath
+            recastmeshbuilder
+            recastmeshmanager
+            cachedrecastmeshmanager
+            navmeshmanager
+            navigatorimpl
+            asyncnavmeshupdater
+            chunkytrimesh
+            recastmesh
+            tilecachedrecastmeshmanager
+            recastmeshobject
+            navmeshtilescache
+            )
+endif()
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
@@ -303,11 +309,15 @@ target_link_libraries(components
     ${OPENGL_gl_LIBRARY}
     ${MyGUI_LIBRARIES}
     ${BSAOPTHASH_LIBRARIES}
-    RecastNavigation::DebugUtils
-    RecastNavigation::Detour
-    RecastNavigation::Recast
     )
 
+if (BUILD_OPENMW OR BUILD_OPENCS)
+    target_link_libraries(components
+            RecastNavigation::DebugUtils
+            RecastNavigation::Detour
+            RecastNavigation::Recast)
+endif ()
+
 if (WIN32)
     target_link_libraries(components
     ${Boost_LOCALE_LIBRARY}