diff --git a/Makefile b/Makefile
index 7f647342d34fae1fae6c9239ac05b4cca32db1f2..451a5a6614eecd8f623b134b554edf5fd042c17d 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,9 @@ install: all
 	mkdir -pv "$(DESTDIR)/include"
 	cp -rv "include"/* "$(DESTDIR)/include"
 	cp -rv "target/include"/* "$(DESTDIR)/include"
-	cp -rv "target/openlibm/include"/* "$(DESTDIR)/include"
-	cp -rv "target/openlibm/src"/*.h "$(DESTDIR)/include"
 	cp -v "$(BUILD)/debug/libc.a" "$(DESTDIR)/lib"
 	cp -v "$(BUILD)/debug/crt0.o" "$(DESTDIR)/lib"
-	cp -v "$(BUILD)/openlibm/libopenlibm.a" "$(DESTDIR)/lib/libm.a"
+	$(MAKE) -C openlibm install
 
 libc: $(BUILD)/debug/libc.a $(BUILD)/debug/crt0.o
 
diff --git a/include/bits/stdio.h b/include/bits/stdio.h
index 506ff549e369cfae666513b76698050a4966847d..a4e2578d5d279f5cbb9e461e86468d2f431574af 100644
--- a/include/bits/stdio.h
+++ b/include/bits/stdio.h
@@ -2,6 +2,7 @@
 #define _BITS_STDIO_H
 
 #define EOF (-1)
+#define BUFSIZ 1024
 #define stdin __stdin()
 #define stdout __stdout()
 #define stderr __stderr()
diff --git a/include/math.h b/include/math.h
index a228a4fafac59ee95af56692abffbc9be0719b33..5ce9f25af7bb3ffa55b39cfee699360b541a50a2 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1 +1,2 @@
+#define OPENLIBM_USE_HOST_FENV_H 1
 #include <openlibm.h>
diff --git a/include/stdint.h b/include/stdint.h
index b02e58916ba17779d3151611dfe315d22094cf8a..a68af25e36a94eabb1135f9dbffc8aad4f45cefb 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -5,41 +5,57 @@
 #define INT8_MIN -0x80
 #define INT8_MAX 0x7F
 typedef signed char int8_t;
+typedef signed char int_least8_t;
+typedef signed char int_fast8_t;
 
 #define UINT8_C(value) ((uint8_t) value ## U)
 #define UINT8_MIN 0x00
 #define UINT8_MAX 0xFF
 typedef unsigned char uint8_t;
+typedef unsigned char uint_least8_t;
+typedef unsigned char uint_fast8_t;
 
 #define INT16_C(value) value
 #define INT16_MIN -0x8000
 #define INT16_MAX 0x7FFF
 typedef signed short int16_t;
+typedef signed short int_least16_t;
+typedef signed short int_fast16_t;
 
 #define UINT16_C(value) value ## U
 #define UINT16_MIN 0x0000
 #define UINT16_MAX 0xFFFF
 typedef unsigned short uint16_t;
+typedef unsigned short uint_least16_t;
+typedef unsigned short uint_fast16_t;
 
 #define INT32_C(value) value ## L
 #define INT32_MIN -0x80000000
 #define INT32_MAX 0x7FFFFFFF
 typedef signed long int32_t;
+typedef signed long int_least32_t;
+typedef signed long int_fast32_t;
 
 #define UINT32_C(value) value ## UL
 #define UINT32_MIN 0x00000000
 #define UINT32_MAX 0xFFFFFFFF
 typedef unsigned long uint32_t;
+typedef unsigned long uint_least32_t;
+typedef unsigned long uint_fast32_t;
 
 #define INT64_C(value) value ## LL
 #define INT64_MIN -0x8000000000000000
 #define INT64_MAX 0x7FFFFFFFFFFFFFFF
 typedef signed long long int64_t;
+typedef signed long long int_least64_t;
+typedef signed long long int_fast64_t;
 
 #define UINT64_C(value) value ## ULL
 #define UINT64_MIN 0x0000000000000000
 #define UINT64_MAX 0xFFFFFFFFFFFFFFFF
 typedef unsigned long long uint64_t;
+typedef unsigned long long uint_least64_t;
+typedef unsigned long long uint_fast64_t;
 
 #define INTMAX_C(value) value ## LL
 #define INTMAX_MIN INT64_MIN
@@ -61,4 +77,6 @@ typedef uint64_t uintptr_t;
 
 #define SIZE_MAX UINT64_MAX
 
+typedef int sig_atomic_t;
+
 #endif /* _STDINT_H */