5 files changed, 8 insertions, 5 deletions
diff --git a/volk/gen/make_c.py b/volk/gen/make_c.py
index fa08bbb0e..e946152d0 100644
--- a/volk/gen/make_c.py
+++ b/volk/gen/make_c.py
@@ -28,7 +28,7 @@ def make_c(machines, archs, functions, arched_arglist, my_arglist):
 """
     tempstring += """
 #include <volk/volk_common.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
 #include <volk/volk_typedefs.h>
 #include <volk/volk_cpu.h>
 #include "volk_rank_archs.h"
diff --git a/volk/gen/make_each_machine_c.py b/volk/gen/make_each_machine_c.py
index dfb7011b4..d4f5f01de 100644
--- a/volk/gen/make_each_machine_c.py
+++ b/volk/gen/make_each_machine_c.py
@@ -62,7 +62,7 @@ def make_each_machine_c(machine_name, archs, functions, fcountlist, taglist):
     
     tempstring += """
 #include <volk/volk_common.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
 #include <volk/volk_config_fixed.h>
 
 """
diff --git a/volk/gen/make_machines_c.py b/volk/gen/make_machines_c.py
index ccac21131..a7ab63d6e 100644
--- a/volk/gen/make_machines_c.py
+++ b/volk/gen/make_machines_c.py
@@ -24,7 +24,7 @@ def make_machines_c(machines):
 
 #include <volk/volk_common.h>
 #include <volk/volk_typedefs.h>
-#include <volk/volk_machines.h>
+#include "volk_machines.h"
 
 struct volk_machine *volk_machines[] = {
 """
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py
index ff9749e17..d700626bb 100644
--- a/volk/gen/make_makefile_am.py
+++ b/volk/gen/make_makefile_am.py
@@ -47,6 +47,7 @@ libvolk_la_SOURCES = 	\
 	$(top_gendir)/lib/volk.c			\
 	$(top_gendir)/lib/volk_cpu.c 		\
 	volk_rank_archs.c	\
+	volk_prefs.c	\
 	$(top_gendir)/lib/volk_machines.c
 
 if LV_HAVE_ORC
@@ -101,6 +102,8 @@ noinst_LTLIBRARIES =
 # ----------------------------------------------------------------
 noinst_HEADERS = \
 	$(top_gendir)/lib/volk_init.h \
+	$(top_gendir)/lib/volk_machines.h \
+	$(top_gendir)/lib/volk_environment_init.h \
 	qa_utils.h
 
 # ----------------------------------------------------------------
diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py
index dba364e01..62ebba3c2 100644
--- a/volk/gen/volk_register.py
+++ b/volk/gen/volk_register.py
@@ -44,9 +44,9 @@ outfile_cpu_c = open(os.path.join(gendir, "lib/volk_cpu.c"), "w")
 #outfile_config_in = open(os.path.join(gendir, "include/volk/volk_config.h.in"), "w")
 outfile_config_fixed = open(os.path.join(gendir, "include/volk/volk_config_fixed.h"), "w")
 outfile_environment_c = open(os.path.join(gendir, "lib/volk_environment_init.c"), "w")
-outfile_environment_h = open(os.path.join(gendir, "include/volk/volk_environment_init.h"), "w")
+outfile_environment_h = open(os.path.join(gendir, "lib/volk_environment_init.h"), "w")
 outfile_makefile_am = open(os.path.join(gendir, "lib/Makefile.am"), "w")
-outfile_machines_h = open(os.path.join(gendir, "include/volk/volk_machines.h"), "w")
+outfile_machines_h = open(os.path.join(gendir, "lib/volk_machines.h"), "w")
 outfile_machines_c = open(os.path.join(gendir, "lib/volk_machines.c"), "w")
 infile = open(os.path.join(srcdir, "include/volk/Makefile.am"), "r")