More consistent names for _API macros

47 files changed, 143 insertions, 143 deletions

diff --git a/cpp/include/Ice/RegisterPlugins.h b/cpp/include/Ice/RegisterPlugins.h
index c7149893a84..251d76e6799 100644
--- a/cpp/include/Ice/RegisterPlugins.h
+++ b/cpp/include/Ice/RegisterPlugins.h
@@ -38,7 +38,7 @@ namespace Ice
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool = true);
 #endif
 
-#ifndef ICE_SSL_API_EXPORTS
+#ifndef ICESSL_API_EXPORTS
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool = true);
 #endif
 
@@ -50,12 +50,12 @@ ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool = true);
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool = true);
 #endif
 
-#ifndef ICE_BT_API_EXPORTS
+#ifndef ICEBT_API_EXPORTS
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceBT(bool = true);
 #endif
 
 #if defined(__APPLE__) && TARGET_OS_IPHONE != 0
-#ifndef ICE_IAP_API_EXPORTS
+#ifndef ICEIAP_API_EXPORTS
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceIAP(bool = true);
 #endif
 #endif
diff --git a/cpp/include/IceBT/Plugin.h b/cpp/include/IceBT/Plugin.h
index 485d61ebe9e..cb43902f177 100644
--- a/cpp/include/IceBT/Plugin.h
+++ b/cpp/include/IceBT/Plugin.h
@@ -12,13 +12,13 @@
 
 #include <Ice/Plugin.h>
 
-#ifndef ICE_BT_API
+#ifndef ICEBT_API
 #   if defined(ICE_STATIC_LIBS)
-#       define ICE_BT_API /**/
-#   elif defined(ICE_BT_API_EXPORTS)
-#       define ICE_BT_API ICE_DECLSPEC_EXPORT
+#       define ICEBT_API /**/
+#   elif defined(ICEBT_API_EXPORTS)
+#       define ICEBT_API ICE_DECLSPEC_EXPORT
 #   else
-#       define ICE_BT_API ICE_DECLSPEC_IMPORT
+#       define ICEBT_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
@@ -34,7 +34,7 @@ typedef std::map<std::string, PropertyMap> DeviceMap;
 // An application can receive discovery notifications
 // by implementing the DiscoveryCallback interface.
 //
