diff --git a/Makefile b/Makefile
index b16155a..8cd9144 100644
--- a/Makefile
+++ b/Makefile
@@ -58,11 +58,5 @@ install: all openlibm.pc
 	mkdir -p $(DESTDIR)$(includedir)/openlibm
 	cp -f -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
 	cp -f -a libopenlibm.a $(DESTDIR)$(libdir)/
-	cp -f -a src/openlibm.h $(DESTDIR)$(includedir)/
+	cp -f -a include/openlibm*.h $(DESTDIR)$(includedir)/
 	cp -f -a openlibm.pc $(DESTDIR)$(libdir)/pkgconfig/
-ifneq ($(wildcard $(ARCH)/bsd_asm.h),)
-	cp -f -a $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
-endif
-ifneq ($(wildcard $(ARCH)/bsd_cdefs.h),)
-	cp -f -a $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
-endif
diff --git a/bsdsrc/mathimpl.h b/bsdsrc/mathimpl.h
index 24fc7b8..dca1e6c 100644
--- a/bsdsrc/mathimpl.h
+++ b/bsdsrc/mathimpl.h
@@ -36,7 +36,7 @@
 #include "cdefs-compat.h"
 #include <openlibm.h>
 
-#include "../src/math_private.h"
+#include "math_private.h"
 
 /*
  * TRUNC() is a macro that sets the trailing 27 bits in the mantissa of an
diff --git a/i387/bsd_ieeefp.h b/i387/bsd_ieeefp.h
index 088065e..6c89ad5 100644
--- a/i387/bsd_ieeefp.h
+++ b/i387/bsd_ieeefp.h
@@ -1,2 +1,2 @@
-#include "include/cdefs-compat.h"
-#include "amd64/bsd_ieeefp.h"
\ No newline at end of file
+#include "cdefs-compat.h"
+#include "amd64/bsd_ieeefp.h"
diff --git a/src/openlibm.h b/include/openlibm.h
similarity index 100%
rename from src/openlibm.h
rename to include/openlibm.h
diff --git a/src/openlibm_complex.h b/include/openlibm_complex.h
similarity index 100%
rename from src/openlibm_complex.h
rename to include/openlibm_complex.h
diff --git a/src/openlibm_fenv.h b/include/openlibm_fenv.h
similarity index 100%
rename from src/openlibm_fenv.h
rename to include/openlibm_fenv.h
diff --git a/src/openlibm_fenv_amd64.h b/include/openlibm_fenv_amd64.h
similarity index 100%
rename from src/openlibm_fenv_amd64.h
rename to include/openlibm_fenv_amd64.h
diff --git a/src/openlibm_fenv_arm.h b/include/openlibm_fenv_arm.h
similarity index 100%
rename from src/openlibm_fenv_arm.h
rename to include/openlibm_fenv_arm.h
diff --git a/src/openlibm_fenv_i387.h b/include/openlibm_fenv_i387.h
similarity index 100%
rename from src/openlibm_fenv_i387.h
rename to include/openlibm_fenv_i387.h
diff --git a/include/amd64_fpmath.h b/src/amd64_fpmath.h
similarity index 100%
rename from include/amd64_fpmath.h
rename to src/amd64_fpmath.h
diff --git a/include/cdefs-compat.h b/src/cdefs-compat.h
similarity index 100%
rename from include/cdefs-compat.h
rename to src/cdefs-compat.h
diff --git a/include/fpmath.h b/src/fpmath.h
similarity index 100%
rename from include/fpmath.h
rename to src/fpmath.h
diff --git a/include/i386_fpmath.h b/src/i386_fpmath.h
similarity index 100%
rename from include/i386_fpmath.h
rename to src/i386_fpmath.h
diff --git a/include/types-compat.h b/src/types-compat.h
similarity index 100%
rename from include/types-compat.h
rename to src/types-compat.h