diff --git a/src/sst/elements/thornhill/Makefile.am b/src/sst/elements/thornhill/Makefile.am
index 2aca682273..1da4510a60 100644
--- a/src/sst/elements/thornhill/Makefile.am
+++ b/src/sst/elements/thornhill/Makefile.am
@@ -5,19 +5,23 @@
 AM_CPPFLAGS = $(MPI_CPPFLAGS) \
 	-I$(top_srcdir)/src
 
+
 compdir = $(pkglibdir)
 comp_LTLIBRARIES = libthornhill.la
 
+sstdir = $(includedir)/sst/elements/thornhill
+
 libthornhill_la_SOURCES = \
 	libthornhill.cc\
-	detailedCompute.h\
 	memoryHeap.h\
 	memoryHeap.cc\
-	memoryHeapLink.h\
 	singleThread.h\
+	singleThread.cc
+
+nobase_sst_HEADERS = \
+    detailedCompute.h \
 	memoryHeapEvent.h\
-	memoryHeapLink.h\
-	singleThread.cc\
+	memoryHeapLink.h \
 	types.h
 
 libthornhill_la_LDFLAGS = -module -avoid-version