Index: dolfin/cmake/templates/DOLFINConfig.cmake.in
===================================================================
--- dolfin.orig/cmake/templates/DOLFINConfig.cmake.in	2020-07-07 11:55:57.668386978 +0800
+++ dolfin/cmake/templates/DOLFINConfig.cmake.in	2020-07-07 12:08:06.730579264 +0800
@@ -16,6 +16,12 @@
 # Compute path
 get_filename_component(DOLFIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
+# Include directories
+set(DOLFIN_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@DOLFIN_INCLUDE_DIR@")
+
+# The location of the UseDOLFIN.cmake file
+set(DOLFIN_USE_FILE "${DOLFIN_CMAKE_DIR}/UseDOLFIN.cmake")
+
 # Library dependencies (contains definitions for IMPORTED targets)
 # NOTE: DOLFIN demo CMakeLists.txt are written to be stand-alone, as
 # well as the build system building the demo. Therefore, we need the
@@ -36,9 +42,6 @@
 # Linker flags
 set(DOLFIN_LINK_FLAGS "@CMAKE_EXE_LINKER_FLAGS@")
 
-# Include directories
-set(DOLFIN_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@DOLFIN_INCLUDE_DIR@")
-
 # Third party include directories
 set(DOLFIN_3RD_PARTY_INCLUDE_DIRS "@DOLFIN_DEP_INCLUDE_DIRECTORIES@;@DOLFIN_DEP_SYSTEM_INCLUDE_DIRECTORIES@")
 
@@ -50,6 +53,3 @@
 set(DOLFIN_VERSION_MINOR "@DOLFIN_VERSION_MINOR@")
 set(DOLFIN_VERSION_MICRO "@DOLFIN_VERSION_MICRO@")
 set(DOLFIN_VERSION_STR   "@DOLFIN_VERSION@")
-
-# The location of the UseDOLFIN.cmake file
-set(DOLFIN_USE_FILE "${DOLFIN_CMAKE_DIR}/UseDOLFIN.cmake")