Remove references to trusty_std.h.

Explicitly include the required header files instead.

Also opportunistically reorder includes.

Bug: 110159511
Change-Id: I07f77ea2c6a8d37b3f45d7e4a84e9c4ae82b5eec
diff --git a/app/hwcrypto/caam.c b/app/hwcrypto/caam.c
index 68ae436..014f7ca 100644
--- a/app/hwcrypto/caam.c
+++ b/app/hwcrypto/caam.c
@@ -27,7 +27,6 @@
  */
 
 #include <assert.h>
-#include <uapi/err.h>
 #include <lk/err_ptr.h>
 #include <malloc.h>
 #include <openssl/hkdf.h>
@@ -36,8 +35,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <trusty_std.h>
-#include <uapi/mm.h>
+#include <sys/mman.h>
+#include <uapi/err.h>
 
 #include "caam.h"
 #include <imx-regs.h>
diff --git a/app/hwcrypto/common.h b/app/hwcrypto/common.h
index 8b43543..c97b9c3 100644
--- a/app/hwcrypto/common.h
+++ b/app/hwcrypto/common.h
@@ -18,7 +18,7 @@
 
 #include <lk/compiler.h>
 #include <sys/types.h>
-#include <trusty_std.h>
+#include <trusty_ipc.h>
 
 typedef void (*event_handler_proc_t) (const uevent_t *ev, void *ctx);
 
diff --git a/app/hwcrypto/hwkey_srv.c b/app/hwcrypto/hwkey_srv.c
index 705243d..d9ec2f2 100644
--- a/app/hwcrypto/hwkey_srv.c
+++ b/app/hwcrypto/hwkey_srv.c
@@ -16,13 +16,13 @@
 
 #include <assert.h>
 #include <lk/compiler.h>
-#include <uapi/err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <trusty_ipc.h>
+#include <uapi/err.h>
 
-#include <trusty_std.h>
 #include <interface/hwkey/hwkey.h>
 
 #include "common.h"
diff --git a/app/hwcrypto/hwkey_srv_provider.c b/app/hwcrypto/hwkey_srv_provider.c
index a9da86b..9f55de7 100644
--- a/app/hwcrypto/hwkey_srv_provider.c
+++ b/app/hwcrypto/hwkey_srv_provider.c
@@ -16,13 +16,12 @@
  */
 
 #include <assert.h>
-#include <uapi/err.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <uapi/err.h>
 
-#include <trusty_std.h>
 #include <interface/hwkey/hwkey.h>
 #include <openssl/cipher.h>
 #include <openssl/aes.h>
diff --git a/app/hwcrypto/hwrng_srv.c b/app/hwcrypto/hwrng_srv.c
index 17488e5..0986d76 100644
--- a/app/hwcrypto/hwrng_srv.c
+++ b/app/hwcrypto/hwrng_srv.c
@@ -15,13 +15,13 @@
  */
 
 #include <assert.h>
-#include <uapi/err.h>
 #include <lk/list.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <trusty_ipc.h>
+#include <uapi/err.h>
 
-#include <trusty_std.h>
 #include <interface/hwrng/hwrng.h>
 
 #include "common.h"
diff --git a/app/hwcrypto/main.c b/app/hwcrypto/main.c
index 0f330c6..ac1ce4b 100644
--- a/app/hwcrypto/main.c
+++ b/app/hwcrypto/main.c
@@ -16,11 +16,10 @@
 
 
 #include <assert.h>
-#include <uapi/err.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-#include <trusty_std.h>
+#include <trusty_ipc.h>
+#include <uapi/err.h>
 
 #include "caam.h"
 #include "common.h"