http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp 
b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
index 152ff34..a6c171d 100644
--- a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
+++ b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
@@ -1,5 +1,8 @@
-#ifndef INTERNALCACHETRANSACTIONMANAGER2PC_H_
-#define INTERNALCACHETRANSACTIONMANAGER2PC_H_
+#pragma once
+
+#ifndef GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_
+#define GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,4 +73,5 @@ class CPPCACHE_EXPORT InternalCacheTransactionManager2PC
 }  // namespace geode
 }  // namespace apache
 
-#endif /* INTERNALCACHETRANSACTIONMANAGER2PC_H_ */
+
+#endif // GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Log.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Log.hpp 
b/src/cppcache/include/gfcpp/Log.hpp
index 6948b47..fd60422 100644
--- a/src/cppcache/include/gfcpp/Log.hpp
+++ b/src/cppcache/include/gfcpp/Log.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_LOG_HPP_
-#define _GEMFIRE_LOG_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_LOG_H_
+#define GEODE_GFCPP_LOG_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -669,6 +671,4 @@ class CPPCACHE_EXPORT LogVarargs {
 
 
/******************************************************************************/
 
-#endif
-
-/******************************************************************************/
+#endif // GEODE_GFCPP_LOG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PartitionResolver.hpp 
b/src/cppcache/include/gfcpp/PartitionResolver.hpp
index 8e6eceb..c1de6e3 100644
--- a/src/cppcache/include/gfcpp/PartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/PartitionResolver.hpp
@@ -1,5 +1,8 @@
-#ifndef GEMFIRE_PARTITION_RESOLVER
-#define GEMFIRE_PARTITION_RESOLVER
+#pragma once
+
+#ifndef GEODE_GFCPP_PARTITIONRESOLVER_H_
+#define GEODE_GFCPP_PARTITIONRESOLVER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -104,4 +107,5 @@ class CPPCACHE_EXPORT PartitionResolver : public SharedBase 
{
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_GFCPP_PARTITIONRESOLVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp 
b/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp
index 6d3719f..fae16d2 100644
--- a/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp
+++ b/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp
@@ -1,5 +1,8 @@
-#ifndef PDX_AUTO_SERIALIZER_HPP
-#define PDX_AUTO_SERIALIZER_HPP
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXAUTOSERIALIZER_H_
+#define GEODE_GFCPP_PDXAUTOSERIALIZER_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -524,4 +527,5 @@ inline void 
readPdxObject(apache::geode::client::PdxReaderPtr& pr,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_SERIALIZER_HPP_
+
+#endif // GEODE_GFCPP_PDXAUTOSERIALIZER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxFieldTypes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxFieldTypes.hpp 
b/src/cppcache/include/gfcpp/PdxFieldTypes.hpp
index d425ce5..f2182fb 100644
--- a/src/cppcache/include/gfcpp/PdxFieldTypes.hpp
+++ b/src/cppcache/include/gfcpp/PdxFieldTypes.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXFIELDTYPES_HPP_
-#define __GEMFIRE_PDXFIELDTYPES_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXFIELDTYPES_H_
+#define GEODE_GFCPP_PDXFIELDTYPES_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,4 +54,5 @@ class CPPCACHE_EXPORT PdxFieldTypes {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* __GEMFIRE_PDXFIELDTYPES_HPP_ */
+
+#endif // GEODE_GFCPP_PDXFIELDTYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxInstance.hpp 
b/src/cppcache/include/gfcpp/PdxInstance.hpp
index 2d80a69..465ea28 100644
--- a/src/cppcache/include/gfcpp/PdxInstance.hpp
+++ b/src/cppcache/include/gfcpp/PdxInstance.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXINSTANCE_HPP_
-#define __GEMFIRE_PDXINSTANCE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXINSTANCE_H_
+#define GEODE_GFCPP_PDXINSTANCE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -612,4 +614,5 @@ class CPPCACHE_EXPORT PdxInstance : public PdxSerializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* __GEMFIRE_PDXINSTANCE_HPP_ */
+
+#endif // GEODE_GFCPP_PDXINSTANCE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxInstanceFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxInstanceFactory.hpp 
b/src/cppcache/include/gfcpp/PdxInstanceFactory.hpp
index d2ec544..412b0bf 100644
--- a/src/cppcache/include/gfcpp/PdxInstanceFactory.hpp
+++ b/src/cppcache/include/gfcpp/PdxInstanceFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __PDXINSTANCE_FACTORY_HPP_
-#define __PDXINSTANCE_FACTORY_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXINSTANCEFACTORY_H_
+#define GEODE_GFCPP_PDXINSTANCEFACTORY_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -471,4 +474,5 @@ class CPPCACHE_EXPORT PdxInstanceFactory : public 
SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __PDXINSTANCE_FACTORY_HPP_ */
+
+#endif // GEODE_GFCPP_PDXINSTANCEFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxReader.hpp 
b/src/cppcache/include/gfcpp/PdxReader.hpp
index ff9cdb3..7f91e6d 100644
--- a/src/cppcache/include/gfcpp/PdxReader.hpp
+++ b/src/cppcache/include/gfcpp/PdxReader.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXREADER_H__
-#define __GEMFIRE_PDXREADER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXREADER_H_
+#define GEODE_GFCPP_PDXREADER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -414,4 +416,5 @@ class CPPCACHE_EXPORT PdxReader : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXREADER_HPP_ */
+
+#endif // GEODE_GFCPP_PDXREADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxSerializable.hpp 
b/src/cppcache/include/gfcpp/PdxSerializable.hpp
index 1180b48..8f83a0c 100644
--- a/src/cppcache/include/gfcpp/PdxSerializable.hpp
+++ b/src/cppcache/include/gfcpp/PdxSerializable.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXSERIALIZABLE_H__
-#define __GEMFIRE_PDXSERIALIZABLE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXSERIALIZABLE_H_
+#define GEODE_GFCPP_PDXSERIALIZABLE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -109,4 +111,4 @@ class CPPCACHE_EXPORT PdxSerializable : public CacheableKey 
{
 }  // namespace geode
 }  // namespace apache
 
-#endif /* PDXSERIALIZABLE_HPP_ */
+#endif // GEODE_GFCPP_PDXSERIALIZABLE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxSerializer.hpp 
b/src/cppcache/include/gfcpp/PdxSerializer.hpp
index 5ba641a..064f289 100644
--- a/src/cppcache/include/gfcpp/PdxSerializer.hpp
+++ b/src/cppcache/include/gfcpp/PdxSerializer.hpp
@@ -1,5 +1,8 @@
-#ifndef PDXSERIALIZER_HPP_
-#define PDXSERIALIZER_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXSERIALIZER_H_
+#define GEODE_GFCPP_PDXSERIALIZER_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -87,4 +90,5 @@ class CPPCACHE_EXPORT PdxSerializer : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* PDXSERIALIZER_HPP_ */
+
+#endif // GEODE_GFCPP_PDXSERIALIZER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxUnreadFields.hpp 
b/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
index 113101f..bc75400 100644
--- a/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
+++ b/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXUNREADFIELDS_HPP_
-#define __GEMFIRE_PDXUNREADFIELDS_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXUNREADFIELDS_H_
+#define GEODE_GFCPP_PDXUNREADFIELDS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,4 +50,4 @@ class CPPCACHE_EXPORT PdxUnreadFields : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __GEMFIRE_PDXUNREADFIELDS_HPP_ */
+#endif // GEODE_GFCPP_PDXUNREADFIELDS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxWrapper.hpp 
b/src/cppcache/include/gfcpp/PdxWrapper.hpp
index 03a6099..3351a0e 100644
--- a/src/cppcache/include/gfcpp/PdxWrapper.hpp
+++ b/src/cppcache/include/gfcpp/PdxWrapper.hpp
@@ -1,5 +1,8 @@
-#ifndef _PDXWRAPPER_HPP_
-#define _PDXWRAPPER_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXWRAPPER_H_
+#define GEODE_GFCPP_PDXWRAPPER_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -133,4 +136,5 @@ class CPPCACHE_EXPORT PdxWrapper : public PdxSerializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* _PDXWRAPPER_HPP_ */
+
+#endif // GEODE_GFCPP_PDXWRAPPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PdxWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PdxWriter.hpp 
b/src/cppcache/include/gfcpp/PdxWriter.hpp
index ec2197e..795cbad 100644
--- a/src/cppcache/include/gfcpp/PdxWriter.hpp
+++ b/src/cppcache/include/gfcpp/PdxWriter.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXWRITER_H__
-#define __GEMFIRE_PDXWRITER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_PDXWRITER_H_
+#define GEODE_GFCPP_PDXWRITER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -445,4 +447,5 @@ class CPPCACHE_EXPORT PdxWriter : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXWRITER_HPP_ */
+
+#endif // GEODE_GFCPP_PDXWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PersistenceManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PersistenceManager.hpp 
b/src/cppcache/include/gfcpp/PersistenceManager.hpp
index 135e4a0..ac8e508 100644
--- a/src/cppcache/include/gfcpp/PersistenceManager.hpp
+++ b/src/cppcache/include/gfcpp/PersistenceManager.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_PERSISTENCEMANAGER_H__
-#define __GEMFIRE_PERSISTENCEMANAGER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_PERSISTENCEMANAGER_H_
+#define GEODE_GFCPP_PERSISTENCEMANAGER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -133,4 +136,5 @@ class CPPCACHE_EXPORT PersistenceManager : public 
SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_PERSISTENCEMANAGER_H__
+
+#endif // GEODE_GFCPP_PERSISTENCEMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Pool.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Pool.hpp 
b/src/cppcache/include/gfcpp/Pool.hpp
index 06f07a4..95259a9 100644
--- a/src/cppcache/include/gfcpp/Pool.hpp
+++ b/src/cppcache/include/gfcpp/Pool.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_POOL_HPP__
-#define __GEMFIRE_POOL_HPP__
+#pragma once
+
+#ifndef GEODE_GFCPP_POOL_H_
+#define GEODE_GFCPP_POOL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -282,4 +285,4 @@ class CPPCACHE_EXPORT Pool : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_POOL_HPP__
+#endif // GEODE_GFCPP_POOL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PoolFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PoolFactory.hpp 
b/src/cppcache/include/gfcpp/PoolFactory.hpp
index cb74e49..34d3b04 100644
--- a/src/cppcache/include/gfcpp/PoolFactory.hpp
+++ b/src/cppcache/include/gfcpp/PoolFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_POOL_FACTORY_HPP__
-#define __GEMFIRE_POOL_FACTORY_HPP__
+#pragma once
+
+#ifndef GEODE_GFCPP_POOLFACTORY_H_
+#define GEODE_GFCPP_POOLFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -532,4 +535,5 @@ class CPPCACHE_EXPORT PoolFactory : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_POOL_FACTORY_HPP__
+
+#endif // GEODE_GFCPP_POOLFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/PoolManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PoolManager.hpp 
b/src/cppcache/include/gfcpp/PoolManager.hpp
index 5a5ef4f..c9b6006 100644
--- a/src/cppcache/include/gfcpp/PoolManager.hpp
+++ b/src/cppcache/include/gfcpp/PoolManager.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_POOL_MANAGER_HPP__
-#define __GEMFIRE_POOL_MANAGER_HPP__
+#pragma once
+
+#ifndef GEODE_GFCPP_POOLMANAGER_H_
+#define GEODE_GFCPP_POOLMANAGER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,4 +97,4 @@ class CPPCACHE_EXPORT PoolManager {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_POOL_MANAGER_HPP__
+#endif // GEODE_GFCPP_POOLMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Properties.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Properties.hpp 
b/src/cppcache/include/gfcpp/Properties.hpp
index a3df51f..fcb9904 100644
--- a/src/cppcache/include/gfcpp/Properties.hpp
+++ b/src/cppcache/include/gfcpp/Properties.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_PROPERTIES_H__
-#define __GEMFIRE_PROPERTIES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_PROPERTIES_H_
+#define GEODE_GFCPP_PROPERTIES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -157,4 +160,5 @@ class CPPCACHE_EXPORT Properties : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_PROPERTIES_H__
+
+#endif // GEODE_GFCPP_PROPERTIES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Query.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Query.hpp 
b/src/cppcache/include/gfcpp/Query.hpp
index 27a77aa..9b60167 100644
--- a/src/cppcache/include/gfcpp/Query.hpp
+++ b/src/cppcache/include/gfcpp/Query.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_QUERY_H__
-#define __GEMFIRE_QUERY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_QUERY_H_
+#define GEODE_GFCPP_QUERY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -118,4 +121,4 @@ class CPPCACHE_EXPORT Query : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_QUERY_H__
+#endif // GEODE_GFCPP_QUERY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/QueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/QueryService.hpp 
b/src/cppcache/include/gfcpp/QueryService.hpp
index d5e9021..7a345eb 100644
--- a/src/cppcache/include/gfcpp/QueryService.hpp
+++ b/src/cppcache/include/gfcpp/QueryService.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_QUERYSERVICE_H__
-#define __GEMFIRE_QUERYSERVICE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_QUERYSERVICE_H_
+#define GEODE_GFCPP_QUERYSERVICE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -171,4 +174,4 @@ class CPPCACHE_EXPORT QueryService : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_QUERYSERVICE_H__
+#endif // GEODE_GFCPP_QUERYSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Region.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Region.hpp 
b/src/cppcache/include/gfcpp/Region.hpp
index 6b04225..833f5d3 100644
--- a/src/cppcache/include/gfcpp/Region.hpp
+++ b/src/cppcache/include/gfcpp/Region.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_REGION_H__
-#define __GEMFIRE_REGION_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_REGION_H_
+#define GEODE_GFCPP_REGION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1450,4 +1452,4 @@ class CPPCACHE_EXPORT Region : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGION_H__
+#endif // GEODE_GFCPP_REGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionAttributes.hpp 
b/src/cppcache/include/gfcpp/RegionAttributes.hpp
index 7c72e56..f7a2bf8 100644
--- a/src/cppcache/include/gfcpp/RegionAttributes.hpp
+++ b/src/cppcache/include/gfcpp/RegionAttributes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REGIONATTRIBUTES_H__
-#define __GEMFIRE_REGIONATTRIBUTES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONATTRIBUTES_H_
+#define GEODE_GFCPP_REGIONATTRIBUTES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -397,4 +400,4 @@ class CPPCACHE_EXPORT RegionAttributes : public 
Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONATTRIBUTES_H__
+#endif // GEODE_GFCPP_REGIONATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionEntry.hpp 
b/src/cppcache/include/gfcpp/RegionEntry.hpp
index 143ccd9..f3423c4 100644
--- a/src/cppcache/include/gfcpp/RegionEntry.hpp
+++ b/src/cppcache/include/gfcpp/RegionEntry.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REGIONENTRY_H__
-#define __GEMFIRE_REGIONENTRY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONENTRY_H_
+#define GEODE_GFCPP_REGIONENTRY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -105,4 +108,4 @@ class CPPCACHE_EXPORT RegionEntry : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_REGIONENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionEvent.hpp 
b/src/cppcache/include/gfcpp/RegionEvent.hpp
index 043b775..c5254ac 100644
--- a/src/cppcache/include/gfcpp/RegionEvent.hpp
+++ b/src/cppcache/include/gfcpp/RegionEvent.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_REGIONEVENT_HPP_
-#define _GEMFIRE_REGIONEVENT_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONEVENT_H_
+#define GEODE_GFCPP_REGIONEVENT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -71,4 +74,4 @@ class CPPCACHE_EXPORT RegionEvent {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_REGIONEVENT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionFactory.hpp 
b/src/cppcache/include/gfcpp/RegionFactory.hpp
index e83c426..31323a6 100644
--- a/src/cppcache/include/gfcpp/RegionFactory.hpp
+++ b/src/cppcache/include/gfcpp/RegionFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REGIONFACTORY_H__
-#define __GEMFIRE_REGIONFACTORY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONFACTORY_H_
+#define GEODE_GFCPP_REGIONFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -265,4 +268,4 @@ class CPPCACHE_EXPORT RegionFactory : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONFACTORY_H__
+#endif // GEODE_GFCPP_REGIONFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionService.hpp 
b/src/cppcache/include/gfcpp/RegionService.hpp
index 4553f6c..5b800d4 100644
--- a/src/cppcache/include/gfcpp/RegionService.hpp
+++ b/src/cppcache/include/gfcpp/RegionService.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONSERVICE_H_
+#define GEODE_GFCPP_REGIONSERVICE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __GEMFIRE_RegionService_H__
-#define __GEMFIRE_RegionService_H__
 
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
@@ -117,4 +120,5 @@ class CPPCACHE_EXPORT RegionService : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_RegionService_H__
+
+#endif // GEODE_GFCPP_REGIONSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/RegionShortcut.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/RegionShortcut.hpp 
b/src/cppcache/include/gfcpp/RegionShortcut.hpp
index 3a8119c..4cf0db4 100644
--- a/src/cppcache/include/gfcpp/RegionShortcut.hpp
+++ b/src/cppcache/include/gfcpp/RegionShortcut.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_REGIONSHORTCUT_H__
-#define __GEMFIRE_REGIONSHORTCUT_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_REGIONSHORTCUT_H_
+#define GEODE_GFCPP_REGIONSHORTCUT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -74,4 +76,4 @@ enum RegionShortcut {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONSHORTCUT_H__
+#endif // GEODE_GFCPP_REGIONSHORTCUT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/ResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ResultCollector.hpp 
b/src/cppcache/include/gfcpp/ResultCollector.hpp
index 683e88e..7cdae0f 100644
--- a/src/cppcache/include/gfcpp/ResultCollector.hpp
+++ b/src/cppcache/include/gfcpp/ResultCollector.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_RESULTCOLLECTOR_H__
-#define __GEMFIRE_RESULTCOLLECTOR_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_RESULTCOLLECTOR_H_
+#define GEODE_GFCPP_RESULTCOLLECTOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -107,4 +110,5 @@ class CPPCACHE_EXPORT ResultCollector : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_RESULTCOLLECTOR_H__
+
+#endif // GEODE_GFCPP_RESULTCOLLECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/ResultSet.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ResultSet.hpp 
b/src/cppcache/include/gfcpp/ResultSet.hpp
index b4703c7..0c8754f 100644
--- a/src/cppcache/include/gfcpp/ResultSet.hpp
+++ b/src/cppcache/include/gfcpp/ResultSet.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_RESULTSET_H__
-#define __GEMFIRE_RESULTSET_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_RESULTSET_H_
+#define GEODE_GFCPP_RESULTSET_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -81,4 +84,4 @@ class CPPCACHE_EXPORT ResultSet : public SelectResults {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_RESULTSET_H__
+#endif // GEODE_GFCPP_RESULTSET_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SelectResults.hpp 
b/src/cppcache/include/gfcpp/SelectResults.hpp
index bc3e9f4..316be5d 100644
--- a/src/cppcache/include/gfcpp/SelectResults.hpp
+++ b/src/cppcache/include/gfcpp/SelectResults.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_SELECTRESULTS_H__
-#define __GEMFIRE_SELECTRESULTS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_SELECTRESULTS_H_
+#define GEODE_GFCPP_SELECTRESULTS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -84,4 +87,4 @@ class CPPCACHE_EXPORT SelectResults : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_SELECTRESULTS_H__
+#endif // GEODE_GFCPP_SELECTRESULTS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SelectResultsIterator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SelectResultsIterator.hpp 
b/src/cppcache/include/gfcpp/SelectResultsIterator.hpp
index f4f2004..118f1f0 100644
--- a/src/cppcache/include/gfcpp/SelectResultsIterator.hpp
+++ b/src/cppcache/include/gfcpp/SelectResultsIterator.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_SELECTRESULTSITERATOR_H__
-#define __GEMFIRE_SELECTRESULTSITERATOR_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_SELECTRESULTSITERATOR_H_
+#define GEODE_GFCPP_SELECTRESULTSITERATOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -98,4 +101,4 @@ class CPPCACHE_EXPORT SelectResultsIterator : public 
SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_SELECTRESULTSITERATOR_H__
+#endif // GEODE_GFCPP_SELECTRESULTSITERATOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Serializable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Serializable.hpp 
b/src/cppcache/include/gfcpp/Serializable.hpp
index 6056754..e545712 100644
--- a/src/cppcache/include/gfcpp/Serializable.hpp
+++ b/src/cppcache/include/gfcpp/Serializable.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_SERIALIZABLE_H__
-#define __GEMFIRE_SERIALIZABLE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_SERIALIZABLE_H_
+#define GEODE_GFCPP_SERIALIZABLE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -166,4 +169,4 @@ class CPPCACHE_EXPORT Serializable : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_SERIALIZABLE_H__
+#endif // GEODE_GFCPP_SERIALIZABLE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Serializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Serializer.hpp 
b/src/cppcache/include/gfcpp/Serializer.hpp
index e998d84..c7cc41a 100644
--- a/src/cppcache/include/gfcpp/Serializer.hpp
+++ b/src/cppcache/include/gfcpp/Serializer.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_SERIALIZER_HPP_
-#define _GEMFIRE_SERIALIZER_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_SERIALIZER_H_
+#define GEODE_GFCPP_SERIALIZER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -452,4 +454,4 @@ inline float zeroObject<float>() {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_SERIALIZER_HPP_
+#endif // GEODE_GFCPP_SERIALIZER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SharedBase.hpp 
b/src/cppcache/include/gfcpp/SharedBase.hpp
index cc9132a..004b8c5 100644
--- a/src/cppcache/include/gfcpp/SharedBase.hpp
+++ b/src/cppcache/include/gfcpp/SharedBase.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_SHAREDBASE_HPP_
-#define _GEMFIRE_SHAREDBASE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_SHAREDBASE_H_
+#define GEODE_GFCPP_SHAREDBASE_H_
 
 // SharedBase.hpp     -*- mode: c++ -*-
 
@@ -86,4 +88,4 @@ class CPPCACHE_EXPORT NullSharedBase : public SharedBase {
 
 #define NULLPTR ::apache::geode::client::NullSharedBase::s_instancePtr
 
-#endif  //#define _GEMFIRE_SHAREDBASE_HPP_
+#endif // GEODE_GFCPP_SHAREDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SharedPtr.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SharedPtr.hpp 
b/src/cppcache/include/gfcpp/SharedPtr.hpp
index c83b2c5..30a5bdc 100644
--- a/src/cppcache/include/gfcpp/SharedPtr.hpp
+++ b/src/cppcache/include/gfcpp/SharedPtr.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_SHAREDPTR_HPP_
-#define _GEMFIRE_SHAREDPTR_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_SHAREDPTR_H_
+#define GEODE_GFCPP_SHAREDPTR_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -280,4 +282,4 @@ bool instanceOf(const SharedPtr<Other>& other) {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_SHAREDPTR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SharedPtrHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SharedPtrHelper.hpp 
b/src/cppcache/include/gfcpp/SharedPtrHelper.hpp
index 8ab568f..425bc21 100644
--- a/src/cppcache/include/gfcpp/SharedPtrHelper.hpp
+++ b/src/cppcache/include/gfcpp/SharedPtrHelper.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_SPEHELPER_HPP_
-#define _GEMFIRE_SPEHELPER_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_SHAREDPTRHELPER_H_
+#define GEODE_GFCPP_SHAREDPTRHELPER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,4 +80,4 @@ SharedBase* getSB(Src* ptr) {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_SHAREDPTRHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/Struct.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Struct.hpp 
b/src/cppcache/include/gfcpp/Struct.hpp
index 1aed4e2..7c3f199 100644
--- a/src/cppcache/include/gfcpp/Struct.hpp
+++ b/src/cppcache/include/gfcpp/Struct.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_STRUCT_H__
-#define __GEMFIRE_STRUCT_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_STRUCT_H_
+#define GEODE_GFCPP_STRUCT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -157,4 +160,4 @@ class CPPCACHE_EXPORT Struct : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_STRUCT_H__
+#endif // GEODE_GFCPP_STRUCT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/StructSet.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/StructSet.hpp 
b/src/cppcache/include/gfcpp/StructSet.hpp
index 128a6ad..01fccbe 100644
--- a/src/cppcache/include/gfcpp/StructSet.hpp
+++ b/src/cppcache/include/gfcpp/StructSet.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_STRUCTSET_H__
-#define __GEMFIRE_STRUCTSET_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_STRUCTSET_H_
+#define GEODE_GFCPP_STRUCTSET_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -99,4 +102,4 @@ class CPPCACHE_EXPORT StructSet : public CqResults {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_STRUCTSET_H__
+#endif // GEODE_GFCPP_STRUCTSET_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/SystemProperties.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/SystemProperties.hpp 
b/src/cppcache/include/gfcpp/SystemProperties.hpp
index 9c81d2a..c24b8e4 100644
--- a/src/cppcache/include/gfcpp/SystemProperties.hpp
+++ b/src/cppcache/include/gfcpp/SystemProperties.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_SYSTEMPROPERTIES_HPP_
-#define _GEMFIRE_SYSTEMPROPERTIES_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_SYSTEMPROPERTIES_H_
+#define GEODE_GFCPP_SYSTEMPROPERTIES_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -507,4 +509,4 @@ class CPPCACHE_EXPORT SystemProperties {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_SYSTEMPROPERTIES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/TransactionId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/TransactionId.hpp 
b/src/cppcache/include/gfcpp/TransactionId.hpp
index c329010..ba933fe 100644
--- a/src/cppcache/include/gfcpp/TransactionId.hpp
+++ b/src/cppcache/include/gfcpp/TransactionId.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_TRANSACTIONID_H_
+#define GEODE_GFCPP_TRANSACTIONID_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: ankurs
  */
 
-#ifndef TRANSACTIONID_H_
-#define TRANSACTIONID_H_
 
 #include "SharedBase.hpp"
 
@@ -44,4 +47,5 @@ class CPPCACHE_EXPORT TransactionId : public 
apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TRANSACTIONID_H_ */
+
+#endif // GEODE_GFCPP_TRANSACTIONID_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/TypeHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/TypeHelper.hpp 
b/src/cppcache/include/gfcpp/TypeHelper.hpp
index 41a98a3..f56a6d9 100644
--- a/src/cppcache/include/gfcpp/TypeHelper.hpp
+++ b/src/cppcache/include/gfcpp/TypeHelper.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_TYPEHELPER_HPP_
-#define _GEMFIRE_TYPEHELPER_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_TYPEHELPER_H_
+#define GEODE_GFCPP_TYPEHELPER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -149,4 +151,4 @@ struct UnwrapSharedPtr<SharedArrayPtr<T, ID> > {
       apache::geode::client::TypeHelper::SuperSubclass<TARGET, \
                                                        SRC>::result>::value
 
-#endif  // _GEMFIRE_TYPEHELPER_HPP_
+#endif // GEODE_GFCPP_TYPEHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/UserData.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/UserData.hpp 
b/src/cppcache/include/gfcpp/UserData.hpp
index e6526e4..598def5 100644
--- a/src/cppcache/include/gfcpp/UserData.hpp
+++ b/src/cppcache/include/gfcpp/UserData.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_USERDATA_H__
-#define __GEMFIRE_USERDATA_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_USERDATA_H_
+#define GEODE_GFCPP_USERDATA_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -34,4 +37,4 @@ typedef SharedPtr<UserData> UserDataPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_USERDATA_H__
+#endif // GEODE_GFCPP_USERDATA_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp 
b/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
index bc0f9de..7eb6176 100644
--- a/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
+++ b/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_USERFUNCTIONEXECUTIONEXCEPTION_H_
+#define GEODE_GFCPP_USERFUNCTIONEXECUTIONEXCEPTION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef USER_FUNCTION_EXECUTION_EXCEPTION
-#define USER_FUNCTION_EXECUTION_EXCEPTION
 
 #include "Serializable.hpp"
 #include "CacheableString.hpp"
@@ -118,4 +121,5 @@ class UserFunctionExecutionException : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_GFCPP_USERFUNCTIONEXECUTIONEXCEPTION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/VectorOfSharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/VectorOfSharedBase.hpp 
b/src/cppcache/include/gfcpp/VectorOfSharedBase.hpp
index 0d014a4..9fea9f5 100644
--- a/src/cppcache/include/gfcpp/VectorOfSharedBase.hpp
+++ b/src/cppcache/include/gfcpp/VectorOfSharedBase.hpp
@@ -1,6 +1,7 @@
+#pragma once
 
-#ifndef _GEMFIRE_VECTOROFSHAREDBASE_HPP_
-#define _GEMFIRE_VECTOROFSHAREDBASE_HPP_
+#ifndef GEODE_GFCPP_VECTOROFSHAREDBASE_H_
+#define GEODE_GFCPP_VECTOROFSHAREDBASE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -169,4 +170,4 @@ class CPPCACHE_EXPORT VectorOfSharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_VECTOROFSHAREDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/VectorT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/VectorT.hpp 
b/src/cppcache/include/gfcpp/VectorT.hpp
index acdf05c..d7eea3a 100644
--- a/src/cppcache/include/gfcpp/VectorT.hpp
+++ b/src/cppcache/include/gfcpp/VectorT.hpp
@@ -1,6 +1,7 @@
+#pragma once
 
-#ifndef _GEMFIRE_VECTORT_HPP_
-#define _GEMFIRE_VECTORT_HPP_
+#ifndef GEODE_GFCPP_VECTORT_H_
+#define GEODE_GFCPP_VECTORT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -256,4 +257,4 @@ typedef SharedPtr<VectorOfCacheableKey> 
VectorOfCacheableKeyPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_VECTORT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/WritablePdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/WritablePdxInstance.hpp 
b/src/cppcache/include/gfcpp/WritablePdxInstance.hpp
index 437054e..d576c0e 100644
--- a/src/cppcache/include/gfcpp/WritablePdxInstance.hpp
+++ b/src/cppcache/include/gfcpp/WritablePdxInstance.hpp
@@ -1,5 +1,8 @@
-#ifndef __WRITABLE_PDXINSTANCE_HPP_
-#define __WRITABLE_PDXINSTANCE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_WRITABLEPDXINSTANCE_H_
+#define GEODE_GFCPP_WRITABLEPDXINSTANCE_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -535,4 +538,5 @@ class CPPCACHE_EXPORT WritablePdxInstance : public 
PdxInstance {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __WRITABLE_PDXINSTANCE_HPP_ */
+
+#endif // GEODE_GFCPP_WRITABLEPDXINSTANCE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/gf_base.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/gf_base.hpp 
b/src/cppcache/include/gfcpp/gf_base.hpp
index ec51055..9e70eca 100644
--- a/src/cppcache/include/gfcpp/gf_base.hpp
+++ b/src/cppcache/include/gfcpp/gf_base.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_GF_BASE_HPP_
-#define _GEMFIRE_GF_BASE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_GF_BASE_H_
+#define GEODE_GFCPP_GF_BASE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -352,4 +355,4 @@ void operator delete[](void *p);
     x = NULL;                   \
   }
 
-#endif
+#endif // GEODE_GFCPP_GF_BASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/gf_types.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/gf_types.hpp 
b/src/cppcache/include/gfcpp/gf_types.hpp
index 255aa42..6e1a16a 100644
--- a/src/cppcache/include/gfcpp/gf_types.hpp
+++ b/src/cppcache/include/gfcpp/gf_types.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_GF_TYPEDEF_H__
-#define __GEMFIRE_GF_TYPEDEF_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_GF_TYPES_H_
+#define GEODE_GFCPP_GF_TYPES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -104,4 +107,5 @@ _GF_PTR_DEF_(InternalCacheTransactionManager2PC,
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_GF_TYPEDEF_H__
+
+#endif // GEODE_GFCPP_GF_TYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/gfcpp_globals.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/gfcpp_globals.hpp 
b/src/cppcache/include/gfcpp/gfcpp_globals.hpp
index 1f1cadf..e2ccdaf 100644
--- a/src/cppcache/include/gfcpp/gfcpp_globals.hpp
+++ b/src/cppcache/include/gfcpp/gfcpp_globals.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_GFCPP_GLOBALS_H__
-#define __GEMFIRE_GFCPP_GLOBALS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_GFCPP_GLOBALS_H_
+#define GEODE_GFCPP_GFCPP_GLOBALS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -113,4 +116,4 @@ extern void CPPCACHE_EXPORT setNewAndDelete(pNew, pDelete);
 #include "Log.hpp"
 #include "Assert.hpp"
 
-#endif  // __GEMFIRE_GFCPP_GLOBALS_H__
+#endif // GEODE_GFCPP_GFCPP_GLOBALS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp 
b/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
index 2aa45a5..72f720e 100644
--- a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
+++ b/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICDESCRIPTOR_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICDESCRIPTOR_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_H_
+#define GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -88,4 +90,4 @@ class CPPCACHE_EXPORT StatisticDescriptor {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_STATISTICDESCRIPTOR_HPP_
+#endif // GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/statistics/Statistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/Statistics.hpp 
b/src/cppcache/include/gfcpp/statistics/Statistics.hpp
index bba0782..8072f48 100644
--- a/src/cppcache/include/gfcpp/statistics/Statistics.hpp
+++ b/src/cppcache/include/gfcpp/statistics/Statistics.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICS_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICS_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_STATISTICS_STATISTICS_H_
+#define GEODE_GFCPP_STATISTICS_STATISTICS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -526,4 +529,4 @@ class CPPCACHE_EXPORT Statistics {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_STATISTICS_HPP_
+#endif // GEODE_GFCPP_STATISTICS_STATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp 
b/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
index b03fc11..d0549ef 100644
--- a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
+++ b/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICSFACTORY_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICSFACTORY_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_H_
+#define GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -217,4 +220,4 @@ class CPPCACHE_EXPORT StatisticsFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //  _GEMFIRE__STATISTICS_STATISTICSFACTORY_HPP_
+#endif // GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp 
b/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
index 1991097..365072d 100644
--- a/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
+++ b/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICSTYPE_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICSTYPE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_STATISTICS_STATISTICSTYPE_H_
+#define GEODE_GFCPP_STATISTICS_STATISTICSTYPE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -93,4 +96,4 @@ class CPPCACHE_EXPORT StatisticsType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_STATISTICSTYPE_H__
+#endif // GEODE_GFCPP_STATISTICS_STATISTICSTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/BBNamingContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/BBNamingContext.hpp 
b/src/cppcache/integration-test/BBNamingContext.hpp
index 0148a28..969e809 100644
--- a/src/cppcache/integration-test/BBNamingContext.hpp
+++ b/src/cppcache/integration-test/BBNamingContext.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_BBNAMINGCONTEXT_H_
+#define GEODE_INTEGRATION_TEST_BBNAMINGCONTEXT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
 // move them there.
 // This will avoid pulling in a lot of framework headers to cause compilation
 // grieve, especially with the stl stuff.
-#ifndef __BB_NAMING_CONTEXT__
-#define __BB_NAMING_CONTEXT__
 #include <stdlib.h>
 #include <string>
 class BBNamingContextClientImpl;
@@ -43,4 +46,5 @@ class BBNamingContextServer {
   BBNamingContextServer();
   ~BBNamingContextServer();
 };
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_BBNAMINGCONTEXT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp 
b/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
index d5636fa..7004035 100644
--- a/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
+++ b/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_BUILTINCACHEABLEWRAPPERS_H_
+#define GEODE_INTEGRATION_TEST_BUILTINCACHEABLEWRAPPERS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _GF_TEST_BUILTIN_CACHEABLEWRAPPERS_HPP_
-#define _GF_TEST_BUILTIN_CACHEABLEWRAPPERS_HPP_
 
 #include "CacheableWrapper.hpp"
 extern "C" {
@@ -1311,4 +1314,5 @@ void registerBuiltins(bool isRegisterFileName = false) {
 }
 }  // namespace CacheableHelper
 
-#endif  // _GF_TEST_BUILTIN_CACHEABLEWRAPPERS_HPP_
+
+#endif // GEODE_INTEGRATION_TEST_BUILTINCACHEABLEWRAPPERS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/CacheHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.hpp 
b/src/cppcache/integration-test/CacheHelper.hpp
index e0aa0b8..d143aa2 100644
--- a/src/cppcache/integration-test/CacheHelper.hpp
+++ b/src/cppcache/integration-test/CacheHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_CACHEHELPER_H_
+#define GEODE_INTEGRATION_TEST_CACHEHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TEST_CACHEHELPER_HPP
-#define TEST_CACHEHELPER_HPP
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
@@ -327,4 +330,5 @@ int CacheHelper::staticLocatorHostPort1 = 
CacheHelper::getRandomAvailablePort();
 int CacheHelper::staticLocatorHostPort2 = 
CacheHelper::getRandomAvailablePort();
 int CacheHelper::staticLocatorHostPort3 = 
CacheHelper::getRandomAvailablePort();
 #endif
-#endif  // TEST_CACHEHELPER_HPP
+
+#endif // GEODE_INTEGRATION_TEST_CACHEHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/CacheImplHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheImplHelper.hpp 
b/src/cppcache/integration-test/CacheImplHelper.hpp
index bba4f56..44143eb 100644
--- a/src/cppcache/integration-test/CacheImplHelper.hpp
+++ b/src/cppcache/integration-test/CacheImplHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_CACHEIMPLHELPER_H_
+#define GEODE_INTEGRATION_TEST_CACHEIMPLHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TEST_CACHEIMPLHELPER_HPP
-#define TEST_CACHEIMPLHELPER_HPP
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
@@ -63,4 +66,5 @@ class CacheImplHelper : public CacheHelper {
     ASSERT(regionPtr != NULLPTR, "failed to create region.");
   }
 };
-#endif  // TEST_CACHEHELPER_HPP
+
+#endif // GEODE_INTEGRATION_TEST_CACHEIMPLHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/CacheableWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheableWrapper.hpp 
b/src/cppcache/integration-test/CacheableWrapper.hpp
index 509c3d1..cca0761 100644
--- a/src/cppcache/integration-test/CacheableWrapper.hpp
+++ b/src/cppcache/integration-test/CacheableWrapper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_CACHEABLEWRAPPER_H_
+#define GEODE_INTEGRATION_TEST_CACHEABLEWRAPPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _GF_TEST_CACHEABLEWRAPPER_HPP_
-#define _GF_TEST_CACHEABLEWRAPPER_HPP_
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string>
@@ -129,4 +132,5 @@ std::string CacheableWrapperFactory::getTypeForId(int8_t 
typeId) {
   }
 }
 
