diff --git a/plugins/unittests/plugininterfacetest.cpp b/plugins/unittests/plugininterfacetest.cpp
index 71f2194ad7021e29104ddef1d027ac08d76ba42c..25c40cb9c7ecce5947e527ecdfdbe0226242a838 100644
--- a/plugins/unittests/plugininterfacetest.cpp
+++ b/plugins/unittests/plugininterfacetest.cpp
@@ -21,7 +21,7 @@
 #include "iotivity_config.h"
 
 #include "plugininterface.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/IPCA/unittests/IPCAElevatorClient.cpp b/resource/IPCA/unittests/IPCAElevatorClient.cpp
index 8585f49e00d5f59aa4eeffbd1ce863d7d8936da5..f9e85d43697c0dec92d43d7432bb18587a1b02c4 100644
--- a/resource/IPCA/unittests/IPCAElevatorClient.cpp
+++ b/resource/IPCA/unittests/IPCAElevatorClient.cpp
@@ -24,7 +24,7 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocrandom.h"
 #include "octypes.h"
 #include "oic_time.h"
diff --git a/resource/IPCA/unittests/ipcaunittests.cpp b/resource/IPCA/unittests/ipcaunittests.cpp
index 39eafdf5c7e9b7caa3e88a062df0a7df215461d0..c8d6f8c182bd38b065eda5883cdfb5bf3d9aa729 100644
--- a/resource/IPCA/unittests/ipcaunittests.cpp
+++ b/resource/IPCA/unittests/ipcaunittests.cpp
@@ -24,7 +24,7 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocrandom.h"
 #include "ipca.h"
 #include "testelevatorserver.h"
