diff --git a/Makefile b/Makefile
index 8997d5d70695acf37da0e863270d306de8962a97..bb44785983a5dda602bdb859ec04bd03440874ab 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ obj-y += wrc_main.o
 	$(CC) -include $(AUTOCONF) -E -P $*.ld.S -o $@
 
 
-cflags-y =	-ffreestanding -include $(AUTOCONF) -Iinclude -I. -Isoftpll
+cflags-y =	-ffreestanding -include $(AUTOCONF) -Iinclude/std -Iinclude -I. -Isoftpll
 cflags-y +=	-I$(CURDIR)/pp_printf
 
 cflags-$(CONFIG_PTP_NOPOSIX) += \
diff --git a/include/inttypes.h b/include/std/inttypes.h
similarity index 100%
rename from include/inttypes.h
rename to include/std/inttypes.h
diff --git a/include/stdint.h b/include/std/stdint.h
similarity index 100%
rename from include/stdint.h
rename to include/std/stdint.h