-class ICE_BT_API DiscoveryCallback : public IceUtil::Shared
+class ICEBT_API DiscoveryCallback : public IceUtil::Shared
 {
 public:
 
@@ -48,7 +48,7 @@ public:
 typedef IceUtil::Handle<DiscoveryCallback> DiscoveryCallbackPtr;
 #endif
 
-class ICE_BT_API Plugin : public Ice::Plugin
+class ICEBT_API Plugin : public Ice::Plugin
 {
 public:
 
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
index 80008776459..24d4592278b 100644
--- a/cpp/include/IceGrid/Config.h
+++ b/cpp/include/IceGrid/Config.h
@@ -14,7 +14,7 @@
 // Automatically link with IceGrid[D|++11|++11D].lib
 //
 
-#if !defined(ICE_BUILDING_ICE_GRID) && defined(ICE_GRID_API_EXPORTS)
+#if !defined(ICE_BUILDING_ICE_GRID) && defined(ICEGRID_API_EXPORTS)
 #   define ICE_BUILDING_ICE_GRID
 #endif
 
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
index a59082332b8..a3cd51beb8b 100644
--- a/cpp/include/IceGrid/IceGrid.h
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -25,7 +25,7 @@ namespace IceGrid
 //
 // Global function to obtain a RegistryPluginFacade
 //
-ICE_GRID_API RegistryPluginFacadePtr getRegistryPluginFacade();
+ICEGRID_API RegistryPluginFacadePtr getRegistryPluginFacade();
 
 }
 
diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
index 982cc0a43d9..c8cb8395970 100644
--- a/cpp/include/IcePatch2/ClientUtil.h
+++ b/cpp/include/IcePatch2/ClientUtil.h
@@ -24,7 +24,7 @@ namespace IcePatch2
 // allow the user to interact with the patching and report progress 
 // on the patching.
 //
-class ICE_PATCH2_API PatcherFeedback : public IceUtil::Shared
+class ICEPATCH2_API PatcherFeedback : public IceUtil::Shared
 {
 public:
 
@@ -76,7 +76,7 @@ typedef IceUtil::Handle<PatcherFeedback> PatcherFeedbackPtr;
 // IcePatch2 clients instantiate the IcePatch2::Patcher class to patch
 // a given local data directory.
 //
-class ICE_PATCH2_API Patcher : public IceUtil::Shared
+class ICEPATCH2_API Patcher : public IceUtil::Shared
 {
 public:
 
@@ -117,7 +117,7 @@ typedef IceUtil::Handle<Patcher> PatcherPtr;
 // IcePatch2 clients instantiate the IcePatch2::Patcher class
 // using the patcher factory.
 //
-class ICE_PATCH2_API PatcherFactory : public IceUtil::noncopyable
+class ICEPATCH2_API PatcherFactory : public IceUtil::noncopyable
 {
 public:
     
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
index f9b2c8855ee..c1c291b239c 100644
--- a/cpp/include/IcePatch2/Config.h
+++ b/cpp/include/IcePatch2/Config.h
@@ -14,7 +14,7 @@
 // Automatically link with IcePatch2[D|++11|++11D].lib
 //
 
-#if !defined(ICE_BUILDING_ICE_PATCH2) && defined(ICE_PATCH2_API_EXPORTS)
+#if !defined(ICE_BUILDING_ICE_PATCH2) && defined(ICEPATCH2_API_EXPORTS)
 #   define ICE_BUILDING_ICE_PATCH2
 #endif
 
diff --git a/cpp/include/IceSSL/Config.h b/cpp/include/IceSSL/Config.h
index 61794c499ae..8e7cc50b1e6 100644
--- a/cpp/include/IceSSL/Config.h
+++ b/cpp/include/IceSSL/Config.h
@@ -15,7 +15,7 @@
 //
 // Automatically link IceSSL[D|++11|++11D].lib with Visual C++
 //
-#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICE_SSL_API_EXPORTS)
+#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICESSL_API_EXPORTS)
 #   define ICE_BUILDING_ICE_SSL
 #endif
 
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 069c84fb554..8dd6fa24d8b 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -39,13 +39,13 @@
 #   include <wincrypt.h>
 #endif
 
-#ifndef ICE_SSL_API
+#ifndef ICESSL_API
 #   if defined(ICE_STATIC_LIBS)
-#       define ICE_SSL_API /**/
-#   elif defined(ICE_SSL_API_EXPORTS)
-#       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#       define ICESSL_API /**/
+#   elif defined(ICESSL_API_EXPORTS)
+#       define ICESSL_API ICE_DECLSPEC_EXPORT
 #   else
-#       define ICE_SSL_API ICE_DECLSPEC_IMPORT
+#       define ICESSL_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
@@ -85,7 +85,7 @@ namespace IceSSL
 //
 // This exception is thrown if the certificate cannot be read.
 //
-class ICE_SSL_API CertificateReadException : public IceUtil::ExceptionHelper<CertificateReadException>
+class ICESSL_API CertificateReadException : public IceUtil::ExceptionHelper<CertificateReadException>
 {
 public:
 
@@ -108,7 +108,7 @@ private:
 //
 // This exception is thrown if the certificate cannot be encoded.
 //
-class ICE_SSL_API CertificateEncodingException : public IceUtil::ExceptionHelper<CertificateEncodingException>
+class ICESSL_API CertificateEncodingException : public IceUtil::ExceptionHelper<CertificateEncodingException>
 {
 public:
 
@@ -134,7 +134,7 @@ private:
 //
 // This exception is thrown if a distinguished name cannot be parsed.
 //
-class ICE_SSL_API ParseException : public IceUtil::ExceptionHelper<ParseException>
+class ICESSL_API ParseException : public IceUtil::ExceptionHelper<ParseException>
 {
 public:
 
@@ -163,7 +163,7 @@ ICE_DEFINE_PTR(CertificatePtr, Certificate);
 //
 // A representation of a PublicKey.
 //
-class ICE_SSL_API PublicKey
+class ICESSL_API PublicKey
 #ifndef ICE_CPP11_MAPPING
     : public virtual IceUtil::Shared
 #endif
@@ -205,7 +205,7 @@ ICE_DEFINE_PTR(PublicKeyPtr, PublicKey);
 // provided in the constructor (i.e., "ZeroC, Inc." will not turn
 // into ZeroC\, Inc.).
 //
-class ICE_SSL_API DistinguishedName
+class ICESSL_API DistinguishedName
 {
 public:
 
@@ -240,8 +240,8 @@ public:
     // This is an exact match. The order of the RDN components is
     // important.
     //
-    friend ICE_SSL_API bool operator==(const DistinguishedName&, const DistinguishedName&);
-    friend ICE_SSL_API bool operator<(const DistinguishedName&, const DistinguishedName&);
+    friend ICESSL_API bool operator==(const DistinguishedName&, const DistinguishedName&);
+    friend ICESSL_API bool operator<(const DistinguishedName&, const DistinguishedName&);
 
     //
     // Perform a partial match with another DistinguishedName. The function
@@ -292,7 +292,7 @@ operator!=(const DistinguishedName& lhs, const DistinguishedName& rhs)
 // This convenience class is a wrapper around a native certificate.
 // The interface is inspired by java.security.cert.X509Certificate.
 //
-class ICE_SSL_API Certificate :
+class ICESSL_API Certificate :
 #ifdef ICE_CPP11_MAPPING
         public std::enable_shared_from_this<Certificate>
 #else
@@ -503,7 +503,7 @@ private:
 // NativeConnectionInfo is an extension of IceSSL::ConnectionInfo that
 // provides access to native certificates.
 //
-class ICE_SSL_API NativeConnectionInfo : public ConnectionInfo
+class ICESSL_API NativeConnectionInfo : public ConnectionInfo
 {
 public:
 
@@ -525,7 +525,7 @@ ICE_DEFINE_PTR(NativeConnectionInfoPtr, NativeConnectionInfo);
 // by implementing the CertificateVerifier interface.
 //
 
-class ICE_SSL_API CertificateVerifier : public IceUtil::Shared
+class ICESSL_API CertificateVerifier : public IceUtil::Shared
 {
 public:
 
@@ -554,7 +554,7 @@ typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
 // IceSSL.DelayInit=1), configure the PasswordPrompt, then manually
 // initialize the plug-in.
 //
-class ICE_SSL_API PasswordPrompt : public IceUtil::Shared
+class ICESSL_API PasswordPrompt : public IceUtil::Shared
 {
 public:
 
@@ -571,7 +571,7 @@ typedef IceUtil::Handle<PasswordPrompt> PasswordPromptPtr;
 #endif
 
 
-class ICE_SSL_API Plugin : public Ice::Plugin
+class ICESSL_API Plugin : public Ice::Plugin
 {
 public:
 
diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
index 1b664edcf66..4c92b3883d5 100644
--- a/cpp/include/IceStorm/Config.h
+++ b/cpp/include/IceStorm/Config.h
@@ -16,7 +16,7 @@
 // Automatically link with IceStorm[D|++11|++11D].lib
 //
 
-#if !defined(ICE_BUILDING_ICE_STORM_LIB) && defined(ICE_STORM_LIB_API_EXPORTS)
+#if !defined(ICE_BUILDING_ICE_STORM_LIB) && defined(ICESTORM_API_EXPORTS)
 #   define ICE_BUILDING_ICE_STORM_LIB
 #endif
 
diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk
index 0bd6db23a64..e37e311ac4e 100644
--- a/cpp/src/IceBT/Makefile.mk
+++ b/cpp/src/IceBT/Makefile.mk
@@ -13,7 +13,7 @@ $(project)_libraries	:= IceBT
 
 IceBT_targetdir		:= $(libdir)
 IceBT_dependencies	:= Ice
-IceBT_cppflags  	:= -DICE_BT_API_EXPORTS $(shell pkg-config --cflags dbus-1)
+IceBT_cppflags  	:= -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1)
 IceBT_system_libs	= $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1)
 IceBT_sliceflags	:= --include-dir IceBT
 
diff --git a/cpp/src/IceBT/PluginI.cpp b/cpp/src/IceBT/PluginI.cpp
index b3335e591f9..8ecf19771a7 100644
--- a/cpp/src/IceBT/PluginI.cpp
+++ b/cpp/src/IceBT/PluginI.cpp
@@ -34,7 +34,7 @@ IceBT::BluetoothException::ice_print(ostream& out) const
 extern "C"
 {
 
-ICE_BT_API Ice::Plugin*
+ICEBT_API Ice::Plugin*
 createIceBT(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/)
 {
     return new PluginI(communicator);
@@ -45,7 +45,7 @@ createIceBT(const CommunicatorPtr& communicator, const string& /*name*/, const S
 namespace Ice
 {
 
-ICE_BT_API void
+ICEBT_API void
 registerIceBT(bool loadOnInitialize)
 {
     Ice::registerPluginFactory("IceBT", createIceBT, loadOnInitialize);
diff --git a/cpp/src/IceGrid/PluginFacadeI.cpp b/cpp/src/IceGrid/PluginFacadeI.cpp
index c628610e24e..f285c85598e 100644
--- a/cpp/src/IceGrid/PluginFacadeI.cpp
+++ b/cpp/src/IceGrid/PluginFacadeI.cpp
@@ -18,7 +18,7 @@ using namespace IceGrid;
 namespace IceGrid
 {
 
-ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
+ICEGRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
 
 }
 
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 19496104190..f84f33dff0b 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_GRID_API_EXPORTS
-#   define ICE_GRID_API_EXPORTS
+#ifndef ICEGRID_API_EXPORTS
+#   define ICEGRID_API_EXPORTS
 #endif
 
 #include <IceGrid/IceGrid.h>
@@ -28,7 +28,7 @@ RegistryPluginFacade* pluginFacade = 0;
 namespace IceGrid
 {
 
-ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
+ICEGRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
 
 };
 
diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
index 2851e80aa03..eaaf5f91dc9 100644
--- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
@@ -72,25 +72,25 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4250;4251;4275;4503</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
index b75e5ed32ef..30ab54d4568 100644
--- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
@@ -76,25 +76,25 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_GRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEGRID_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link />
   </ItemDefinitionGroup>
diff --git a/cpp/src/IceIAP/EndpointI.mm b/cpp/src/IceIAP/EndpointI.mm
index 95605579c91..09f17ee35bd 100644
--- a/cpp/src/IceIAP/EndpointI.mm
+++ b/cpp/src/IceIAP/EndpointI.mm
@@ -63,7 +63,7 @@ public:
 
 }
 
-extern "C" ICE_IAP_API Plugin*
+extern "C" ICEIAP_API Plugin*
 createIceIAP(const CommunicatorPtr& com, const string&, const StringSeq&)
 {
     return new iAPEndpointFactoryPlugin(com);
@@ -72,7 +72,7 @@ createIceIAP(const CommunicatorPtr& com, const string&, const StringSeq&)
 namespace Ice
 {
 
-ICE_IAP_API void
+ICEIAP_API void
 registerIceIAP(bool loadOnInitialize)
 {
     Ice::registerPluginFactory("IceIAP", createIceIAP, loadOnInitialize);
@@ -83,7 +83,7 @@ registerIceIAP(bool loadOnInitialize)
 //
 // Objective-C function to allow Objective-C programs to register plugin.
 //
-extern "C" ICE_IAP_API void
+extern "C" ICEIAP_API void
 ICEregisterIceIAP(bool loadOnInitialize)
 {
     Ice::registerIceIAP(loadOnInitialize);
diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk
index ebf3b7c3f23..d33ba25376d 100644
--- a/cpp/src/IceIAP/Makefile.mk
+++ b/cpp/src/IceIAP/Makefile.mk
@@ -15,6 +15,6 @@ IceIAP_platforms	:= iphoneos iphonesimulator
 IceIAP_targetdir	:= $(libdir)
 IceIAP_dependencies	:= Ice
 IceIAP_sliceflags	:= --include-dir IceIAP
-IceIAP_cppflags  	:= -DICE_IAP_API_EXPORTS
+IceIAP_cppflags  	:= -DICEIAP_API_EXPORTS
 
 projects += $(project)
diff --git a/cpp/src/IcePatch2Lib/Util.h b/cpp/src/IcePatch2Lib/Util.h
index 12bc86a93b2..4263c87a444 100644
--- a/cpp/src/IcePatch2Lib/Util.h
+++ b/cpp/src/IcePatch2Lib/Util.h
@@ -17,39 +17,39 @@
 namespace IcePatch2Internal
 {
 
-ICE_PATCH2_API extern const char* checksumFile;
-ICE_PATCH2_API extern const char* logFile;
+ICEPATCH2_API extern const char* checksumFile;
+ICEPATCH2_API extern const char* logFile;
 
-ICE_PATCH2_API std::string lastError();
+ICEPATCH2_API std::string lastError();
 
-ICE_PATCH2_API std::string bytesToString(const Ice::ByteSeq&);
-ICE_PATCH2_API Ice::ByteSeq stringToBytes(const std::string&);
+ICEPATCH2_API std::string bytesToString(const Ice::ByteSeq&);
+ICEPATCH2_API Ice::ByteSeq stringToBytes(const std::string&);
 
-ICE_PATCH2_API std::string simplify(const std::string&);
+ICEPATCH2_API std::string simplify(const std::string&);
 
-ICE_PATCH2_API bool isRoot(const std::string&);
+ICEPATCH2_API bool isRoot(const std::string&);
 
-ICE_PATCH2_API std::string getSuffix(const std::string&);
-ICE_PATCH2_API std::string getWithoutSuffix(const std::string&);
-ICE_PATCH2_API bool ignoreSuffix(const std::string&);
+ICEPATCH2_API std::string getSuffix(const std::string&);
+ICEPATCH2_API std::string getWithoutSuffix(const std::string&);
+ICEPATCH2_API bool ignoreSuffix(const std::string&);
 
-ICE_PATCH2_API std::string getBasename(const std::string&);
-ICE_PATCH2_API std::string getDirname(const std::string&);
+ICEPATCH2_API std::string getBasename(const std::string&);
+ICEPATCH2_API std::string getDirname(const std::string&);
 
-ICE_PATCH2_API void rename(const std::string&, const std::string&);
+ICEPATCH2_API void rename(const std::string&, const std::string&);
 
-ICE_PATCH2_API void remove(const std::string&);
-ICE_PATCH2_API void removeRecursive(const std::string&);
+ICEPATCH2_API void remove(const std::string&);
+ICEPATCH2_API void removeRecursive(const std::string&);
 
-ICE_PATCH2_API Ice::StringSeq readDirectory(const std::string&);
+ICEPATCH2_API Ice::StringSeq readDirectory(const std::string&);
 
-ICE_PATCH2_API void createDirectory(const std::string&);
-ICE_PATCH2_API void createDirectoryRecursive(const std::string&);
+ICEPATCH2_API void createDirectory(const std::string&);
+ICEPATCH2_API void createDirectoryRecursive(const std::string&);
 
-ICE_PATCH2_API void compressBytesToFile(const std::string&, const Ice::ByteSeq&, Ice::Int);
-ICE_PATCH2_API void decompressFile(const std::string&);
+ICEPATCH2_API void compressBytesToFile(const std::string&, const Ice::ByteSeq&, Ice::Int);
+ICEPATCH2_API void decompressFile(const std::string&);
 
-ICE_PATCH2_API void setFileFlags(const std::string&, const IcePatch2::LargeFileInfo&);
+ICEPATCH2_API void setFileFlags(const std::string&, const IcePatch2::LargeFileInfo&);
 
 struct FileInfoEqual : public std::binary_function<const IcePatch2::LargeFileInfo&, const IcePatch2::LargeFileInfo&, bool>
 {
@@ -152,7 +152,7 @@ struct FileInfoLess : public FileInfoWithoutFlagsLess
     }
 };
 
-class ICE_PATCH2_API GetFileInfoSeqCB
+class ICEPATCH2_API GetFileInfoSeqCB
 {
 public:
 
@@ -163,20 +163,20 @@ public:
     virtual bool compress(const std::string&) = 0;
 };
 
-ICE_PATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
+ICEPATCH2_API bool getFileInfoSeq(const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
+ICEPATCH2_API bool getFileInfoSeqSubDir(const std::string&, const std::string&, int, GetFileInfoSeqCB*, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::LargeFileInfoSeq&);
+ICEPATCH2_API void saveFileInfoSeq(const std::string&, const IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::LargeFileInfoSeq&);
+ICEPATCH2_API void loadFileInfoSeq(const std::string&, IcePatch2::LargeFileInfoSeq&);
 
-ICE_PATCH2_API bool readFileInfo(FILE*, IcePatch2::LargeFileInfo&);
+ICEPATCH2_API bool readFileInfo(FILE*, IcePatch2::LargeFileInfo&);
 
-ICE_PATCH2_API IcePatch2::FileInfo toFileInfo(const IcePatch2::LargeFileInfo&);
-ICE_PATCH2_API IcePatch2::LargeFileInfo toLargeFileInfo(const IcePatch2::FileInfo&);
+ICEPATCH2_API IcePatch2::FileInfo toFileInfo(const IcePatch2::LargeFileInfo&);
+ICEPATCH2_API IcePatch2::LargeFileInfo toLargeFileInfo(const IcePatch2::FileInfo&);
 
-ICE_PATCH2_API bool writeFileInfo(FILE*, const IcePatch2::LargeFileInfo&);
+ICEPATCH2_API bool writeFileInfo(FILE*, const IcePatch2::LargeFileInfo&);
 
 struct FileTree1
 {
@@ -192,7 +192,7 @@ struct FileTree0
     Ice::ByteSeq checksum;
 };
 
-ICE_PATCH2_API void getFileTree0(const IcePatch2::LargeFileInfoSeq&, FileTree0&);
+ICEPATCH2_API void getFileTree0(const IcePatch2::LargeFileInfoSeq&, FileTree0&);
 
 }
 
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
index 59616ccc418..4d65d3fcbaf 100644
--- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -71,25 +71,25 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_PATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICEPATCH2_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk
index 75a4535439a..13c871627e3 100644
--- a/cpp/src/IceSSL/Makefile.mk
+++ b/cpp/src/IceSSL/Makefile.mk
@@ -11,7 +11,7 @@ $(project)_libraries	:= IceSSL
 
 IceSSL_targetdir	:= $(libdir)
 IceSSL_dependencies	:= Ice
-IceSSL_cppflags  	:= -DICE_SSL_API_EXPORTS
+IceSSL_cppflags  	:= -DICESSL_API_EXPORTS
 IceSSL_sliceflags	:= --include-dir IceSSL
 
 projects += $(project)
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index cb515311c5a..b556be171c0 100755
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -24,7 +24,7 @@ using namespace IceSSL;
 //
 // Plug-in factory function.
 //
-extern "C" ICE_SSL_API Ice::Plugin*
+extern "C" ICESSL_API Ice::Plugin*
 createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/)
 {
     return new PluginI(communicator);
@@ -33,7 +33,7 @@ createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const
 namespace Ice
 {
 
-ICE_SSL_API void
+ICESSL_API void
 registerIceSSL(bool loadOnInitialize)
 {
     Ice::registerPluginFactory("IceSSL", createIceSSL, loadOnInitialize);
@@ -67,7 +67,7 @@ IceSSL::Plugin::~Plugin()
 //
 // Objective-C function to allow Objective-C programs to register plugin.
 //
-extern "C" ICE_SSL_API void
+extern "C" ICESSL_API void
 ICEregisterIceSSL(bool loadOnInitialize)
 {
     Ice::registerIceSSL(loadOnInitialize);
diff --git a/cpp/src/IceSSL/SSLEngineF.h b/cpp/src/IceSSL/SSLEngineF.h
index 61656a11d2a..1a5548aaf2b 100644
--- a/cpp/src/IceSSL/SSLEngineF.h
+++ b/cpp/src/IceSSL/SSLEngineF.h
@@ -19,24 +19,24 @@ namespace IceSSL
 {
 
 class SSLEngine;
-ICE_SSL_API IceUtil::Shared* upCast(SSLEngine*);
+ICESSL_API IceUtil::Shared* upCast(SSLEngine*);
 typedef IceInternal::Handle<SSLEngine> SSLEnginePtr;
 
 #if defined(ICE_USE_SECURE_TRANSPORT)
 class SecureTransportEngine;
-ICE_SSL_API IceUtil::Shared* upCast(SecureTransportEngine*);
+ICESSL_API IceUtil::Shared* upCast(SecureTransportEngine*);
 typedef IceInternal::Handle<SecureTransportEngine> SecureTransportEnginePtr;
 #elif defined(ICE_USE_SCHANNEL)
 class SChannelEngine;
-ICE_SSL_API IceUtil::Shared* upCast(SChannelEngine*);
+ICESSL_API IceUtil::Shared* upCast(SChannelEngine*);
 typedef IceInternal::Handle<SChannelEngine> SChannelEnginePtr;
 #elif defined(ICE_OS_WINRT)
 class WinRTEngine;
-ICE_SSL_API IceUtil::Shared* upCast(WinRTEngine*);
+ICESSL_API IceUtil::Shared* upCast(WinRTEngine*);
 typedef IceInternal::Handle<WinRTEngine> WinRTEnginePtr;
 #else // OpenSSL
 class OpenSSLEngine;
-ICE_SSL_API IceUtil::Shared* upCast(OpenSSLEngine*);
+ICESSL_API IceUtil::Shared* upCast(OpenSSLEngine*);
 typedef IceInternal::Handle<OpenSSLEngine> OpenSSLEnginePtr;
 #endif
 
diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
index 78f8038fd5a..c6cedaa43d1 100644
--- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
@@ -71,7 +71,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -79,7 +79,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -87,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -95,7 +95,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
index fb6ffc509d0..fb2a52426c8 100644
--- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
@@ -76,7 +76,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -84,7 +84,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -92,7 +92,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
@@ -100,7 +100,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_SSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESSL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>advapi32.lib;secur32.lib;crypt32.lib;ws2_32.lib</AdditionalDependencies>
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 3f78ad37a25..011c6faa5da 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#define ICE_STORM_SERVICE_API_EXPORTS
+#define ICESTORM_SERVICE_API_EXPORTS
 
 #include <Ice/PluginManagerI.h> // For loadPlugin
 
@@ -94,7 +94,7 @@ private:
 extern "C"
 {
 
-ICE_STORM_SERVICE_API ::IceBox::Service*
+ICESTORM_SERVICE_API ::IceBox::Service*
 createIceStorm(CommunicatorPtr communicator)
 {
     return new ServiceI;
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h
index 38f1c63197b..e7ac1081b82 100644
--- a/cpp/src/IceStorm/Service.h
+++ b/cpp/src/IceStorm/Service.h
@@ -17,7 +17,7 @@
 // Automatically link with IceStormService[D|++11|++11D].lib
 //
 
-#if !defined(ICE_BUILDING_ICE_STORM_SERVICE) && defined(ICE_STORM_SERVICE_API_EXPORTS)
+#if !defined(ICE_BUILDING_ICE_STORM_SERVICE) && defined(ICESTORM_SERVICE_API_EXPORTS)
 #   define ICE_BUILDING_ICE_STORM_SERVICE
 #endif
 
@@ -25,13 +25,13 @@
 #   pragma comment(lib, ICE_LIBNAME("IceStormService"))
 #endif
 
-#ifndef ICE_STORM_SERVICE_API
+#ifndef ICESTORM_SERVICE_API
 #   if defined(ICE_STATIC_LIBS)
-#       define ICE_STORM_SERVICE_API /**/
-#   elif defined(ICE_STORM_SERVICE_API_EXPORTS)
-#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_EXPORT
+#       define ICESTORM_SERVICE_API /**/
+#   elif defined(ICESTORM_SERVICE_API_EXPORTS)
+#       define ICESTORM_SERVICE_API ICE_DECLSPEC_EXPORT
 #   else
-#       define ICE_STORM_SERVICE_API ICE_DECLSPEC_IMPORT
+#       define ICESTORM_SERVICE_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
@@ -48,7 +48,7 @@ class Service : public ::IceBox::Service
 {
 public:
 
-    ICE_STORM_SERVICE_API static ServicePtr create(const Ice::CommunicatorPtr&,
+    ICESTORM_SERVICE_API static ServicePtr create(const Ice::CommunicatorPtr&,
                                                    const Ice::ObjectAdapterPtr&,
                                                    const Ice::ObjectAdapterPtr&,
                                                    const std::string&,
@@ -57,7 +57,7 @@ public:
 
     virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) = 0;
 
-    ICE_STORM_SERVICE_API virtual IceStorm::TopicManagerPrx getTopicManager() const = 0;
+    ICESTORM_SERVICE_API virtual IceStorm::TopicManagerPrx getTopicManager() const = 0;
 
     virtual void stop() = 0;
 };
diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
index af3aabd6daa..a6d33bdf8a6 100644
--- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
@@ -71,22 +71,22 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
index 268b1663156..f1c1d329cde 100644
--- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
@@ -71,22 +71,22 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STORM_LIB_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICESTORM_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/slice/IceBT/ConnectionInfo.ice b/slice/IceBT/ConnectionInfo.ice
index a747fdb2522..9b520fa6822 100644
--- a/slice/IceBT/ConnectionInfo.ice
+++ b/slice/IceBT/ConnectionInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "objc:header-dir:objc"]]
 
 #include <Ice/Connection.ice>
 
diff --git a/slice/IceBT/EndpointInfo.ice b/slice/IceBT/EndpointInfo.ice
index 4862e7e6248..585b7650e4a 100644
--- a/slice/IceBT/EndpointInfo.ice
+++ b/slice/IceBT/EndpointInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IceBT/Types.ice b/slice/IceBT/Types.ice
index cb49d200810..105c16164f4 100644
--- a/slice/IceBT/Types.ice
+++ b/slice/IceBT/Types.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "objc:header-dir:objc"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index 72aa1e989df..f22e6927772 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
index 16032bd0291..a885f475f36 100644
--- a/slice/IceGrid/Descriptor.ice
+++ b/slice/IceGrid/Descriptor.ice
@@ -12,7 +12,7 @@
 [["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICE_GRID_API", "objc:dll-export:ICEGRID_API"]]
+[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
 #endif
 
 [["cpp:include:IceGrid/Config.h"]]
diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
index 144f9cd712a..06d8259da0b 100644
--- a/slice/IceGrid/Exception.ice
+++ b/slice/IceGrid/Exception.ice
@@ -12,7 +12,7 @@
 [["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
-[["cpp:dll-export:ICE_GRID_API", "objc:dll-export:ICEGRID_API"]]
+[["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
 #endif
 
 [["cpp:include:IceGrid/Config.h"]]
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index 48917cad550..017ebecaaaa 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Admin.ice>
diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice
index 9b59714c494..a1a2ceb896b 100644
--- a/slice/IceGrid/PluginFacade.ice
+++ b/slice/IceGrid/PluginFacade.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice
index 9ef94db6755..89a312c7c53 100644
--- a/slice/IceGrid/Registry.ice
+++ b/slice/IceGrid/Registry.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Exception.ice>
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index d91baea20a0..398f4a3a791 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index 4267956cd77..88b573199ed 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
diff --git a/slice/IceIAP/ConnectionInfo.ice b/slice/IceIAP/ConnectionInfo.ice
index f1bba0a332b..5db8e017898 100644
--- a/slice/IceIAP/ConnectionInfo.ice
+++ b/slice/IceIAP/ConnectionInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_IAP_API", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Connection.ice>
 
diff --git a/slice/IceIAP/EndpointInfo.ice b/slice/IceIAP/EndpointInfo.ice
index 71ee3d695be..1d9dd5a1f66 100644
--- a/slice/IceIAP/EndpointInfo.ice
+++ b/slice/IceIAP/EndpointInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_IAP_API", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "objc:header-dir:objc", "js:ice-build"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice
index db6a5d2fe4e..86945d1cc80 100644
--- a/slice/IcePatch2/FileInfo.ice
+++ b/slice/IcePatch2/FileInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_PATCH2_API", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "objc:header-dir:objc"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice
index 0c02853c09a..c533d63f1c2 100644
--- a/slice/IcePatch2/FileServer.ice
+++ b/slice/IcePatch2/FileServer.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_PATCH2_API", "objc:header-dir:objc"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "objc:header-dir:objc"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <IcePatch2/FileInfo.ice>
diff --git a/slice/IceSSL/ConnectionInfo.ice b/slice/IceSSL/ConnectionInfo.ice
index 9c95fb736fb..84ae8176c8c 100644
--- a/slice/IceSSL/ConnectionInfo.ice
+++ b/slice/IceSSL/ConnectionInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_SSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]]
 
 #include <Ice/Connection.ice>
 
diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice
index 3a1e5e44343..c919bb63e64 100644
--- a/slice/IceSSL/EndpointInfo.ice
+++ b/slice/IceSSL/EndpointInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_SSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice
index 32c259d5cea..0d9cdbe7f07 100644
--- a/slice/IceStorm/IceStorm.ice
+++ b/slice/IceStorm/IceStorm.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_STORM_LIB_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Identity.ice>
diff --git a/slice/IceStorm/Metrics.ice b/slice/IceStorm/Metrics.ice
index 775042cd64a..da84df89c79 100644
--- a/slice/IceStorm/Metrics.ice
+++ b/slice/IceStorm/Metrics.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_STORM_LIB_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Metrics.ice>