-#endif  // _GF_TEST_CACHEABLEWRAPPER_HPP_
+
+#endif // GEODE_INTEGRATION_TEST_CACHEABLEWRAPPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/DeltaEx.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/DeltaEx.hpp 
b/src/cppcache/integration-test/DeltaEx.hpp
index 513f9a0..3843f90 100644
--- a/src/cppcache/integration-test/DeltaEx.hpp
+++ b/src/cppcache/integration-test/DeltaEx.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_DELTAEX_H_
+#define GEODE_INTEGRATION_TEST_DELTAEX_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __DELTAEX_HPP
-#define __DELTAEX_HPP
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -147,4 +150,5 @@ class PdxDeltaEx : public PdxSerializable, public Delta {
   }
 };
 typedef SharedPtr<PdxDeltaEx> PdxDeltaExPtr;
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_DELTAEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/LocatorHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/LocatorHelper.hpp 
b/src/cppcache/integration-test/LocatorHelper.hpp
index eb261dc..88245a5 100644
--- a/src/cppcache/integration-test/LocatorHelper.hpp
+++ b/src/cppcache/integration-test/LocatorHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_LOCATORHELPER_H_
+#define GEODE_INTEGRATION_TEST_LOCATORHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -141,3 +146,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseLocator1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_LOCATORHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/QueryHelper.hpp 
b/src/cppcache/integration-test/QueryHelper.hpp
index cacc1a3..cb5fd3b 100644
--- a/src/cppcache/integration-test/QueryHelper.hpp
+++ b/src/cppcache/integration-test/QueryHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_QUERYHELPER_H_
+#define GEODE_INTEGRATION_TEST_QUERYHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TEST_QUERYHELPER_HPP
-#define TEST_QUERYHELPER_HPP
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
@@ -373,4 +376,5 @@ bool QueryHelper::verifySS(SelectResultsPtr& structSet, int 
expectedRows,
   return false;
 }
 
