diff --git a/IDE/Renesas/cs+/Projects/common/user_settings.h b/IDE/Renesas/cs+/Projects/common/user_settings.h
index 9db9b6721..fe81249e1 100644
--- a/IDE/Renesas/cs+/Projects/common/user_settings.h
+++ b/IDE/Renesas/cs+/Projects/common/user_settings.h
@@ -74,22 +74,6 @@
 #define HAVE_OCSP
 #define HAVE_CERTIFICATE_STATUS_REQUEST
 
-//#define WOLFSSL_KEY_GEN
-#define SHOW_GEN
-
-#define WOLFSSL_KEEP_STORE_CERTS
-#define WOLFSSL_CIPHER_INTERNALNAME
-
-#define WOLFSSL_GETENV_RANDFILE  "ABCDEFG"
-#define WOLFSSL_GETENV_HOME "home"
-
-#define CloseSocket(s) {}
-#define StartTCP()
-
 #define NO_FILESYSTEM
-#define XFILE FILE*
-#define XBADFILE NULL
-//#define WOLFSSL_USER_KEYFILES   /* Substitute key and cert files in test.h with user definitions */
 
-int strncasecmp(const char *s1, const char *s2, unsigned int sz);
 
diff --git a/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c b/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c
index f7ce33b9f..6fc97c5f1 100644
--- a/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c
+++ b/IDE/Renesas/cs+/Projects/t4_demo/wolf_main.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 
 #include "wolf_demo.h"
-#include "r_cmt_rx_if.h"
 
 static WOLFSSL_CTX *wolfSSL_sv_ctx;
 static WOLFSSL_CTX *wolfSSL_cl_ctx;
diff --git a/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj b/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj
index c37a10cdd..07cf347e9 100644
--- a/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj
+++ b/IDE/Renesas/cs+/Projects/wolfssl_lib/wolfssl_lib.mtpj
@@ -22,6 +22,13 @@
       <ParentItem>e38de3e6-e537-43bc-9f7d-3958453b991f</ParentItem>
       <Property>b113ecd1-816e-459a-afa4-fbc8975bfcb1</Property>
     </Instance>
+    <Instance Guid="eabc01da-7e73-45ba-a18b-0a13ec91d158">
+      <Name>user_settings.h</Name>
+      <Type>File</Type>
+      <RelativePath>..\common\user_settings.h</RelativePath>
+      <TreeImageGuid>03cad1e8-2eb3-4cde-a8a3-982423631122</TreeImageGuid>
+      <ParentItem>e38de3e6-e537-43bc-9f7d-3958453b991f</ParentItem>
+    </Instance>
     <Instance Guid="caa2365b-7326-4cbb-bd88-b0ecf296df18">
       <Name>crl.c</Name>
       <Type>File</Type>
@@ -91,13 +98,6 @@
       <ParentItem>78a99f10-6945-4b7b-ab83-895a78962b99</ParentItem>
       <Property>b3a0ee4c-7893-43ab-aa14-cc84267a24b4</Property>
     </Instance>
-    <Instance Guid="f82110c6-9cf8-4a3f-b96e-6b951ee6b0c8">
-      <Name>user_settings.h</Name>
-      <Type>File</Type>
-      <RelativePath>user_settings.h</RelativePath>
-      <TreeImageGuid>03cad1e8-2eb3-4cde-a8a3-982423631122</TreeImageGuid>
-      <ParentItem>78a99f10-6945-4b7b-ab83-895a78962b99</ParentItem>
-    </Instance>
     <Instance Guid="cfc4ddef-2ff8-440d-9135-5e36e230a9d0">
       <Name>aes.c</Name>
       <Type>File</Type>