diff --git a/resource/c_common/ocrandom/test/android/randomtest.cpp b/resource/c_common/ocrandom/test/android/randomtest.cpp
index c115ac56308bc19ca6f70afad93b3f4ff914e3d1..caf1caef8dfe3693b47adbfd7ee531949048adc9 100644
--- a/resource/c_common/ocrandom/test/android/randomtest.cpp
+++ b/resource/c_common/ocrandom/test/android/randomtest.cpp
@@ -23,7 +23,7 @@ extern "C" {
     #include "ocrandom.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "math.h"
 
 
diff --git a/resource/c_common/ocrandom/test/randomtest.cpp b/resource/c_common/ocrandom/test/randomtest.cpp
index 5036113b4eb39fe17758075246d900bdb55c5b9b..6b2402564a9e71879af1aa15eea33107a951d1be 100644
--- a/resource/c_common/ocrandom/test/randomtest.cpp
+++ b/resource/c_common/ocrandom/test/randomtest.cpp
@@ -24,7 +24,7 @@ extern "C" {
     #include "ocrandom.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "math.h"
 
 #define ARR_SIZE (20)
diff --git a/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
index e07ca0c664d3b438778867e83f214e95e8b3aceb..35b5b99fb3f6c2acadc05f500441b937f618248c 100644
--- a/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
+++ b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp
@@ -24,7 +24,7 @@ extern "C" {
     #include "oic_malloc.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/c_common/oic_string/test/linux/oic_string_tests.cpp b/resource/c_common/oic_string/test/linux/oic_string_tests.cpp
index 78845f56140cefd0dd64adf3788be51333725841..2e13512b280c846c22c456f21cc2dcf3cfa0071a 100644
--- a/resource/c_common/oic_string/test/linux/oic_string_tests.cpp
+++ b/resource/c_common/oic_string/test/linux/oic_string_tests.cpp
@@ -33,7 +33,7 @@
 #define _POSIX_C_SOURCE 200809L
 #endif // _POSIX_C_SOURCE
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <oic_string.h>
 #include <oic_malloc.h>
diff --git a/resource/c_common/oic_time/test/linux/oic_time_tests.cpp b/resource/c_common/oic_time/test/linux/oic_time_tests.cpp
index 4e98ef291d7fad9ae22f6375df4dca5a3c81b485..3823ab396ce7d8a17c4c73f8c8589513f7b14fa0 100644
--- a/resource/c_common/oic_time/test/linux/oic_time_tests.cpp
+++ b/resource/c_common/oic_time/test/linux/oic_time_tests.cpp
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include "oic_time.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <stdint.h>
 
 // Tests to get current time in milli seconds
diff --git a/resource/csdk/connectivity/test/ca_api_unittest.cpp b/resource/csdk/connectivity/test/ca_api_unittest.cpp
index b0913085777764e1f0b789c9e390b020feaba649..1f741f009571081b06567878799561d63aa61a91 100644
--- a/resource/csdk/connectivity/test/ca_api_unittest.cpp
+++ b/resource/csdk/connectivity/test/ca_api_unittest.cpp
@@ -19,7 +19,7 @@
  ******************************************************************/
 
 #include "platform_features.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "cainterface.h"
 #include "cautilinterface.h"
 #include "cacommon.h"
diff --git a/resource/csdk/connectivity/test/cablocktransfertest.cpp b/resource/csdk/connectivity/test/cablocktransfertest.cpp
index 2ec2c25e92a0e237e6eb3dde82bcf05f29feff8f..d36c03d7395eeab912f28dd52e37f6698f65328a 100644
--- a/resource/csdk/connectivity/test/cablocktransfertest.cpp
+++ b/resource/csdk/connectivity/test/cablocktransfertest.cpp
@@ -23,7 +23,7 @@
 #pragma warning(disable : 4200)
 #endif
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "cainterface.h"
 #include "cautilinterface.h"
 #include "cacommon.h"
diff --git a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
index 21f08f436fcd4aae143cfc0618204e3e86a265bc..e05308b75007034d79354e892d0467a07de10529 100644
--- a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
+++ b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "oic_malloc.h"
 #include "caprotocolmessage.h"
diff --git a/resource/csdk/connectivity/test/catests.cpp b/resource/csdk/connectivity/test/catests.cpp
index 69eaa14b2064b7e9dc52e68baa606428f1f2be05..7ec54f5f71e1f0509b2e6b1bc27bb58ad52dfd60 100644
--- a/resource/csdk/connectivity/test/catests.cpp
+++ b/resource/csdk/connectivity/test/catests.cpp
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include "iotivity_config.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
diff --git a/resource/csdk/connectivity/test/octhread_tests.cpp b/resource/csdk/connectivity/test/octhread_tests.cpp
index 08081b37fb78b2a80bc2080193aa2605d3a7cd12..dcf48f77848e9b5813956af7c25f06c7c70eafa6 100644
--- a/resource/csdk/connectivity/test/octhread_tests.cpp
+++ b/resource/csdk/connectivity/test/octhread_tests.cpp
@@ -34,7 +34,7 @@
 #endif // _POSIX_C_SOURCE
 
 #include "iotivity_config.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "octhread.h"
 #include <cathreadpool.h>
diff --git a/resource/csdk/connectivity/test/ssladapter_test.cpp b/resource/csdk/connectivity/test/ssladapter_test.cpp
index 6321d1fbb662aada8a658aa4de107e003986b95e..a27e9ee5c5c7fde8b781be348779f57a57a87dc0 100644
--- a/resource/csdk/connectivity/test/ssladapter_test.cpp
+++ b/resource/csdk/connectivity/test/ssladapter_test.cpp
@@ -25,7 +25,7 @@
 
 #include <cinttypes>
 #include "iotivity_config.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "time.h"
 #include "octypes.h"
 #ifdef HAVE_WINSOCK2_H
diff --git a/resource/csdk/connectivity/test/uarraylist_test.cpp b/resource/csdk/connectivity/test/uarraylist_test.cpp
index 46d39be9e4cdaf61fa7271531bc9e73946ca70f4..4a37b6c3291304ae75bdf4f95d3df020fd779548 100644
--- a/resource/csdk/connectivity/test/uarraylist_test.cpp
+++ b/resource/csdk/connectivity/test/uarraylist_test.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "uarraylist.h"
 
diff --git a/resource/csdk/connectivity/test/ulinklist_test.cpp b/resource/csdk/connectivity/test/ulinklist_test.cpp
index 9ef777a39ed493cee62a867d2d7c60a4a9912b11..2f133a0e167ea6e4f82346689b52f00c207e2527 100644
--- a/resource/csdk/connectivity/test/ulinklist_test.cpp
+++ b/resource/csdk/connectivity/test/ulinklist_test.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "ulinklist.h"
 
diff --git a/resource/csdk/connectivity/test/uqueue_test.cpp b/resource/csdk/connectivity/test/uqueue_test.cpp
index ba439a9e90ca35ba1c4fafb23c34ce6dd7099bc4..eaab792d9ce57a4ecfbcc3c4c43d7811fa712214 100644
--- a/resource/csdk/connectivity/test/uqueue_test.cpp
+++ b/resource/csdk/connectivity/test/uqueue_test.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "uqueue.h"
 
diff --git a/resource/csdk/logger/test/loggertests.cpp b/resource/csdk/logger/test/loggertests.cpp
index 9e7b59a3b233ef33c299ee83435bb62d207e436e..0a9e4bc0eb23f312f0c414480d40c403517c77e5 100644
--- a/resource/csdk/logger/test/loggertests.cpp
+++ b/resource/csdk/logger/test/loggertests.cpp
@@ -24,7 +24,7 @@ extern "C" {
 }
 
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/csdk/resource-directory/unittests/rddatabase.cpp b/resource/csdk/resource-directory/unittests/rddatabase.cpp
index 36689be633490b52e055a07874f633801aa28876..d3d89108ed26c29fd884e77a8d039abafc381ab9 100644
--- a/resource/csdk/resource-directory/unittests/rddatabase.cpp
+++ b/resource/csdk/resource-directory/unittests/rddatabase.cpp
@@ -32,7 +32,7 @@ extern "C"
     #include "payload_logging.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/csdk/resource-directory/unittests/rdtests.cpp b/resource/csdk/resource-directory/unittests/rdtests.cpp
index 1ed5e3b84499296879de4fb2363c227c6ab2a330..b4cbf244e67e4dba303e011f73864a473f831bc2 100644
--- a/resource/csdk/resource-directory/unittests/rdtests.cpp
+++ b/resource/csdk/resource-directory/unittests/rdtests.cpp
@@ -33,7 +33,7 @@ extern "C"
     #include "coap/pdu.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp b/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp
index f948ddf4f6bd7d1cb55289ff132210e1d8a0c9bb..9545a8fd726de94e298f8d6341ba5c6611475933 100644
--- a/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp
+++ b/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * *****************************************************************/
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "credentialgenerator.h"
 #include "oic_malloc.h"
 
diff --git a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
index 51695678b48e83ed0aa2106262c492bc85383f8f..44336b870161f21fcce274cc9c4450b456ffbc67 100644
--- a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
+++ b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * *****************************************************************/
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocprovisioningmanager.h"
 
 static OicSecAcl_t acl1;
diff --git a/resource/csdk/security/provisioning/unittest/otmunittest.cpp b/resource/csdk/security/provisioning/unittest/otmunittest.cpp
index eac26948a3c33d66f12fb6bd48847e663f5d47f9..1dde21aeba759a870850f451317d9d32b3b2c365 100644
--- a/resource/csdk/security/provisioning/unittest/otmunittest.cpp
+++ b/resource/csdk/security/provisioning/unittest/otmunittest.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocstack.h"
 #include "utlist.h"
 #include "logger.h"
diff --git a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
index a2e53770d4c594e86960a5c949aed84275743cad..dafc6e88651eb2bae8cac99e35b1bea35357d063 100644
--- a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
+++ b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * *****************************************************************/
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "pmutility.h"
 #include "pmutilityinternal.h"
 #include "doxmresource.h"
diff --git a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp
index f6cd2a0af33a2c5e882e7297697cfbf2087119b1..2af25c02021e77bf874edc3cb8ee56f3cd748fca 100644
--- a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp
+++ b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp
@@ -18,7 +18,7 @@
  *
  * *****************************************************************/
 #include "iotivity_config.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "provisioningdatabasemanager.h"
 
 #ifdef _MSC_VER
diff --git a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
index 449f14de85c581ef9c6c01e208488e83dc121946..234a9a130db3e13f31459312110aa560dbe8e42d 100644
--- a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
+++ b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * *****************************************************************/
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "secureresourceprovider.h"
 
 static OicSecAcl_t acl;
diff --git a/resource/csdk/security/unittest/aclresourcetest.cpp b/resource/csdk/security/unittest/aclresourcetest.cpp
index aa62c7d99cb4a9e1d75a5b61ac9de73df6f478ee..4904136a9fa98eafb105743892ddf2743e9c0af7 100644
--- a/resource/csdk/security/unittest/aclresourcetest.cpp
+++ b/resource/csdk/security/unittest/aclresourcetest.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <coap/utlist.h>
 #include <sys/stat.h>
 #include "ocstack.h"
diff --git a/resource/csdk/security/unittest/amaclresourcetest.cpp b/resource/csdk/security/unittest/amaclresourcetest.cpp
index dbe82ff0eddf8d4ba26502829877938248c63643..0bef64f3a88f003cbfe3a904f1fde682b4415ff4 100644
--- a/resource/csdk/security/unittest/amaclresourcetest.cpp
+++ b/resource/csdk/security/unittest/amaclresourcetest.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "cainterface.h"
 #include "ocstack.h"
 #include "ocpayload.h"
diff --git a/resource/csdk/security/unittest/base64tests.cpp b/resource/csdk/security/unittest/base64tests.cpp
index 046c33c9b221094987ff804cdb832393729865c5..1ae5287ba5f0b47b1b63ee86c13a7a9558a899bf 100644
--- a/resource/csdk/security/unittest/base64tests.cpp
+++ b/resource/csdk/security/unittest/base64tests.cpp
@@ -18,7 +18,7 @@
   *
   ******************************************************************/
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "base64.h"
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/resource/csdk/security/unittest/credentialresource.cpp b/resource/csdk/security/unittest/credentialresource.cpp
index ed53b5595a4427c1ff28d5b0af8432b297abd9b1..446d9006de1c00f15d0e538698a48fe09d038b0d 100644
--- a/resource/csdk/security/unittest/credentialresource.cpp
+++ b/resource/csdk/security/unittest/credentialresource.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocpayload.h"
 #include "ocstack.h"
 #include "oic_malloc.h"
diff --git a/resource/csdk/security/unittest/crlresourcetest.cpp b/resource/csdk/security/unittest/crlresourcetest.cpp
index 3ef3fead1cb8c734e7fae2f80de8d29f20ae3f8c..bf406194ce1c99250025578c03d0b9b0f7dfe201 100644
--- a/resource/csdk/security/unittest/crlresourcetest.cpp
+++ b/resource/csdk/security/unittest/crlresourcetest.cpp
@@ -19,7 +19,7 @@
 ******************************************************************/
 #ifdef __WITH_DTLS__
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "logger.h"
 #include "ocpayload.h"
 #include "ocstack.h"
diff --git a/resource/csdk/security/unittest/directpairingtest.cpp b/resource/csdk/security/unittest/directpairingtest.cpp
index 4904b35ffa70c69fc0bde67ed75ff86745eb4438..c99b928d3e925625904151d05421e4e8b59053ab 100644
--- a/resource/csdk/security/unittest/directpairingtest.cpp
+++ b/resource/csdk/security/unittest/directpairingtest.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "directpairing.h"
 
 using namespace std;
diff --git a/resource/csdk/security/unittest/doxmresource.cpp b/resource/csdk/security/unittest/doxmresource.cpp
index 482de2c4e66c68a5bc88470217100a9a6651d640..c2855eeb5f471f8b3fbd18fadcbe4c01160184a5 100644
--- a/resource/csdk/security/unittest/doxmresource.cpp
+++ b/resource/csdk/security/unittest/doxmresource.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocstack.h"
 #include "ocserverrequest.h"
 #include "oic_string.h"
diff --git a/resource/csdk/security/unittest/iotvticalendartest.cpp b/resource/csdk/security/unittest/iotvticalendartest.cpp
index 80eb186849ad1741c6eb6e63b2e4464d88633365..7909b696dc6fb8e50513340cc3c9b3d87ae54721 100644
--- a/resource/csdk/security/unittest/iotvticalendartest.cpp
+++ b/resource/csdk/security/unittest/iotvticalendartest.cpp
@@ -19,7 +19,7 @@
 //Not supported on Arduino due lack of absolute time need to implement iCalendar
 #ifndef WITH_ARDUINO
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "iotvticalendar.h"
 #include "logger.h"
 
diff --git a/resource/csdk/security/unittest/pbkdf2tests.cpp b/resource/csdk/security/unittest/pbkdf2tests.cpp
index 2b7643141dd63844c009328aeb225c770aebdbad..f1b14eeb05f3606ff0673c78e69a3a3109a5f657 100644
--- a/resource/csdk/security/unittest/pbkdf2tests.cpp
+++ b/resource/csdk/security/unittest/pbkdf2tests.cpp
@@ -18,7 +18,7 @@
   *
   ******************************************************************/
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "pbkdf2.h"
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/resource/csdk/security/unittest/policyengine.cpp b/resource/csdk/security/unittest/policyengine.cpp
index 37926ed1732749153350cae5d480e24e69903a85..4480af57404360a51e3369bf448d017cfeafe767 100644
--- a/resource/csdk/security/unittest/policyengine.cpp
+++ b/resource/csdk/security/unittest/policyengine.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocstack.h"
 #include "cainterface.h"
 #include "srmresourcestrings.h"
diff --git a/resource/csdk/security/unittest/pstatresource.cpp b/resource/csdk/security/unittest/pstatresource.cpp
index 9c96d70ae4c7c3ed724d5d0f49eefdea170b7939..8fcc8329a606482c358b3ecf93e134050a268793 100644
--- a/resource/csdk/security/unittest/pstatresource.cpp
+++ b/resource/csdk/security/unittest/pstatresource.cpp
@@ -22,7 +22,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "ocpayload.h"
 #include "ocstack.h"
diff --git a/resource/csdk/security/unittest/securityresourcemanager.cpp b/resource/csdk/security/unittest/securityresourcemanager.cpp
index 2141dd081ebf0434ecf5c26737a60b2a42974330..17f86297b26acd2fba0b98acd0b359662583e8cf 100644
--- a/resource/csdk/security/unittest/securityresourcemanager.cpp
+++ b/resource/csdk/security/unittest/securityresourcemanager.cpp
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include "iotivity_config.h"
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/resource/csdk/security/unittest/srmtestcommon.cpp b/resource/csdk/security/unittest/srmtestcommon.cpp
index 7a554ea4446d725348a12990217abfbe96aaefca..556dc492470e9a7b1027f8c90d2394f165991903 100644
--- a/resource/csdk/security/unittest/srmtestcommon.cpp
+++ b/resource/csdk/security/unittest/srmtestcommon.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "oic_malloc.h"
 #include "ocstack.h"
 #include <stdlib.h>
diff --git a/resource/csdk/security/unittest/srmutility.cpp b/resource/csdk/security/unittest/srmutility.cpp
index 10dbabac3fbdeae251d864d69b77160c9c8f975c..8488cc4708b79568ac218322ca6867d3048ea9d2 100644
--- a/resource/csdk/security/unittest/srmutility.cpp
+++ b/resource/csdk/security/unittest/srmutility.cpp
@@ -16,7 +16,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "ocstack.h"
 #include "srmutility.h"
 #include "oic_string.h"
diff --git a/resource/csdk/stack/test/cbortests.cpp b/resource/csdk/stack/test/cbortests.cpp
index 7c2ecfaae091fffa7ebe56c9527ead172e38036b..0d00426c357546d808454676b204e484e115d798 100644
--- a/resource/csdk/stack/test/cbortests.cpp
+++ b/resource/csdk/stack/test/cbortests.cpp
@@ -29,7 +29,7 @@ extern "C"
     #include "oic_malloc.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/resource/csdk/stack/test/stacktests.cpp b/resource/csdk/stack/test/stacktests.cpp
index 33faf9ea761abf07cd0e17028742c53fa2504507..1435307204477ee302f07c8353f9b8a5fe53f91f 100644
--- a/resource/csdk/stack/test/stacktests.cpp
+++ b/resource/csdk/stack/test/stacktests.cpp
@@ -31,7 +31,7 @@ extern "C"
     #include "ocresourcehandler.h"
 }
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
index 524445d932cdf2b7289fa8d64d9e782c465a76b1..b8f3e38bdd738a0e16611a606d58833497e00732 100644
--- a/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
@@ -20,7 +20,7 @@
 
 #include <iostream>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "HippoMocks/hippomocks.h"
 
 #include "OCPlatform.h"
diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
index 65646fe33afc4c449c1e7b5e55f0a6a05f72f886..3c2738c1b451ef85aae4558ee1bfbed26e99f7a4 100644
--- a/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <unistd.h>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "HippoMocks/hippomocks.h"
 
 #include "BrokerTypes.h"
diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
index 69f16129c131bd1e012b79251b892c489867f786..9d3f6717384dc8df0c52a5515671cafe8243c274 100644
--- a/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
@@ -17,7 +17,7 @@
 // limitations under the License.
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "HippoMocks/hippomocks.h"
 
 #include "OCPlatform.h"
diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
index 01998876a8809ec7245efb15b3c2be08082ace55..7dd992763de9b531cffe9af565c6cb5b9e352952 100644
--- a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <memory>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "HippoMocks/hippomocks.h"
 
 #include "OCResource.h"