-#endif  // TEST_QUERYHELPER_HPP
+
+#endif // GEODE_INTEGRATION_TEST_QUERYHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/QueryStrings.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/QueryStrings.hpp 
b/src/cppcache/integration-test/QueryStrings.hpp
index 7879335..618817d 100644
--- a/src/cppcache/integration-test/QueryStrings.hpp
+++ b/src/cppcache/integration-test/QueryStrings.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_QUERYSTRINGS_H_
+#define GEODE_INTEGRATION_TEST_QUERYSTRINGS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TEST_QUERYSTRINGS_HPP
-#define TEST_QUERYSTRINGS_HPP
 
 #include <cstring>
 
@@ -726,4 +729,5 @@ const int constantExpectedRowsCQRS[1] = {35};
 
 }  // namespace testData
 
-#endif  // TEST_QUERYSTRINGS_HPP
+
+#endif // GEODE_INTEGRATION_TEST_QUERYSTRINGS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/TallyListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyListener.hpp 
b/src/cppcache/integration-test/TallyListener.hpp
index 366710a..20f8b1a 100644
--- a/src/cppcache/integration-test/TallyListener.hpp
+++ b/src/cppcache/integration-test/TallyListener.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_TALLYLISTENER_H_
+#define GEODE_INTEGRATION_TEST_TALLYLISTENER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef _TEST_TALLYLISTENER_HPP_
-#define _TEST_TALLYLISTENER_HPP_
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string>
@@ -220,4 +223,5 @@ void TallyListener::afterRegionClear(const EntryEvent& 
event) {
   checkcallbackArg(event);
 }
 
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_TALLYLISTENER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/TallyLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyLoader.hpp 
b/src/cppcache/integration-test/TallyLoader.hpp
index 8f919b4..44acb60 100644
--- a/src/cppcache/integration-test/TallyLoader.hpp
+++ b/src/cppcache/integration-test/TallyLoader.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_TALLYLOADER_H_
+#define GEODE_INTEGRATION_TEST_TALLYLOADER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _TEST_TALLYLOADER_HPP_
-#define _TEST_TALLYLOADER_HPP_ 1
 
 #include <gfcpp/GeodeCppCache.hpp>
 
