diff --git a/Makefile.am b/Makefile.am
index f40c2fe8b2eef7c99a5e0afe9cfdf4f163cab4e6..ed97f15bacc33e5c8b0998d35af8cdf7cf4b86a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -358,7 +358,9 @@ nobase_elpa_include_HEADERS = \
   elpa/elpa_legacy.h
 
 nobase_nodist_elpa_include_HEADERS = \
-  elpa/elpa_constants.h
+  elpa/elpa_constants.h \
+  elpa/elpa_generated.h \
+  elpa/elpa_generated_legacy.h
 
 dist_man_MANS = \
   man/elpa2_print_kernels.1 \
diff --git a/generated_headers.am b/generated_headers.am
index 4325e12f03dc2d83603730076f16a4e3a8acc391..fea7558c819c373971adae6a78a9ee0c874e1bc5 100644
--- a/generated_headers.am
+++ b/generated_headers.am
@@ -35,14 +35,14 @@ test/shared/generated.h: $(wildcard $(top_srcdir)/test/shared/*.*90) | test/shar
 	@rm -f $@
 	$(call extract_interface,!c>)
 
-generated_headers += elpa/elpa_generated_fortran_interfaces.h
-elpa/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2/kernels/*.*c $(top_srcdir)/src/elpa2/kernels/*.s $(top_srcdir)/src/*.[ch]) | elpa
+generated_headers += src/elpa_generated_fortran_interfaces.h
+src/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2/kernels/*.*c $(top_srcdir)/src/elpa2/kernels/*.s $(top_srcdir)/src/*.[ch]) | src
 	@rm -f $@
 	$(call extract_interface,!f>)
 	$(call extract_interface,#!f>)
 
-generated_headers += elpa/elpa_generated_public_fortran_interfaces.h
-elpa/elpa_generated_public_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/*.[ch]) | elpa
+generated_headers += src/elpa_generated_public_fortran_interfaces.h
+src/elpa_generated_public_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/*.[ch]) | src
 	@rm -f $@
 	$(call extract_interface,!pf>)
 
diff --git a/src/elpa_api.F90 b/src/elpa_api.F90
index a83e501985907fb5b79eb46fa9f3c2cca1bda0d1..474f32e0c4ead5e421e0a90b81ed68dddd1f555d 100644
--- a/src/elpa_api.F90
+++ b/src/elpa_api.F90
@@ -54,7 +54,7 @@ module elpa_api
   use, intrinsic :: iso_c_binding
   implicit none
 
-#include "elpa/elpa_generated_public_fortran_interfaces.h"
+#include "src/elpa_generated_public_fortran_interfaces.h"
 
   integer, private, parameter :: earliest_api_version = EARLIEST_API_VERSION !< Definition of the earliest API version supported
                                                                              !< with the current release
diff --git a/src/elpa_generated_fortran_interfaces.F90 b/src/elpa_generated_fortran_interfaces.F90
index 01cc923557da2418fdb33605d8a5a134f0cb04b1..be7108f2b1f4fbb7fc6c7d87ad93bf5e79f6064f 100644
--- a/src/elpa_generated_fortran_interfaces.F90
+++ b/src/elpa_generated_fortran_interfaces.F90
@@ -52,6 +52,6 @@ module elpa_generated_fortran_interfaces
   use iso_c_binding
   implicit none
 
-#include "elpa/elpa_generated_fortran_interfaces.h"
+#include "src/elpa_generated_fortran_interfaces.h"
 
 end module