diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 45fe2eb8..bbac7944 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -3,8 +3,14 @@ get_opcode = $(shell grep ^DECLARE_INSN.*\\\<$(2)\\\> $(1) | sed 's/DECLARE_INSN
 
 riscv_subproject_deps = \
 	fdt \
+	disasm \
+	fesvr \
 	softfloat \
 
+riscv_CFLAGS = -fPIC
+
+riscv_install_shared_lib = yes
+
 riscv_install_prog_srcs = \
 
 riscv_hdrs = \
@@ -37,7 +43,31 @@ riscv_hdrs = \
 	csrs.h \
 	triggers.h \
 
-riscv_install_hdrs = mmio_plugin.h
+riscv_install_hdrs = \
+	abstract_device.h \
+	cachesim.h \
+	cfg.h \
+	common.h \
+	csrs.h \
+	debug_module.h \
+	debug_rom_defines.h \
+	decode.h \
+	devices.h \
+	encoding.h \
+	entropy_source.h \
+	isa_parser.h \
+	log_file.h \
+	memtracer.h \
+	mmio_plugin.h \
+	mmu.h \
+	p_ext_macros.h \
+	platform.h \
+	processor.h \
+	sim.h \
+	simif.h \
+	trap.h \
+	triggers.h \
+	v_ext_macros.h \
 
 riscv_precompiled_hdrs = \
 	insn_template.h \
diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in
index a20ab7ee..6e7bbe93 100644
--- a/softfloat/softfloat.mk.in
+++ b/softfloat/softfloat.mk.in
@@ -238,4 +238,11 @@ softfloat_install_shared_lib = yes
 
 softfloat_test_srcs =
 
-softfloat_install_prog_srcs =
+softfloat_install_hdrs = \
+	softfloat.h \
+	softfloat_types.h \
+	primitives.h \
+	internals.h \
+	platform.h \
+	primitiveTypes.h \
+	specialize.h \
diff --git a/spike_main/spike_main.mk.in b/spike_main/spike_main.mk.in
index 35bef398..ec6c8174 100644
--- a/spike_main/spike_main.mk.in
+++ b/spike_main/spike_main.mk.in
@@ -14,3 +14,5 @@ spike_main_install_prog_srcs = \
 spike_main_hdrs = \
 
 spike_main_srcs = \
+
+spike_main_CFLAGS = -fPIC