@@ -69,4 +72,5 @@ class TallyLoader : virtual public CacheLoader {
   }
 };
 
-#endif  //_TEST_TALLYLOADER_HPP_
+
+#endif // GEODE_INTEGRATION_TEST_TALLYLOADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/TallyWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyWriter.hpp 
b/src/cppcache/integration-test/TallyWriter.hpp
index d7a2cea..85992f3 100644
--- a/src/cppcache/integration-test/TallyWriter.hpp
+++ b/src/cppcache/integration-test/TallyWriter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_TALLYWRITER_H_
+#define GEODE_INTEGRATION_TEST_TALLYWRITER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _TEST_TALLYWRITER_HPP_
-#define _TEST_TALLYWRITER_HPP_ 1
 
 #include <gfcpp/GeodeCppCache.hpp>
 
@@ -150,4 +153,5 @@ class TallyWriter : virtual public CacheWriter {
   }
 };
 
-#endif  //_TEST_TALLYWRITER_HPP_
+
+#endif // GEODE_INTEGRATION_TEST_TALLYWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientCQ.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientCQ.hpp 
b/src/cppcache/integration-test/ThinClientCQ.hpp
index c1e068e..6d87d46 100644
--- a/src/cppcache/integration-test/ThinClientCQ.hpp
+++ b/src/cppcache/integration-test/ThinClientCQ.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTCQ_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTCQ_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: vrao
  */
 
