From fb3851ff0d77ac6a98c3618b2c4d0dee5b591d21 Mon Sep 17 00:00:00 2001
From: Anand Krishnamoorthi <anakrish@microsoft.com>
Date: Wed, 22 Jan 2020 21:21:03 +0000
Subject: [PATCH] Format code

Signed-off-by: Anand Krishnamoorthi <anakrish@microsoft.com>
---
 common/argv.c                            | 2 +-
 common/attest_plugin.c                   | 2 +-
 common/cert.c                            | 2 +-
 common/kdf.c                             | 4 ++--
 common/safecrt.c                         | 2 +-
 common/sgx/endorsements.c                | 2 +-
 common/sgx/report.c                      | 2 +-
 common/sgx/revocation.c                  | 4 ++--
 common/sgx/sgxcertextensions.c           | 2 +-
 common/sgx/tcbinfo.c                     | 2 +-
 common/sgx/tlsverifier.c                 | 4 ++--
 common/sgx/verifier.c                    | 2 +-
 enclave/asym_keys.c                      | 2 +-
 enclave/core/arena.c                     | 2 +-
 enclave/core/backtrace.c                 | 2 +-
 enclave/core/debugmalloc.c               | 2 +-
 enclave/core/hostcalls.c                 | 4 ++--
 enclave/core/malloc.c                    | 2 +-
 enclave/core/optee/thread.c              | 2 +-
 enclave/core/sgx/backtrace.c             | 2 +-
 enclave/core/sgx/calls.c                 | 4 ++--
 enclave/core/sgx/cpuid.c                 | 2 +-
 enclave/core/sgx/exception.c             | 2 +-
 enclave/core/sgx/keys.c                  | 2 +-
 enclave/core/sgx/linux/threadlocal.c     | 2 +-
 enclave/core/sgx/report.c                | 4 ++--
 enclave/core/sgx/td.c                    | 2 +-
 enclave/core/sgx/td_basic.c              | 2 +-
 enclave/core/sgx/thread.c                | 2 +-
 enclave/core/string.c                    | 2 +-
 enclave/core/tracee.c                    | 4 ++--
 enclave/crypto/asn1.c                    | 2 +-
 enclave/crypto/cert.c                    | 2 +-
 enclave/crypto/crl.c                     | 2 +-
 enclave/crypto/ec.c                      | 2 +-
 enclave/crypto/key.c                     | 2 +-
 enclave/crypto/rsa.c                     | 2 +-
 enclave/sgx/qeidinfo.c                   | 4 ++--
 enclave/sgx/report.c                     | 2 +-
 enclave/sgx/revocationinfo.c             | 4 ++--
 enclave/tls_cert.c                       | 2 +-
 host/crypto/bcrypt/cert.c                | 4 ++--
 host/crypto/bcrypt/ec.c                  | 2 +-
 host/crypto/bcrypt/key.c                 | 2 +-
 host/crypto/bcrypt/pem.c                 | 4 ++--
 host/crypto/bcrypt/rsa.c                 | 2 +-
 host/crypto/openssl/asn1.c               | 2 +-
 host/crypto/openssl/cert.c               | 2 +-
 host/crypto/openssl/crl.c                | 2 +-
 host/crypto/openssl/key.c                | 2 +-
 host/files.c                             | 4 ++--
 host/optee/linux/enclave.c               | 2 +-
 host/sgx/calls.c                         | 4 ++--
 host/sgx/create.c                        | 4 ++--
 host/sgx/elf.c                           | 4 ++--
 host/sgx/linux/exception.c               | 2 +-
 host/sgx/loadelf.c                       | 4 ++--
 host/sgx/loadpe.c                        | 2 +-
 host/sgx/ocalls.c                        | 4 ++--
 host/sgx/quote.c                         | 2 +-
 host/sgx/report.c                        | 4 ++--
 host/sgx/sgxload.c                       | 2 +-
 host/sgx/sgxquoteprovider.c              | 2 +-
 host/sgx/sgxsign.c                       | 2 +-
 host/traceh.c                            | 2 +-
 syscall/device.c                         | 2 +-
 syscall/devices/hostepoll/hostepoll.c    | 2 +-
 syscall/fdtable.c                        | 2 +-
 syscall/iov.c                            | 4 ++--
 syscall/select.c                         | 2 +-
 syscall/syscall.c                        | 2 +-
 tests/crypto/ec_tests.c                  | 2 +-
 tests/qeidentity/host/qeidentifyinfo.cpp | 2 +-
 tests/safecrt/common/test.cpp            | 2 +-
 tests/safemath/main.cpp                  | 2 +-
 tests/sealKey/enc/enc.cpp                | 2 +-
 tools/oesign/oedump.c                    | 2 +-
 77 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/common/argv.c b/common/argv.c
