21 files changed, 45 insertions, 45 deletions
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 1436fb61143..d6d31fc5cef 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_CONFIG_H
-#define ICE_SSL_CONFIG_H
+#ifndef ICESSL_CONFIG_H
+#define ICESSL_CONFIG_H
 
 #include <Ice/Config.h>
 
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index 49cc160d3cc..87882208554 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ICE_SSL_H
-#define ICE_SSL_ICE_SSL_H
+#ifndef ICESSL_ICESSL_H
+#define ICESSL_ICESSL_H
 
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/Config.h>
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 84cd636c308..6731f60b76d 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_PLUGIN_H
-#define ICE_SSL_PLUGIN_H
+#ifndef ICESSL_PLUGIN_H
+#define ICESSL_PLUGIN_H
 
 #include <Ice/Plugin.h>
 #include <Ice/UniqueRef.h>
diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h
index f9b5368422c..0e068324201 100644
--- a/cpp/src/IceSSL/AcceptorI.h
+++ b/cpp/src/IceSSL/AcceptorI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ACCEPTOR_I_H
-#define ICE_SSL_ACCEPTOR_I_H
+#ifndef ICESSL_ACCEPTOR_I_H
+#define ICESSL_ACCEPTOR_I_H
 
 #include <Ice/TransceiverF.h>
 #include <Ice/Acceptor.h>
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index f6f6a484cc7..bfb909cc09f 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_CONNECTOR_I_H
-#define ICE_SSL_CONNECTOR_I_H
+#ifndef ICESSL_CONNECTOR_I_H
+#define ICESSL_CONNECTOR_I_H
 
 #include <Ice/TransceiverF.h>
 #include <Ice/Connector.h>
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index f75194ea640..413aa99a6dd 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ENDPOINT_I_H
-#define ICE_SSL_ENDPOINT_I_H
+#ifndef ICESSL_ENDPOINT_I_H
+#define ICESSL_ENDPOINT_I_H
 
 #include <Ice/EndpointI.h>
 #include <Ice/IPEndpointI.h>
diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h
index 7b564970f7e..ab82106ee40 100644
--- a/cpp/src/IceSSL/Instance.h
+++ b/cpp/src/IceSSL/Instance.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_INSTANCE_H
-#define ICE_SSL_INSTANCE_H
+#ifndef ICESSL_INSTANCE_H
+#define ICESSL_INSTANCE_H
 
 #include <Ice/ProtocolInstance.h>
 #include <IceSSL/InstanceF.h>
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index 10175e7f1c9..f3b825e43e1 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_INSTANCE_F_H
-#define ICE_SSL_INSTANCE_F_H
+#ifndef ICESSL_INSTANCE_F_H
+#define ICESSL_INSTANCE_F_H
 
 #include <IceUtil/Shared.h>
 
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.h b/cpp/src/IceSSL/OpenSSLTransceiverI.h
index 740bd1f8296..7db90508be8 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.h
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_TRANSCEIVER_I_H
-#define ICE_SSL_TRANSCEIVER_I_H
+#ifndef ICESSL_TRANSCEIVER_I_H
+#define ICESSL_TRANSCEIVER_I_H
 
 #include <IceSSL/Config.h>
 #include <IceSSL/Util.h>
diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h
index f3b49ec7917..71d35b3a566 100644
--- a/cpp/src/IceSSL/PluginI.h
+++ b/cpp/src/IceSSL/PluginI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_PLUGIN_I_H
-#define ICE_SSL_PLUGIN_I_H
+#ifndef ICESSL_PLUGIN_I_H
+#define ICESSL_PLUGIN_I_H
 
 #include <IceSSL/Plugin.h>
 #include <IceSSL/SSLEngineF.h>
diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h
index 87800521b55..b29b60e618d 100644
--- a/cpp/src/IceSSL/RFC2253.h
+++ b/cpp/src/IceSSL/RFC2253.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_RFC_2253_H
-#define ICE_SSL_RFC_2253_H
+#ifndef ICESSL_RFC_2253_H
+#define ICESSL_RFC_2253_H
 
 #include <IceUtil/Config.h>
 #include <list>
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index 0d122f7feb7..b35dad2260e 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_SCHANNELTRANSCEIVER_I_H
-#define ICE_SSL_SCHANNELTRANSCEIVER_I_H
+#ifndef ICESSL_SCHANNELTRANSCEIVER_I_H
+#define ICESSL_SCHANNELTRANSCEIVER_I_H
 
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
diff --git a/cpp/src/IceSSL/SSLEngine.h b/cpp/src/IceSSL/SSLEngine.h
index cbf8d90983f..30d88e123a4 100644
--- a/cpp/src/IceSSL/SSLEngine.h
+++ b/cpp/src/IceSSL/SSLEngine.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ENGINE_H
-#define ICE_SSL_ENGINE_H
+#ifndef ICESSL_ENGINE_H
+#define ICESSL_ENGINE_H
 
 #include <IceSSL/Plugin.h>
 #include <IceSSL/Util.h>
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index 7ff7e9f6ada..55e1a385a03 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_ENGINE_F_H
-#define ICE_SSL_ENGINE_F_H
+#ifndef ICESSL_ENGINE_F_H
+#define ICESSL_ENGINE_F_H
 
 #include <IceUtil/Shared.h>
 #include <Ice/Handle.h>
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.h b/cpp/src/IceSSL/SecureTransportTransceiverI.h
index 75740f2628b..3053faab3e9 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.h
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
-#define ICE_SSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
+#ifndef ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
+#define ICESSL_SECURE_TRANSPORT_TRANSCEIVER_I_H
 
 #include <IceSSL/Config.h>
 #include <IceSSL/InstanceF.h>
diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h
index 1c0fffd00e6..8e5dd5bfeff 100644
--- a/cpp/src/IceSSL/TrustManager.h
+++ b/cpp/src/IceSSL/TrustManager.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_TRUST_MANAGER_H
-#define ICE_SSL_TRUST_MANAGER_H
+#ifndef ICESSL_TRUST_MANAGER_H
+#define ICESSL_TRUST_MANAGER_H
 
 #include <Ice/CommunicatorF.h>
 #include <IceSSL/TrustManagerF.h>
diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h
index 3019620f56c..e3c232cecb7 100644
--- a/cpp/src/IceSSL/TrustManagerF.h
+++ b/cpp/src/IceSSL/TrustManagerF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_TRUST_MANAGER_F_H
-#define ICE_SSL_TRUST_MANAGER_F_H
+#ifndef ICESSL_TRUST_MANAGER_F_H
+#define ICESSL_TRUST_MANAGER_F_H
 
 #include <IceUtil/Shared.h>
 
diff --git a/cpp/src/IceSSL/UWPTransceiverI.h b/cpp/src/IceSSL/UWPTransceiverI.h
index 6535f6ac6ea..e94aee18e67 100644
--- a/cpp/src/IceSSL/UWPTransceiverI.h
+++ b/cpp/src/IceSSL/UWPTransceiverI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_UWP_TRANSCEIVER_I_H
-#define ICE_SSL_UWP_TRANSCEIVER_I_H
+#ifndef ICESSL_UWP_TRANSCEIVER_I_H
+#define ICESSL_UWP_TRANSCEIVER_I_H
 
 #include <IceSSL/Config.h>
 
diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h
index 68eb50499b4..c1bf6138819 100644
--- a/cpp/src/IceSSL/Util.h
+++ b/cpp/src/IceSSL/Util.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SSL_UTIL_H
-#define ICE_SSL_UTIL_H
+#ifndef ICESSL_UTIL_H
+#define ICESSL_UTIL_H
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
index 318e38a3785..a9062dbd402 100644
--- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj
@@ -104,32 +104,32 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_BUILDING_ICE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_BUILDING_ICESSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/cpp/test/uwp/controller/ViewController.xaml.h b/cpp/test/uwp/controller/ViewController.xaml.h
index e84b200d8ba..a35af555017 100644
--- a/cpp/test/uwp/controller/ViewController.xaml.h
+++ b/cpp/test/uwp/controller/ViewController.xaml.h
@@ -49,4 +49,4 @@ private:
     std::map<std::string, HINSTANCE> _dlls;
 };
 
-}
-\ No newline at end of file
+}