-#ifndef _THINCLIENTCQ_HPP_
-#define _THINCLIENTCQ_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -59,4 +62,5 @@ void createRegionForCQMU(const char* name, bool ackMode,
   createRegionAndAttachPool(name, ackMode, name, caching);
 }
 
-#endif /* _THINCLIENTCQ_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTCQ_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientCallbackArg.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientCallbackArg.hpp 
b/src/cppcache/integration-test/ThinClientCallbackArg.hpp
index bc35c6e..619eb8d 100644
--- a/src/cppcache/integration-test/ThinClientCallbackArg.hpp
+++ b/src/cppcache/integration-test/ThinClientCallbackArg.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTCALLBACKARG_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTCALLBACKARG_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef THINCLIENTCALLBACKARG_HPP_
-#define THINCLIENTCALLBACKARG_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -190,4 +193,5 @@ void runCallbackArg() {
 
   CALL_TASK(CloseLocator1);
 }
-#endif /*THINCLIENTCALLBACKARG_HPP_*/
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTCALLBACKARG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDistOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp 
b/src/cppcache/integration-test/ThinClientDistOps.hpp
index 526670b..17b73b6 100644
--- a/src/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDISTOPS_HPP_
-#define THINCLIENTDISTOPS_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -905,4 +908,5 @@ void runDistOpsDontUpdateLocatorList() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif /* THINCLIENTDISTOPS_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDistOps2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps2.hpp 
b/src/cppcache/integration-test/ThinClientDistOps2.hpp
index b3f780a..041aeb4 100644
--- a/src/cppcache/integration-test/ThinClientDistOps2.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef THINCLIENTDISTOPS2_HPP_
-#define THINCLIENTDISTOPS2_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -381,4 +384,5 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-#endif /* THINCLIENTDISTOPS2_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurable.hpp 
b/src/cppcache/integration-test/ThinClientDurable.hpp
index b61f5e5..7ddece8 100644
--- a/src/cppcache/integration-test/ThinClientDurable.hpp
+++ b/src/cppcache/integration-test/ThinClientDurable.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLE_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLE_HPP_
-#define THINCLIENTDURABLE_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -491,4 +494,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServers)
   }
 END_TASK_DEFINITION
 
