diff --git a/.gitignore b/.gitignore
index 68a7a13b..fa45a2df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,5 +35,5 @@ Thumbs.db
 .vscode/
 
 lib/
-include/
+include/darknet/
 share/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 585eb0ed..75861f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,8 @@ configure_file(
 )
 
 set(ENABLE_CUDA "TRUE" CACHE BOOL "Enable CUDA build")
+set(ENABLE_CUDNN "FALSE" CACHE BOOL "Enable CUDNN")
+set(ENABLE_OPENMP "TRUE" CACHE BOOL "Enable OpenMP")
 if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
   set(ENABLE_CUDA "FALSE" CACHE BOOL "Enable CUDA build" FORCE)
   message(WARNING "To build with CUDA support you need CMake 3.8.0+")
@@ -146,6 +148,7 @@ if(ENABLE_CUDA)
   find_package(CUDNN)
   if(CUDNN_FOUND)
     add_definitions(-DCUDNN)
+    set(ENABLE_CUDNN "TRUE" CACHE BOOL "Enable CUDNN" FORCE)
     if(CUDA_COMPUTE_MODEL VERSION_GREATER_EQUAL ${CUDA_COMPUTE_MODEL_70})
       add_definitions(-DCUDNN_HALF)
       message(STATUS "Enabled CUDNN_HALF")
@@ -213,6 +216,8 @@ else()
   find_package(OpenMP)
   if(OPENMP_FOUND)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+  else()
+    set(ENABLE_OPENMP "FALSE" CACHE BOOL "Enable OpenMP" FORCE)
   endif()
 endif()
 
@@ -276,7 +281,7 @@ if(OpenCV_FOUND AND OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRA
   add_executable(uselib_track ${CMAKE_CURRENT_LIST_DIR}/src/yolo_console_dll.cpp)
   target_compile_definitions(uselib_track PRIVATE TRACK_OPTFLOW=1)
   set_target_properties(uselib_track PROPERTIES LINKER_LANGUAGE CXX)
-  target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
+  target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
   target_link_libraries(uselib_track PRIVATE ${OpenCV_LIBS})
 endif()
 
@@ -287,9 +292,9 @@ add_executable(darknet ${CMAKE_CURRENT_LIST_DIR}/src/darknet.c ${sources} ${head
 set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/src/darknet.c PROPERTIES LANGUAGE CXX)
 set_target_properties(darknet PROPERTIES LINKER_LANGUAGE CXX)
 
-target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
-target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
-target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
+target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
+target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
+target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include/darknet> $<BUILD_INTERFACE:${Stb_INCLUDE_DIR}>)
 
 if(CUDNN_FOUND)
   target_link_libraries(darknet PRIVATE CuDNN::CuDNN)
@@ -344,7 +349,7 @@ install(TARGETS darklib EXPORT DarknetTargets
   RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
   ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-  PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+  PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/darknet"
   COMPONENT dev
 )
 install(TARGETS uselib darknet
diff --git a/DarknetConfig.cmake.in b/DarknetConfig.cmake.in
index 2c137516..2719ef5c 100644
--- a/DarknetConfig.cmake.in
+++ b/DarknetConfig.cmake.in
@@ -1,26 +1,21 @@
 # Config file for the Darknet package
-# It defines the following variables
-#  Darknet_INCLUDE_DIRS - include directories for Darknet
-#  Darknet_LIBRARIES    - libraries to link against
 
-# Compute paths
 get_filename_component(Darknet_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(Darknet_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
 list(APPEND CMAKE_MODULE_PATH "${Darknet_CMAKE_DIR}")
 
 include(CMakeFindDependencyMacro)
 
 if(@ENABLE_OPENCV@)
-  find_dependency(OpenCV REQUIRED)
+  find_dependency(OpenCV)
   add_definitions(-DOPENCV)
 endif()
 
-find_dependency(Stb REQUIRED)
+find_dependency(Stb)
 
 if(@ENABLE_CUDA@)
-  find_dependency(CUDNN)
   add_definitions(-DGPU)
-  if(CUDNN_FOUND)
+  if(@ENABLE_CUDNN@)
+    find_dependency(CUDNN)
     add_definitions(-DCUDNN)
     if(@CUDA_COMPUTE_MODEL@ VERSION_GREATER_EQUAL @CUDA_COMPUTE_MODEL_70@)
       add_definitions(-DCUDNN_HALF)
@@ -36,12 +31,10 @@ if(MSVC)
   find_dependency(PThreads_windows)
 endif()
 
-if("${CMAKE_VERSION}" VERSION_GREATER "3.9.0")
+if(@ENABLE_OPENMP@)
   find_dependency(OpenMP)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 
 # Our library dependencies (contains definitions for IMPORTED targets)
 include("${Darknet_CMAKE_DIR}/DarknetTargets.cmake")
-
-# These are IMPORTED targets created by DarknetTargets.cmake
-set(Darknet_LIBRARIES darklib)