index 289ea82e09..30bb13cbe2 100644
--- a/common/argv.c
+++ b/common/argv.c
@@ -1,9 +1,9 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/argv.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safemath.h>
 
 #if defined(OE_BUILD_ENCLAVE)
 #include <openenclave/corelibc/string.h>
diff --git a/common/attest_plugin.c b/common/attest_plugin.c
index bb33534634..1eca6d253f 100644
--- a/common/attest_plugin.c
+++ b/common/attest_plugin.c
@@ -3,10 +3,10 @@
 
 #include <openenclave/attestation/plugin.h>
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/common/cert.c b/common/cert.c
index 4538df8b17..734f950012 100644
--- a/common/cert.c
+++ b/common/cert.c
@@ -1,9 +1,9 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/cert.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include "common.h"
 
diff --git a/common/kdf.c b/common/kdf.c
index d8884ae6ed..0b7319205a 100644
--- a/common/kdf.c
+++ b/common/kdf.c
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/result.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/bits/types.h>
 #include <openenclave/internal/crypto/hmac.h>
 #include <openenclave/internal/crypto/sha.h>
 #include <openenclave/internal/kdf.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 
 #include "common.h"
diff --git a/common/safecrt.c b/common/safecrt.c
index 83fe6e0099..d3568af8ef 100644
--- a/common/safecrt.c
+++ b/common/safecrt.c
@@ -1,8 +1,8 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include "common.h"
 
 oe_result_t oe_memcpy_s(
diff --git a/common/sgx/endorsements.c b/common/sgx/endorsements.c
index b48aca2865..58e2f6eb8f 100644
--- a/common/sgx/endorsements.c
+++ b/common/sgx/endorsements.c
@@ -3,9 +3,9 @@
 
 #include "endorsements.h"
 #include <openenclave/bits/attestation.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/datetime.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include "../common.h"
 
 #include "qeidentity.h"
diff --git a/common/sgx/report.c b/common/sgx/report.c
index 60003a81ac..f982a3f993 100644
--- a/common/sgx/report.c
+++ b/common/sgx/report.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include "../common.h"
diff --git a/common/sgx/revocation.c b/common/sgx/revocation.c
index 7261971575..8f4955a89b 100644
--- a/common/sgx/revocation.c
+++ b/common/sgx/revocation.c
@@ -3,8 +3,6 @@
 
 #include "revocation.h"
 #include <openenclave/bits/attestation.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/crypto/cert.h>
 #include <openenclave/internal/crypto/crl.h>
@@ -14,6 +12,8 @@
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxcertextensions.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/trace.h>
diff --git a/common/sgx/sgxcertextensions.c b/common/sgx/sgxcertextensions.c
index 1281fc965b..a01c8b1861 100644
--- a/common/sgx/sgxcertextensions.c
+++ b/common/sgx/sgxcertextensions.c
@@ -1,10 +1,10 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/cert.h>
 #include <openenclave/internal/crypto/ec.h>
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxcertextensions.h>
 #include <openenclave/internal/trace.h>
 #include "../common.h"
diff --git a/common/sgx/tcbinfo.c b/common/sgx/tcbinfo.c
index 3c5787e53c..9e7fd96e74 100644
--- a/common/sgx/tcbinfo.c
+++ b/common/sgx/tcbinfo.c
@@ -1,9 +1,9 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 #include "tcbinfo.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
 #include "../common.h"
diff --git a/common/sgx/tlsverifier.c b/common/sgx/tlsverifier.c
index a7ebafe4a5..60619f3372 100644
--- a/common/sgx/tlsverifier.c
+++ b/common/sgx/tlsverifier.c
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/cert.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 #include "../common/common.h"
 #include "quote.h"
diff --git a/common/sgx/verifier.c b/common/sgx/verifier.c
index fbeb0135a8..be333cd15d 100644
--- a/common/sgx/verifier.c
+++ b/common/sgx/verifier.c
@@ -3,9 +3,9 @@
 
 #include <openenclave/attestation/plugin.h>
 #include <openenclave/attestation/sgx/verifier.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgx/plugin.h>
 
 #include "../common.h"
diff --git a/enclave/asym_keys.c b/enclave/asym_keys.c
index 8f31fa57c1..b95f15b79a 100644
--- a/enclave/asym_keys.c
+++ b/enclave/asym_keys.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/crypto/ec.h>
 #include <openenclave/internal/kdf.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <stdlib.h>
 
diff --git a/enclave/core/arena.c b/enclave/core/arena.c
index 3de1a3b983..0386585d8b 100644
--- a/enclave/core/arena.c
+++ b/enclave/core/arena.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include "arena.h"
-#include <openenclave/internal/safemath.h>
 #include <openenclave/edger8r/common.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/utils.h>
 #include <string.h>
diff --git a/enclave/core/backtrace.c b/enclave/core/backtrace.c
index e1d0c95939..1ce8bde1b2 100644
--- a/enclave/core/backtrace.c
+++ b/enclave/core/backtrace.c
@@ -1,7 +1,6 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/backtrace.h>
@@ -9,6 +8,7 @@
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 
 oe_result_t oe_print_backtrace(void)
 {
diff --git a/enclave/core/debugmalloc.c b/enclave/core/debugmalloc.c
index 0101933fb8..c3b3386604 100644
--- a/enclave/core/debugmalloc.c
+++ b/enclave/core/debugmalloc.c
@@ -3,13 +3,13 @@
 
 #define USE_DL_PREFIX
 #include "debugmalloc.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/errno.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/backtrace.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/malloc.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/types.h>
 #include <openenclave/internal/utils.h>
diff --git a/enclave/core/hostcalls.c b/enclave/core/hostcalls.c
index dd8236aeca..03e1df81a8 100644
--- a/enclave/core/hostcalls.c
+++ b/enclave/core/hostcalls.c
@@ -1,14 +1,14 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/edger8r/enclave.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/stack_alloc.h>
 
 #include "arena.h"
diff --git a/enclave/core/malloc.c b/enclave/core/malloc.c
index 51b1a8c494..7b678e54bf 100644
--- a/enclave/core/malloc.c
+++ b/enclave/core/malloc.c
@@ -1,7 +1,6 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
@@ -9,6 +8,7 @@
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/malloc.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/thread.h>
 #include "debugmalloc.h"
 
diff --git a/enclave/core/optee/thread.c b/enclave/core/optee/thread.c
index 505963541d..25b01ceda5 100644
--- a/enclave/core/optee/thread.c
+++ b/enclave/core/optee/thread.c
@@ -3,11 +3,11 @@
 
 // TODO: This file is a stub!
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/thread.h>
 
 /*
diff --git a/enclave/core/sgx/backtrace.c b/enclave/core/sgx/backtrace.c
index faf2f26dcf..3ca09c78dd 100644
--- a/enclave/core/sgx/backtrace.c
+++ b/enclave/core/sgx/backtrace.c
@@ -1,7 +1,6 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/argv.h>
@@ -10,6 +9,7 @@
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include "sgx_t.h"
 #include "tee_t.h"
 
diff --git a/enclave/core/sgx/calls.c b/enclave/core/sgx/calls.c
index e118495a79..e9ef599dc8 100644
--- a/enclave/core/sgx/calls.c
+++ b/enclave/core/sgx/calls.c
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 #include "../calls.h"
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/edger8r/enclave.h>
@@ -16,6 +14,8 @@
 #include <openenclave/internal/malloc.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/trace.h>
diff --git a/enclave/core/sgx/cpuid.c b/enclave/core/sgx/cpuid.c
index bc70513daa..fb40e3e8d4 100644
--- a/enclave/core/sgx/cpuid.c
+++ b/enclave/core/sgx/cpuid.c
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #include "cpuid.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/cpuid.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include "sgx_t.h"
 
 static uint32_t _cpuid_table[OE_CPUID_LEAF_COUNT][OE_CPUID_REG_COUNT];
diff --git a/enclave/core/sgx/exception.c b/enclave/core/sgx/exception.c
index aacc3ecfec..2973e552eb 100644
--- a/enclave/core/sgx/exception.c
+++ b/enclave/core/sgx/exception.c
@@ -1,7 +1,6 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/constants_x64.h>
@@ -10,6 +9,7 @@
 #include <openenclave/internal/fault.h>
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/jump.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/trace.h>
diff --git a/enclave/core/sgx/keys.c b/enclave/core/sgx/keys.c
index 0919f000e7..14400c5b90 100644
--- a/enclave/core/sgx/keys.c
+++ b/enclave/core/sgx/keys.c
@@ -1,10 +1,10 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include "asmdefs.h"
diff --git a/enclave/core/sgx/linux/threadlocal.c b/enclave/core/sgx/linux/threadlocal.c
index d519cab0c9..13403752c4 100644
--- a/enclave/core/sgx/linux/threadlocal.c
+++ b/enclave/core/sgx/linux/threadlocal.c
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 
 #include "threadlocal.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/elf.h>
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include "../td.h"
 
diff --git a/enclave/core/sgx/report.c b/enclave/core/sgx/report.c
index 4fe80f629a..b032becf34 100644
--- a/enclave/core/sgx/report.c
+++ b/enclave/core/sgx/report.c
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 #include "report.h"
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/bits/types.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
@@ -11,6 +9,8 @@
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include "sgx_t.h"
diff --git a/enclave/core/sgx/td.c b/enclave/core/sgx/td.c
index ec9653f994..f55406e369 100644
--- a/enclave/core/sgx/td.c
+++ b/enclave/core/sgx/td.c
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 
 #include "td.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/fault.h>
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/rdrand.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include "asmdefs.h"
diff --git a/enclave/core/sgx/td_basic.c b/enclave/core/sgx/td_basic.c
index a6d614431c..ba519acce2 100644
--- a/enclave/core/sgx/td_basic.c
+++ b/enclave/core/sgx/td_basic.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/fault.h>
 #include <openenclave/internal/globals.h>
 #include <openenclave/internal/rdrand.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include "asmdefs.h"
diff --git a/enclave/core/sgx/thread.c b/enclave/core/sgx/thread.c
index ee2651c522..d195f10a39 100644
--- a/enclave/core/sgx/thread.c
+++ b/enclave/core/sgx/thread.c
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #include "thread.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/thread.h>
 #include "sgx_t.h"
diff --git a/enclave/core/string.c b/enclave/core/string.c
index 4ec89f6c2b..9cedbbce9e 100644
--- a/enclave/core/string.c
+++ b/enclave/core/string.c
@@ -1,11 +1,11 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/ctype.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/internal/defs.h>
+#include <openenclave/internal/safecrt.h>
 
 size_t oe_strlen(const char* s)
 {
diff --git a/enclave/core/tracee.c b/enclave/core/tracee.c
index 55e9252ad6..2bd3f57a93 100644
--- a/enclave/core/tracee.c
+++ b/enclave/core/tracee.c
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 #include "tracee.h"
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/bits/types.h>
 #include <openenclave/corelibc/stdarg.h>
 #include <openenclave/corelibc/stdio.h>
@@ -12,6 +10,8 @@
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
diff --git a/enclave/crypto/asn1.c b/enclave/crypto/asn1.c
index b8ad395b5c..a889768d53 100644
--- a/enclave/crypto/asn1.c
+++ b/enclave/crypto/asn1.c
@@ -6,10 +6,10 @@
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/asn1.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 
 #include <string.h>
diff --git a/enclave/crypto/cert.c b/enclave/crypto/cert.c
index 426a4ffd5e..74104af1e1 100644
--- a/enclave/crypto/cert.c
+++ b/enclave/crypto/cert.c
@@ -9,7 +9,6 @@
 #include <mbedtls/platform.h>
 #include <mbedtls/x509_crt.h>
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/atomic.h>
 #include <openenclave/internal/cert.h>
@@ -17,6 +16,7 @@
 #include <openenclave/internal/pem.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <string.h>
 #include "crl.h"
diff --git a/enclave/crypto/crl.c b/enclave/crypto/crl.c
index f9ecdbcc33..37f69f1cc4 100644
--- a/enclave/crypto/crl.c
+++ b/enclave/crypto/crl.c
@@ -3,10 +3,10 @@
 
 #include "crl.h"
 #include <mbedtls/platform.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/crl.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <string.h>
 
diff --git a/enclave/crypto/ec.c b/enclave/crypto/ec.c
index c3b1166021..9bb51d4ddc 100644
--- a/enclave/crypto/ec.c
+++ b/enclave/crypto/ec.c
@@ -5,9 +5,9 @@
 #include <mbedtls/asn1.h>
 #include <mbedtls/asn1write.h>
 #include <mbedtls/ecp.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include "key.h"
 #include "pem.h"
diff --git a/enclave/crypto/key.c b/enclave/crypto/key.c
index 78dded284e..5401322d10 100644
--- a/enclave/crypto/key.c
+++ b/enclave/crypto/key.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include "key.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/hash.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <string.h>
 #include "pem.h"
diff --git a/enclave/crypto/rsa.c b/enclave/crypto/rsa.c
index 3c10704c25..bee41764f8 100644
--- a/enclave/crypto/rsa.c
+++ b/enclave/crypto/rsa.c
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "rsa.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include "key.h"
 #include "pem.h"
diff --git a/enclave/sgx/qeidinfo.c b/enclave/sgx/qeidinfo.c
index 9036f28b41..4056f18861 100644
--- a/enclave/sgx/qeidinfo.c
+++ b/enclave/sgx/qeidinfo.c
@@ -1,11 +1,11 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/enclave/sgx/report.c b/enclave/sgx/report.c
index e866eb805d..a1f2419560 100644
--- a/enclave/sgx/report.c
+++ b/enclave/sgx/report.c
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 
 #include "report.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/bits/types.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/crypto/cmac.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxkeys.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
diff --git a/enclave/sgx/revocationinfo.c b/enclave/sgx/revocationinfo.c
index 6fb08a639e..a24f2d2e2e 100644
--- a/enclave/sgx/revocationinfo.c
+++ b/enclave/sgx/revocationinfo.c
@@ -1,12 +1,12 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <stdlib.h>
 #include <string.h>
 #include "../common/sgx/revocation.h"
diff --git a/enclave/tls_cert.c b/enclave/tls_cert.c
index 73b2d04ecd..5f10f1644f 100644
--- a/enclave/tls_cert.c
+++ b/enclave/tls_cert.c
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/cert.h>
 #include <openenclave/internal/crypto/sha.h>
 #include <openenclave/internal/print.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 #include <stdio.h>
diff --git a/host/crypto/bcrypt/cert.c b/host/crypto/bcrypt/cert.c
index 6ed58fdfdf..7ce2dae801 100644
--- a/host/crypto/bcrypt/cert.c
+++ b/host/crypto/bcrypt/cert.c
@@ -3,11 +3,11 @@
 
 #include <assert.h>
 #include <openenclave/bits/result.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/cert.h>
 #include <openenclave/internal/pem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 
 #include "../magic.h"
diff --git a/host/crypto/bcrypt/ec.c b/host/crypto/bcrypt/ec.c
index 9e0cd8260c..14695ecff6 100644
--- a/host/crypto/bcrypt/ec.c
+++ b/host/crypto/bcrypt/ec.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include <assert.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/ec.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 
 #include "../magic.h"
diff --git a/host/crypto/bcrypt/key.c b/host/crypto/bcrypt/key.c
index 7c78da2580..7338b8e7fd 100644
--- a/host/crypto/bcrypt/key.c
+++ b/host/crypto/bcrypt/key.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include <assert.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/pem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 
 #include "../magic.h"
diff --git a/host/crypto/bcrypt/pem.c b/host/crypto/bcrypt/pem.c
index 5daed5ed8a..1df70e2f3b 100644
--- a/host/crypto/bcrypt/pem.c
+++ b/host/crypto/bcrypt/pem.c
@@ -3,10 +3,10 @@
 
 #include "pem.h"
 #include <assert.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/pem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 #include "bcrypt.h"
 
diff --git a/host/crypto/bcrypt/rsa.c b/host/crypto/bcrypt/rsa.c
index 1cfccc1a5f..ec8168e732 100644
--- a/host/crypto/bcrypt/rsa.c
+++ b/host/crypto/bcrypt/rsa.c
@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #include <assert.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/rsa.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 
 #include "../magic.h"
diff --git a/host/crypto/openssl/asn1.c b/host/crypto/openssl/asn1.c
index 4618fc72ed..20d14b40e6 100644
--- a/host/crypto/openssl/asn1.c
+++ b/host/crypto/openssl/asn1.c
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #include "../common/asn1.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/asn1.h>
 #include <openenclave/internal/datetime.h>
 #include <openenclave/internal/defs.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <openssl/asn1.h>
 #include <openssl/pem.h>
diff --git a/host/crypto/openssl/cert.c b/host/crypto/openssl/cert.c
index ac5c29726d..a920c9dc0e 100644
--- a/host/crypto/openssl/cert.c
+++ b/host/crypto/openssl/cert.c
@@ -3,11 +3,11 @@
 
 #include <ctype.h>
 #include <openenclave/bits/result.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/asn1.h>
 #include <openenclave/internal/cert.h>
 #include <openenclave/internal/pem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/host/crypto/openssl/crl.c b/host/crypto/openssl/crl.c
index 5b5f80e822..5fce42bd6e 100644
--- a/host/crypto/openssl/crl.c
+++ b/host/crypto/openssl/crl.c
@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 
 #include <limits.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/crypto/crl.h>
 #include <openenclave/internal/defs.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
diff --git a/host/crypto/openssl/key.c b/host/crypto/openssl/key.c
index e480a392ce..efe7d97eca 100644
--- a/host/crypto/openssl/key.c
+++ b/host/crypto/openssl/key.c
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "key.h"
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/utils.h>
 #include <openssl/bio.h>
 #include <openssl/evp.h>
diff --git a/host/files.c b/host/files.c
index fd1f15c4b8..ee859bd154 100644
--- a/host/files.c
+++ b/host/files.c
@@ -1,11 +1,11 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/files.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
 #include <stdbool.h>
diff --git a/host/optee/linux/enclave.c b/host/optee/linux/enclave.c
index a3595ff517..bff1723ed3 100644
--- a/host/optee/linux/enclave.c
+++ b/host/optee/linux/enclave.c
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/edger8r/host.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/defs.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safemath.h>
 
 #include "../../calls.h"
 #include "../../ocalls.h"
diff --git a/host/sgx/calls.c b/host/sgx/calls.c
index 221f2a76c2..1de588f8f1 100644
--- a/host/sgx/calls.c
+++ b/host/sgx/calls.c
@@ -18,13 +18,13 @@
 #error "unsupported platform"
 #endif
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/debugrt/host.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/registers.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/switchless.h>
 #include <openenclave/internal/utils.h>
diff --git a/host/sgx/create.c b/host/sgx/create.c
index 3f94aface6..166b064954 100644
--- a/host/sgx/create.c
+++ b/host/sgx/create.c
@@ -33,8 +33,6 @@ static char* get_fullpath(const char* path)
 
 #include <assert.h>
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/debugrt/host.h>
@@ -43,6 +41,8 @@ static char* get_fullpath(const char* path)
 #include <openenclave/internal/properties.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/result.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxcreate.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/switchless.h>
diff --git a/host/sgx/elf.c b/host/sgx/elf.c
index 0215911d46..56b171b08b 100644
--- a/host/sgx/elf.c
+++ b/host/sgx/elf.c
@@ -3,12 +3,12 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/elf.h>
 #include <openenclave/internal/load.h>
 #include <openenclave/internal/mem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/utils.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/host/sgx/linux/exception.c b/host/sgx/linux/exception.c
index 68c82ab7f7..2eee090d94 100644
--- a/host/sgx/linux/exception.c
+++ b/host/sgx/linux/exception.c
@@ -4,10 +4,10 @@
 #include "../exception.h"
 #include <assert.h>
 #include <dlfcn.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/registers.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
diff --git a/host/sgx/loadelf.c b/host/sgx/loadelf.c
index 5d38e305a9..b0f167c5bc 100644
--- a/host/sgx/loadelf.c
+++ b/host/sgx/loadelf.c
@@ -4,14 +4,14 @@
 #include <assert.h>
 #include <errno.h>
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/load.h>
 #include <openenclave/internal/mem.h>
 #include <openenclave/internal/properties.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/sgxcreate.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/trace.h>
diff --git a/host/sgx/loadpe.c b/host/sgx/loadpe.c
index 82e5d8578e..712bbe9cd2 100644
--- a/host/sgx/loadpe.c
+++ b/host/sgx/loadpe.c
@@ -3,12 +3,12 @@
 
 #include <assert.h>
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/bits/types.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/load.h>
 #include <openenclave/internal/mem.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
 #include <stdlib.h>
diff --git a/host/sgx/ocalls.c b/host/sgx/ocalls.c
index 4cdfe49e4f..a3622e2c4f 100644
--- a/host/sgx/ocalls.c
+++ b/host/sgx/ocalls.c
@@ -15,14 +15,14 @@
 #include <Windows.h>
 #endif
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/argv.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/elf.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/thread.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
diff --git a/host/sgx/quote.c b/host/sgx/quote.c
index 2c71112e25..203383883f 100644
--- a/host/sgx/quote.c
+++ b/host/sgx/quote.c
@@ -4,9 +4,9 @@
 #include "quote.h"
 #include <assert.h>
 #include <limits.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>
 
diff --git a/host/sgx/report.c b/host/sgx/report.c
index 1ad9e413c5..873ca6a66a 100644
--- a/host/sgx/report.c
+++ b/host/sgx/report.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/host.h>
 #include <openenclave/host_verify.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/report.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/trace.h>
 #include <openenclave/internal/utils.h>
 #include "../common/sgx/quote.h"
diff --git a/host/sgx/sgxload.c b/host/sgx/sgxload.c
index 2512dbce0f..efa6119c0f 100644
--- a/host/sgx/sgxload.c
+++ b/host/sgx/sgxload.c
@@ -13,9 +13,9 @@
 
 #include <assert.h>
 #include <openenclave/bits/defs.h>
+#include <openenclave/internal/raise.h>
 #include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/safemath.h>
-#include <openenclave/internal/raise.h>
 #include <openenclave/internal/sgxcreate.h>
 #include <openenclave/internal/sgxsign.h>
 #include <openenclave/internal/sgxtypes.h>
diff --git a/host/sgx/sgxquoteprovider.c b/host/sgx/sgxquoteprovider.c
index 116ceecce8..9af42223ab 100644
--- a/host/sgx/sgxquoteprovider.c
+++ b/host/sgx/sgxquoteprovider.c
@@ -1,9 +1,9 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/trace.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/host/sgx/sgxsign.c b/host/sgx/sgxsign.c
index ed14f9d2fd..73a0da56ce 100644
--- a/host/sgx/sgxsign.c
+++ b/host/sgx/sgxsign.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/elf.h>
 #include <openenclave/internal/error.h>
 #include <openenclave/internal/mem.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/rsa.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxsign.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/str.h>
diff --git a/host/traceh.c b/host/traceh.c
index fc386b2c61..ef3282a921 100644
--- a/host/traceh.c
+++ b/host/traceh.c
@@ -1,10 +1,10 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/limits.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/trace.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/syscall/device.c b/syscall/device.c
index f2bfc8bf83..1cb00423cc 100644
--- a/syscall/device.c
+++ b/syscall/device.c
@@ -3,12 +3,12 @@
 
 #include <openenclave/enclave.h>
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/errno.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/syscall/device.h>
 #include <openenclave/internal/syscall/raise.h>
 #include <openenclave/internal/thread.h>
diff --git a/syscall/devices/hostepoll/hostepoll.c b/syscall/devices/hostepoll/hostepoll.c
index 2cc36122e2..735692f860 100644
--- a/syscall/devices/hostepoll/hostepoll.c
+++ b/syscall/devices/hostepoll/hostepoll.c
@@ -5,11 +5,11 @@
 
 #include <openenclave/enclave.h>
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/internal/calls.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/syscall/device.h>
 #include <openenclave/internal/syscall/fcntl.h>
 #include <openenclave/internal/syscall/fdtable.h>
diff --git a/syscall/fdtable.c b/syscall/fdtable.c
index ba75981e84..461fefd36f 100644
--- a/syscall/fdtable.c
+++ b/syscall/fdtable.c
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/module.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/errno.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/syscall/fd.h>
 #include <openenclave/internal/syscall/fdtable.h>
 #include <openenclave/internal/syscall/raise.h>
diff --git a/syscall/iov.c b/syscall/iov.c
index 0cf9212010..05b2119b15 100644
--- a/syscall/iov.c
+++ b/syscall/iov.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/corelibc/limits.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safecrt.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/syscall/iov.h>
 #include <openenclave/internal/syscall/sys/uio.h>
 #include <openenclave/internal/syscall/types.h>
diff --git a/syscall/select.c b/syscall/select.c
index 20e7b72524..b70b29355c 100644
--- a/syscall/select.c
+++ b/syscall/select.c
@@ -1,13 +1,13 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/corelibc/assert.h>
 #include <openenclave/corelibc/stdio.h>
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/corelibc/time.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/syscall/poll.h>
 #include <openenclave/internal/syscall/raise.h>
 #include <openenclave/internal/syscall/sys/select.h>
diff --git a/syscall/syscall.c b/syscall/syscall.c
index bb279c7ea5..b87426d98d 100644
--- a/syscall/syscall.c
+++ b/syscall/syscall.c
@@ -1,7 +1,6 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safemath.h>
 #include <openenclave/corelibc/errno.h>
 #include <openenclave/corelibc/setjmp.h>
 #include <openenclave/corelibc/stdarg.h>
@@ -9,6 +8,7 @@
 #include <openenclave/corelibc/stdlib.h>
 #include <openenclave/corelibc/string.h>
 #include <openenclave/internal/print.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/syscall/device.h>
 #include <openenclave/internal/syscall/dirent.h>
 #include <openenclave/internal/syscall/fcntl.h>
diff --git a/tests/crypto/ec_tests.c b/tests/crypto/ec_tests.c
index 1845c7c94d..ac025b71d8 100644
--- a/tests/crypto/ec_tests.c
+++ b/tests/crypto/ec_tests.c
@@ -5,13 +5,13 @@
 #include <openenclave/enclave.h>
 #endif
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/asn1.h>
 #include <openenclave/internal/cert.h>
 #include <openenclave/internal/ec.h>
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
 #include <openenclave/internal/random.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/tests.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/tests/qeidentity/host/qeidentifyinfo.cpp b/tests/qeidentity/host/qeidentifyinfo.cpp
index 790e33aa5c..c1c20d5cab 100644
--- a/tests/qeidentity/host/qeidentifyinfo.cpp
+++ b/tests/qeidentity/host/qeidentifyinfo.cpp
@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 #ifdef OE_LINK_SGX_DCAP_QL
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/host.h>
 #include <openenclave/internal/error.h>
 #include <openenclave/internal/hexdump.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/tests.h>
 #include <openenclave/internal/utils.h>
 
diff --git a/tests/safecrt/common/test.cpp b/tests/safecrt/common/test.cpp
index d7183f1755..e9d34dc287 100644
--- a/tests/safecrt/common/test.cpp
+++ b/tests/safecrt/common/test.cpp
@@ -6,8 +6,8 @@
 #endif
 
 #include <openenclave/bits/result.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/error.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/tests.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/safemath/main.cpp b/tests/safemath/main.cpp
index b78d1460c6..856c8ef8f5 100644
--- a/tests/safemath/main.cpp
+++ b/tests/safemath/main.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include <openenclave/bits/result.h>
-#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/error.h>
+#include <openenclave/internal/safemath.h>
 #include <openenclave/internal/tests.h>
 
 bool _check_8_bit_unsigned(oe_result_t result, int num, uint8_t num_u8)
diff --git a/tests/sealKey/enc/enc.cpp b/tests/sealKey/enc/enc.cpp
index 6c47993e26..65edfa67ed 100644
--- a/tests/sealKey/enc/enc.cpp
+++ b/tests/sealKey/enc/enc.cpp
@@ -2,11 +2,11 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/edger8r/enclave.h>
 #include <openenclave/enclave.h>
 #include <openenclave/internal/crypto/sha.h>
 #include <openenclave/internal/ec.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxkeys.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/tests.h>
diff --git a/tools/oesign/oedump.c b/tools/oesign/oedump.c
index f9d5b17ca9..92fedf426c 100644
--- a/tools/oesign/oedump.c
+++ b/tools/oesign/oedump.c
@@ -3,10 +3,10 @@
 
 #include <inttypes.h>
 #include <openenclave/bits/defs.h>
-#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/elf.h>
 #include <openenclave/internal/hexdump.h>
 #include <openenclave/internal/raise.h>
+#include <openenclave/internal/safecrt.h>
 #include <openenclave/internal/sgxcreate.h>
 #include <openenclave/internal/sgxtypes.h>
 #include <openenclave/internal/utils.h>