-#endif /* THINCLIENTDURABLE_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurableConnect.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableConnect.hpp 
b/src/cppcache/integration-test/ThinClientDurableConnect.hpp
index 85eff8a..bd25053 100644
--- a/src/cppcache/integration-test/ThinClientDurableConnect.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableConnect.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLECONNECT_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLECONNECT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLECONNECT_HPP_
-#define THINCLIENTDURABLECONNECT_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -349,4 +352,5 @@ void doThinClientDurableConnect(bool poolConfig = true,
   CALL_TASK(CloseLocator);
 }
 
-#endif /* THINCLIENTDURABLECONNECT_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLECONNECT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurableFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableFailover.hpp 
b/src/cppcache/integration-test/ThinClientDurableFailover.hpp
index b252ec0..2786bce 100644
--- a/src/cppcache/integration-test/ThinClientDurableFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableFailover.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLEFAILOVER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLEFAILOVER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLEFAILOVER_HPP_
-#define THINCLIENTDURABLEFAILOVER_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -410,4 +413,5 @@ void doThinClientDurableFailoverClientClosedRedundancy() {
   CALL_TASK(CloseLocator);
 }
 
-#endif /* THINCLIENTDURABLEFAILOVER_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurableInit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableInit.hpp 
b/src/cppcache/integration-test/ThinClientDurableInit.hpp
index da37dc8..d5275c5 100644
--- a/src/cppcache/integration-test/ThinClientDurableInit.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableInit.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINIT_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINIT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLEINIT_HPP_
-#define THINCLIENTDURABLEINIT_HPP_
 
 bool isLocalServer = false;
 
