diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5973019e4a232b2e74f7c9632b81cdd7d59de237..5715697d7df89aaf516b831a71c360c84ffaaffd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ if(XDMF_WRAP_PYTHON)
         PARENT_SCOPE)
     endif()
 
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${python_name}.py
+    install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${python_name}.py
       DESTINATION lib/python)
     install(TARGETS ${SWIG_MODULE_${python_name}Python_REAL_NAME}
       DESTINATION lib/python)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 53ddbf91a0421b7930d701e4cdcb5eb22c694d81..ee39fa19be1d841d2b05fc3287ddda16d7dc1a26 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -236,6 +236,11 @@ file(GLOB_RECURSE
   "*.hpp" "*.tpp" "*.i"
   "../CMake/VersionSuite/*.hpp")
 file(GLOB LokiHeaders loki/*.h)
+
+set(XdmfCoreHeaders
+      ${XdmfCoreHeaders}
+      ${CMAKE_CURRENT_BINARY_DIR}/XdmfCoreConfig.hpp)
+
 install(FILES ${XdmfCoreHeaders} DESTINATION include)
 install(FILES ${LokiHeaders} DESTINATION include/loki)
 install(TARGETS XdmfCore
diff --git a/utils/XdmfFortran.cpp b/utils/XdmfFortran.cpp
index 2024ec68f23a49a2936c526277becfc0060adc41..51018a01b966eecce998400a978773cf7c62be62 100644
--- a/utils/XdmfFortran.cpp
+++ b/utils/XdmfFortran.cpp
@@ -56,6 +56,7 @@
 #include "XdmfUnstructuredGrid.hpp"
 #include "XdmfWriter.hpp"
 #include "XdmfHDF5Writer.hpp"
+#include "XdmfHDF5Controller.hpp"
 #include "string.h"
 
 #include <stdio.h>