     - Affected files:
       + `trts_internal.h`
       + `trts_nsp.cpp`
-* [PR308](https://github.com/intel/linux-sgx/pull/308): Change use of undefined MIN macro
-  to the intended meaning.
+* [PR308](https://github.com/intel/linux-sgx/pull/308): Include sl_util.h to
+  define the MIN macro before its use.
     - Affected files:
       + `common/inc/internal/mini_snprintf.h`
-* [PR309](https://github.com/intel/linux-sgx/pull/309): Remove unneeded #include
-  of sgx_urts.h in sgx_uswitchless.
-    - Affected files:
-      + `common/inc/sgx_uswitchless.h`
-
 
 ### Non-upstreamed changes
 * `sdk/trts/init_enclave.cpp`: Remove a memset_s of the enclave heap since

      + `t_instructions.cpp`
* [PR307](https://github.com/intel/linux-sgx/pull/307): Remove an unnecessary
  `#include` from gperftool.

### Pending PRs
* [PR222](https://github.com/intel/linux-sgx/pull/222): Generate different code

diff -Nur common/inc/internal/mini_snprintf.h common/inc/internal/mini_snprintf.h
--- common/inc/internal/mini_snprintf.h
+++ common/inc/internal/mini_snprintf.h
@@ -52,6 +52,8 @@
 #include <stdarg.h>
 #include <limits.h>
 
+#include "sl_util.h"
+
 /*===========================================================================
  * Interface
  *===========================================================================*/
diff -Nur common/inc/internal/pcl_common.h common/inc/internal/pcl_common.h
--- common/inc/internal/pcl_common.h
+++ common/inc/internal/pcl_common.h