@@ -107,4 +110,5 @@ void initClientAndTwoRegionsAndTwoPools(int ClientIdx, int 
redundancy,
     LOG("Exception occured while sending readyForEvents");
   }
 }
-#endif /* THINCLIENTDURABLEINIT_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurableInterest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableInterest.hpp 
b/src/cppcache/integration-test/ThinClientDurableInterest.hpp
index 413c314..265ab20 100644
--- a/src/cppcache/integration-test/ThinClientDurableInterest.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableInterest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINTEREST_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINTEREST_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLEINTEREST_HPP_
-#define THINCLIENTDURABLEINTEREST_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -360,4 +363,5 @@ DUNIT_TASK_DEFINITION(SERVER1, closeServer)
   }
 END_TASK_DEFINITION
 
-#endif /* THINCLIENTDURABLEINTEREST_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINTEREST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableReconnect.hpp 
b/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
index e349b64..d8a7ade 100644
--- a/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTDURABLERECONNECT_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTDURABLERECONNECT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: abhaware
  */
 
-#ifndef THINCLIENTDURABLERECONNECT_HPP_
-#define THINCLIENTDURABLERECONNECT_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -167,4 +170,5 @@ void doThinClientDurableReconnect() {
   closeLocator();
 }
 
-#endif /* THINCLIENTDURABLERECONNECT_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLERECONNECT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover.hpp 
b/src/cppcache/integration-test/ThinClientFailover.hpp
index 85f1853..82580e0 100644
--- a/src/cppcache/integration-test/ThinClientFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -418,3 +423,5 @@ void runThinClientFailover(bool isSticky = false) {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailover2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover2.hpp 
b/src/cppcache/integration-test/ThinClientFailover2.hpp
index 936e669..d2a2361 100644
--- a/src/cppcache/integration-test/ThinClientFailover2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -542,3 +547,5 @@ void runThinClientFailover2() {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailover3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover3.hpp 
b/src/cppcache/integration-test/ThinClientFailover3.hpp
index ea4194c..189af12 100644
--- a/src/cppcache/integration-test/ThinClientFailover3.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover3.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER3_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER3_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -367,3 +372,5 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2and3)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp 
b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
index 7ac452b..6e4c3e2 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -422,3 +427,5 @@ void runThinClientFailoverInterest() {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp 
b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
index f27a69c..8dd5f06 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -451,3 +456,5 @@ void runThinClientFailoverInterest2() {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
----------------------------------------------------------------------
diff --git 
a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp 
b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
index 4b1692a..83cdf8a 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTERESTALLWITHCACHE_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTERESTALLWITHCACHE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -514,3 +519,5 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTERESTALLWITHCACHE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp 
b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
index f2e6474..5778b27 100644
--- a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -501,3 +506,5 @@ void runThinClientFailOverRegex() {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientGatewayTest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientGatewayTest.hpp 
b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
index 115de03..3f05ad8 100644
--- a/src/cppcache/integration-test/ThinClientGatewayTest.hpp
+++ b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTGATEWAYTEST_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTGATEWAYTEST_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef THINCLIENTGATEWAYTEST_HPP_
-#define THINCLIENTGATEWAYTEST_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -186,4 +189,5 @@ void runListenerInit(bool poolConfig = true, bool isLocator 
= true) {
   CALL_TASK(StopLocator1);
   CALL_TASK(StopLocator2);
 }
-#endif /*THINCLIENTGATEWAYTEST_HPP_*/
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTGATEWAYTEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientHeapLRU.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHeapLRU.hpp 
b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
index 036f2d2..6f280a9 100644
--- a/src/cppcache/integration-test/ThinClientHeapLRU.hpp
+++ b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef THINCLIENTHEAPLRU_HPP_
-#define THINCLIENTHEAPLRU_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -251,4 +254,5 @@ void runHeapLRU(bool poolConfig = true, bool isLocator = 
true) {
     CALL_TASK(CloseLocator1);
   }
 }
-#endif /* THINCLIENTHEAPLRU_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHelper.hpp 
b/src/cppcache/integration-test/ThinClientHelper.hpp
index 625deb2..54fd205 100644
--- a/src/cppcache/integration-test/ThinClientHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTHELPER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TEST_THINCLIENTHELPER_HPP
-#define TEST_THINCLIENTHELPER_HPP
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
@@ -702,4 +705,5 @@ class RegionOperations {
   RegionPtr m_regionPtr;
 };
 
-#endif  // TEST_THINCLIENTHELPER_HPP
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterest1.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest1.hpp 
b/src/cppcache/integration-test/ThinClientInterest1.hpp
index 298f1be..80fdf8e 100644
--- a/src/cppcache/integration-test/ThinClientInterest1.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest1.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTEREST1_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTEREST1_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -101,3 +106,5 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
     LOG("SERVER stopped");
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST1_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterest2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest2.hpp 
b/src/cppcache/integration-test/ThinClientInterest2.hpp
index 7ae133c..b60941b 100644
--- a/src/cppcache/integration-test/ThinClientInterest2.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTEREST2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTEREST2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -92,3 +97,5 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
     LOG("SERVER stopped");
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterest3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest3.hpp 
b/src/cppcache/integration-test/ThinClientInterest3.hpp
index db531d4..d6e5e51 100644
--- a/src/cppcache/integration-test/ThinClientInterest3.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest3.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -171,3 +176,5 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
     LOG("SERVER stopped");
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp 
b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
index 0ce6754..764bd93 100644
--- a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3CACHELESS_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3CACHELESS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -144,3 +149,5 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
     LOG("SERVER stopped");
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3CACHELESS_H_

Reply via email to