diff --git a/ciaox11/core/ciaox11_core_export.h b/ciaox11/core/ciaox11_core_export.h
index 819dbaeb6..3d89290e4 100644
--- a/ciaox11/core/ciaox11_core_export.h
+++ b/ciaox11/core/ciaox11_core_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_CORE_EXPORT_H
 #define CIAOX11_CORE_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_CORE_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_CORE_HAS_DLL)
 #  define CIAOX11_CORE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_CORE_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_CORE_HAS_DLL */
 
 #if !defined (CIAOX11_CORE_HAS_DLL)
 #  define CIAOX11_CORE_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_CORE_HAS_DLL) && (CIAOX11_CORE_HAS_DLL == 1)
 #  if defined (CIAOX11_CORE_BUILD_DLL)
-#    define CIAOX11_CORE_Export ACE_Proper_Export_Flag
-#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_CORE_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_CORE_BUILD_DLL */
-#    define CIAOX11_CORE_Export ACE_Proper_Import_Flag
-#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_CORE_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_CORE_BUILD_DLL */
 #else /* CIAOX11_CORE_HAS_DLL == 1 */
 #  define CIAOX11_CORE_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_CORE_HAS_DLL == 1 */
 
 #endif /* CIAOX11_CORE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h b/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h
index e1774aeba..aec5a0658 100644
--- a/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h
+++ b/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H
 #define CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL) && (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL)
-#    define CIAOX11_Deployment_Handler_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Handler_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL */
-#    define CIAOX11_Deployment_Handler_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Handler_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_Handler_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1 */
 
 #endif /* CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h b/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h
index e84f5a746..e9c2de432 100644
--- a/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h
+++ b/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_DEPLOYMENT_STATE_EXPORT_H
 #define CIAOX11_DEPLOYMENT_STATE_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_STATE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_STATE_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_STATE_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_STATE_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL) && (CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_STATE_BUILD_DLL)
-#    define CIAOX11_Deployment_State_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_State_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_STATE_BUILD_DLL */
-#    define CIAOX11_Deployment_State_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_State_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_STATE_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_State_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1 */
 
 #endif /* CIAOX11_DEPLOYMENT_STATE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h b/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h
index 6d73c79f7..18e8b4930 100644
--- a/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h
+++ b/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H
 #define CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL) && (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL)
-#    define CIAOX11_Deployment_Interceptors_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Interceptors_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */
-#    define CIAOX11_Deployment_Interceptors_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Interceptors_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_Interceptors_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H */
 
-// End of auto generated file.
diff --git a/ciaox11/logger/ciaox11_logger_export.h b/ciaox11/logger/ciaox11_logger_export.h
index 73c5f1dbe..73daa3323 100644
--- a/ciaox11/logger/ciaox11_logger_export.h
+++ b/ciaox11/logger/ciaox11_logger_export.h
@@ -7,11 +7,11 @@
 #ifndef CIAOX11_LOGGER_EXPORT_H
 #define CIAOX11_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_LOGGER_HAS_DLL)
 #  define CIAOX11_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_LOGGER_HAS_DLL */
 
 #if !defined (CIAOX11_LOGGER_HAS_DLL)
 #  define CIAOX11_LOGGER_HAS_DLL 1
@@ -19,13 +19,13 @@
 
 #if defined (CIAOX11_LOGGER_HAS_DLL) && (CIAOX11_LOGGER_HAS_DLL == 1)
 #  if defined (CIAOX11_LOGGER_BUILD_DLL)
-#    define CIAOX11_Logger_Export ACE_Proper_Export_Flag
-#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Logger_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_LOGGER_BUILD_DLL */
-#    define CIAOX11_Logger_Export ACE_Proper_Import_Flag
-#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Logger_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_LOGGER_BUILD_DLL */
 #else /* CIAOX11_LOGGER_HAS_DLL == 1 */
 #  define CIAOX11_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* CIAOX11_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/connectors/dds4ccm/impl/dds4ccm_impl_export.h b/connectors/dds4ccm/impl/dds4ccm_impl_export.h
index bc091b03e..4121b1e1b 100644
--- a/connectors/dds4ccm/impl/dds4ccm_impl_export.h
+++ b/connectors/dds4ccm/impl/dds4ccm_impl_export.h
@@ -8,11 +8,11 @@
 #ifndef DDS4CCM_IMPL_EXPORT_H
 #define DDS4CCM_IMPL_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_IMPL_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDS4CCM_IMPL_HAS_DLL)
 #  define DDS4CCM_IMPL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_IMPL_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDS4CCM_IMPL_HAS_DLL */
 
 #if !defined (DDS4CCM_IMPL_HAS_DLL)
 #  define DDS4CCM_IMPL_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (DDS4CCM_IMPL_HAS_DLL) && (DDS4CCM_IMPL_HAS_DLL == 1)
 #  if defined (DDS4CCM_IMPL_BUILD_DLL)
-#    define DDS4CCM_IMPL_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_IMPL_Export TAOX11_Proper_Export_Flag
+#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDS4CCM_IMPL_BUILD_DLL */
-#    define DDS4CCM_IMPL_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_IMPL_Export TAOX11_Proper_Import_Flag
+#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDS4CCM_IMPL_BUILD_DLL */
 #else /* DDS4CCM_IMPL_HAS_DLL == 1 */
 #  define DDS4CCM_IMPL_Export
@@ -35,5 +35,3 @@
 #endif /* DDS4CCM_IMPL_HAS_DLL == 1 */
 
 #endif /* DDS4CCM_IMPL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/connectors/dds4ccm/logger/dds4ccm_logger_export.h b/connectors/dds4ccm/logger/dds4ccm_logger_export.h
index 3635a3c71..5061f741b 100644
--- a/connectors/dds4ccm/logger/dds4ccm_logger_export.h
+++ b/connectors/dds4ccm/logger/dds4ccm_logger_export.h
@@ -7,11 +7,11 @@
 #ifndef DDS4CCM_LOGGER_EXPORT_H
 #define DDS4CCM_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL)
 #  define DDS4CCM_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */
 
 #if !defined (DDS4CCM_LOGGER_HAS_DLL)
 #  define DDS4CCM_LOGGER_HAS_DLL 1
@@ -19,13 +19,13 @@
 
 #if defined (DDS4CCM_LOGGER_HAS_DLL) && (DDS4CCM_LOGGER_HAS_DLL == 1)
 #  if defined (DDS4CCM_LOGGER_BUILD_DLL)
-#    define DDS4CCM_Logger_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_Logger_Export TAOX11_Proper_Export_Flag
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDS4CCM_LOGGER_BUILD_DLL */
-#    define DDS4CCM_Logger_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_Logger_Export TAOX11_Proper_Import_Flag
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDS4CCM_LOGGER_BUILD_DLL */
 #else /* DDS4CCM_LOGGER_HAS_DLL == 1 */
 #  define DDS4CCM_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* DDS4CCM_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h b/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h
index 70a705e47..cb6affcf5 100644
--- a/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h
+++ b/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h
@@ -7,11 +7,11 @@
 #ifndef PSDD4CCM_LOGGER_EXPORT_H
 #define PSDD4CCM_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PSDD4CCM_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (PSDD4CCM_LOGGER_HAS_DLL)
 #  define PSDD4CCM_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PSDD4CCM_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && PSDD4CCM_LOGGER_HAS_DLL */
 
 #if !defined (PSDD4CCM_LOGGER_HAS_DLL)
 #  define PSDD4CCM_LOGGER_HAS_DLL 1
@@ -19,13 +19,13 @@
 
 #if defined (PSDD4CCM_LOGGER_HAS_DLL) && (PSDD4CCM_LOGGER_HAS_DLL == 1)
 #  if defined (PSDD4CCM_LOGGER_BUILD_DLL)
-#    define PSDD4CCM_Logger_Export ACE_Proper_Export_Flag
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define PSDD4CCM_Logger_Export TAOX11_Proper_Export_Flag
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* PSDD4CCM_LOGGER_BUILD_DLL */
-#    define PSDD4CCM_Logger_Export ACE_Proper_Import_Flag
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define PSDD4CCM_Logger_Export TAOX11_Proper_Import_Flag
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* PSDD4CCM_LOGGER_BUILD_DLL */
 #else /* PSDD4CCM_LOGGER_HAS_DLL == 1 */
 #  define PSDD4CCM_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* PSDD4CCM_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/ddsx11/dds/dds_export.h b/ddsx11/dds/dds_export.h
index 1f9a09a53..6f9f3f022 100644
--- a/ddsx11/dds/dds_export.h
+++ b/ddsx11/dds/dds_export.h
@@ -10,11 +10,11 @@
 #ifndef DDSX11_IMPL_EXPORT_H_
 #define DDSX11_IMPL_EXPORT_H_
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDSX11_IMPL_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDSX11_IMPL_HAS_DLL)
 #  define DDSX11_IMPL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDSX11_IMPL_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDSX11_IMPL_HAS_DLL */
 
 #if !defined (DDSX11_IMPL_HAS_DLL)
 #  define DDSX11_IMPL_HAS_DLL 1
@@ -22,13 +22,13 @@
 
 #if defined (DDSX11_IMPL_HAS_DLL) && (DDSX11_IMPL_HAS_DLL == 1)
 #  if defined (DDSX11_IMPL_BUILD_DLL)
-#    define DDSX11_IMPL_Export ACE_Proper_Export_Flag
-#    define DDSX11_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDSX11_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDSX11_IMPL_Export TAOX11_Proper_Export_Flag
+#    define DDSX11_IMPL_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDSX11_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDSX11_IMPL_BUILD_DLL */
-#    define DDSX11_IMPL_Export ACE_Proper_Import_Flag
-#    define DDSX11_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDSX11_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDSX11_IMPL_Export TAOX11_Proper_Import_Flag
+#    define DDSX11_IMPL_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDSX11_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDSX11_IMPL_BUILD_DLL */
 #else /* DDSX11_IMPL_HAS_DLL == 1 */
 #  define DDSX11_IMPL_Export
@@ -38,4 +38,3 @@
 
 #endif /* DDSX11_IMPL_EXPORT_H_ */
 
-// End of auto generated file.
diff --git a/ddsx11/logger/ddsx11_logger_export.h b/ddsx11/logger/ddsx11_logger_export.h
index 9f6457cbd..290e300b7 100644
--- a/ddsx11/logger/ddsx11_logger_export.h
+++ b/ddsx11/logger/ddsx11_logger_export.h
@@ -7,11 +7,11 @@
 #ifndef DDSX11_LOGGER_EXPORT_H
 #define DDSX11_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDSX11_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDSX11_LOGGER_HAS_DLL)
 #  define DDSX11_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDSX11_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDSX11_LOGGER_HAS_DLL */
 
 #if !defined (DDSX11_LOGGER_HAS_DLL)
 #  define DDSX11_LOGGER_HAS_DLL 1
@@ -19,13 +19,13 @@
 
 #if defined (DDSX11_LOGGER_HAS_DLL) && (DDSX11_LOGGER_HAS_DLL == 1)
 #  if defined (DDSX11_LOGGER_BUILD_DLL)
-#    define DDSX11_Logger_Export ACE_Proper_Export_Flag
-#    define DDSX11_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDSX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDSX11_Logger_Export TAOX11_Proper_Export_Flag
+#    define DDSX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDSX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDSX11_LOGGER_BUILD_DLL */
-#    define DDSX11_Logger_Export ACE_Proper_Import_Flag
-#    define DDSX11_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDSX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDSX11_Logger_Export TAOX11_Proper_Import_Flag
+#    define DDSX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDSX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDSX11_LOGGER_BUILD_DLL */
 #else /* DDSX11_LOGGER_HAS_DLL == 1 */
 #  define DDSX11_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* DDSX11_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/ddsx11/tests/logger_backend/log_backend_export.h b/ddsx11/tests/logger_backend/log_backend_export.h
index 2e03e0ff9..a80dd4cdd 100644
--- a/ddsx11/tests/logger_backend/log_backend_export.h
+++ b/ddsx11/tests/logger_backend/log_backend_export.h
@@ -10,11 +10,11 @@
 #ifndef DNCX11_LOG_BACKEND_EXPORT_H
 #define DNCX11_LOG_BACKEND_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DNCX11_LOG_BACKEND_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DNCX11_LOG_BACKEND_HAS_DLL)
 #  define DNCX11_LOG_BACKEND_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DNCX11_LOG_BACKEND_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DNCX11_LOG_BACKEND_HAS_DLL */
 
 #if !defined (DNCX11_LOG_BACKEND_HAS_DLL)
 #  define DNCX11_LOG_BACKEND_HAS_DLL 1
@@ -22,13 +22,13 @@
 
 #if defined (DNCX11_LOG_BACKEND_HAS_DLL) && (DNCX11_LOG_BACKEND_HAS_DLL == 1)
 #  if defined (DNCX11_LOG_BACKEND_BUILD_DLL)
-#    define DNCX11_LOG_BACKEND_Export ACE_Proper_Export_Flag
-#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DNCX11_LOG_BACKEND_Export TAOX11_Proper_Export_Flag
+#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DNCX11_LOG_BACKEND_BUILD_DLL */
-#    define DNCX11_LOG_BACKEND_Export ACE_Proper_Import_Flag
-#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DNCX11_LOG_BACKEND_Export TAOX11_Proper_Import_Flag
+#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DNCX11_LOG_BACKEND_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DNCX11_LOG_BACKEND_BUILD_DLL */
 #else /* DNCX11_LOG_BACKEND_HAS_DLL == 1 */
 #  define DNCX11_LOG_BACKEND_Export
@@ -38,4 +38,3 @@
 
 #endif /* DNCX11_LOG_BACKEND_EXPORT_H */
 
-// End of auto generated file.
diff --git a/exf/deployment/amh/ciaox11_exf_amh_export.h b/exf/deployment/amh/ciaox11_exf_amh_export.h
index 449b46b31..5e0ccdcc0 100644
--- a/exf/deployment/amh/ciaox11_exf_amh_export.h
+++ b/exf/deployment/amh/ciaox11_exf_amh_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_EXF_AMH_EXPORT_H
 #define CIAOX11_EXF_AMH_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_AMH_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_AMH_HAS_DLL)
 #  define CIAOX11_EXF_AMH_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_AMH_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_AMH_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_AMH_HAS_DLL)
 #  define CIAOX11_EXF_AMH_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_EXF_AMH_HAS_DLL) && (CIAOX11_EXF_AMH_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_AMH_BUILD_DLL)
-#    define CIAOX11_EXF_AMH_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_AMH_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_AMH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_AMH_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_AMH_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_AMH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_AMH_BUILD_DLL */
-#    define CIAOX11_EXF_AMH_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_AMH_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_AMH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_AMH_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_AMH_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_AMH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_AMH_BUILD_DLL */
 #else /* CIAOX11_EXF_AMH_HAS_DLL == 1 */
 #  define CIAOX11_EXF_AMH_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_EXF_AMH_EXPORT_H */
 
-// End of auto generated file.
diff --git a/exf/deployment/core/ciaox11_exf_core_export.h b/exf/deployment/core/ciaox11_exf_core_export.h
index b646ec95b..544dbba92 100644
--- a/exf/deployment/core/ciaox11_exf_core_export.h
+++ b/exf/deployment/core/ciaox11_exf_core_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_EXF_CORE_EXPORT_H
 #define CIAOX11_EXF_CORE_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_CORE_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_CORE_HAS_DLL)
 #  define CIAOX11_EXF_CORE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_CORE_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_CORE_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_CORE_HAS_DLL)
 #  define CIAOX11_EXF_CORE_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_EXF_CORE_HAS_DLL) && (CIAOX11_EXF_CORE_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_CORE_BUILD_DLL)
-#    define CIAOX11_EXF_CORE_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_CORE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_CORE_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_CORE_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_CORE_BUILD_DLL */
-#    define CIAOX11_EXF_CORE_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_CORE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_CORE_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_CORE_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_CORE_BUILD_DLL */
 #else /* CIAOX11_EXF_CORE_HAS_DLL == 1 */
 #  define CIAOX11_EXF_CORE_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_EXF_CORE_EXPORT_H */
 
-// End of auto generated file.
diff --git a/exf/deployment/handlers/ciaox11_exf_handler_export.h b/exf/deployment/handlers/ciaox11_exf_handler_export.h
index ff8da0415..d10167964 100644
--- a/exf/deployment/handlers/ciaox11_exf_handler_export.h
+++ b/exf/deployment/handlers/ciaox11_exf_handler_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_EXF_HANDLER_EXPORT_H
 #define CIAOX11_EXF_HANDLER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_HANDLER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_HANDLER_HAS_DLL)
 #  define CIAOX11_EXF_HANDLER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_HANDLER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_HANDLER_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_HANDLER_HAS_DLL)
 #  define CIAOX11_EXF_HANDLER_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_EXF_HANDLER_HAS_DLL) && (CIAOX11_EXF_HANDLER_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_HANDLER_BUILD_DLL)
-#    define CIAOX11_EXF_HANDLER_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_HANDLER_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_HANDLER_BUILD_DLL */
-#    define CIAOX11_EXF_HANDLER_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_HANDLER_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_HANDLER_BUILD_DLL */
 #else /* CIAOX11_EXF_HANDLER_HAS_DLL == 1 */
 #  define CIAOX11_EXF_HANDLER_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_EXF_HANDLER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/exf/deployment/logger/ciaox11_exf_logger_export.h b/exf/deployment/logger/ciaox11_exf_logger_export.h
index efdea96fb..c329f5862 100644
--- a/exf/deployment/logger/ciaox11_exf_logger_export.h
+++ b/exf/deployment/logger/ciaox11_exf_logger_export.h
@@ -7,11 +7,11 @@
 #ifndef CIAOX11_EXF_LOGGER_EXPORT_H
 #define CIAOX11_EXF_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_LOGGER_HAS_DLL)
 #  define CIAOX11_EXF_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_LOGGER_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_LOGGER_HAS_DLL)
 #  define CIAOX11_EXF_LOGGER_HAS_DLL 1
@@ -19,13 +19,13 @@
 
 #if defined (CIAOX11_EXF_LOGGER_HAS_DLL) && (CIAOX11_EXF_LOGGER_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_LOGGER_BUILD_DLL)
-#    define CIAOX11_EXF_Logger_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_Logger_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_LOGGER_BUILD_DLL */
-#    define CIAOX11_EXF_Logger_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_Logger_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_LOGGER_BUILD_DLL */
 #else /* CIAOX11_EXF_LOGGER_HAS_DLL == 1 */
 #  define CIAOX11_EXF_Logger_Export
@@ -34,5 +34,3 @@
 #endif /* CIAOX11_EXF_LOGGER_HAS_DLL == 1 */
 
 #endif /* CIAOX11_EXF_LOGGER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/exf/deployment/monitor/ciaox11_exf_monitor_export.h b/exf/deployment/monitor/ciaox11_exf_monitor_export.h
index 673b55ca0..cf48251bf 100644
--- a/exf/deployment/monitor/ciaox11_exf_monitor_export.h
+++ b/exf/deployment/monitor/ciaox11_exf_monitor_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_EXF_MONITOR_EXPORT_H
 #define CIAOX11_EXF_MONITOR_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_MONITOR_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_MONITOR_HAS_DLL)
 #  define CIAOX11_EXF_MONITOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_MONITOR_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_MONITOR_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_MONITOR_HAS_DLL)
 #  define CIAOX11_EXF_MONITOR_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_EXF_MONITOR_HAS_DLL) && (CIAOX11_EXF_MONITOR_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_MONITOR_BUILD_DLL)
-#    define CIAOX11_EXF_MONITOR_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_MONITOR_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_MONITOR_BUILD_DLL */
-#    define CIAOX11_EXF_MONITOR_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_MONITOR_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_MONITOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_MONITOR_BUILD_DLL */
 #else /* CIAOX11_EXF_MONITOR_HAS_DLL == 1 */
 #  define CIAOX11_EXF_MONITOR_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_EXF_MONITOR_EXPORT_H */
 
-// End of auto generated file.
diff --git a/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h b/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h
index 011531cce..709a5efdd 100644
--- a/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h
+++ b/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h
@@ -8,11 +8,11 @@
 #ifndef CIAOX11_EXF_SCHEDULER_EXPORT_H
 #define CIAOX11_EXF_SCHEDULER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_SCHEDULER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_EXF_SCHEDULER_HAS_DLL)
 #  define CIAOX11_EXF_SCHEDULER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_EXF_SCHEDULER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_EXF_SCHEDULER_HAS_DLL */
 
 #if !defined (CIAOX11_EXF_SCHEDULER_HAS_DLL)
 #  define CIAOX11_EXF_SCHEDULER_HAS_DLL 1
@@ -20,13 +20,13 @@
 
 #if defined (CIAOX11_EXF_SCHEDULER_HAS_DLL) && (CIAOX11_EXF_SCHEDULER_HAS_DLL == 1)
 #  if defined (CIAOX11_EXF_SCHEDULER_BUILD_DLL)
-#    define CIAOX11_EXF_SCHEDULER_Export ACE_Proper_Export_Flag
-#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_SCHEDULER_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_EXF_SCHEDULER_BUILD_DLL */
-#    define CIAOX11_EXF_SCHEDULER_Export ACE_Proper_Import_Flag
-#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_EXF_SCHEDULER_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_EXF_SCHEDULER_BUILD_DLL */
 #else /* CIAOX11_EXF_SCHEDULER_HAS_DLL == 1 */
 #  define CIAOX11_EXF_SCHEDULER_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_EXF_SCHEDULER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/tests/dance/interceptors/interceptor/test_interceptor_export.h b/tests/dance/interceptors/interceptor/test_interceptor_export.h
index 938ff2f7f..a31992cf5 100644
--- a/tests/dance/interceptors/interceptor/test_interceptor_export.h
+++ b/tests/dance/interceptors/interceptor/test_interceptor_export.h
@@ -10,11 +10,11 @@
 #ifndef TEST_INTERCEPTOR_EXPORT_H
 #define TEST_INTERCEPTOR_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TEST_INTERCEPTOR_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (TEST_INTERCEPTOR_HAS_DLL)
 #  define TEST_INTERCEPTOR_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TEST_INTERCEPTOR_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && TEST_INTERCEPTOR_HAS_DLL */
 
 #if !defined (TEST_INTERCEPTOR_HAS_DLL)
 #  define TEST_INTERCEPTOR_HAS_DLL 1
@@ -22,13 +22,13 @@
 
 #if defined (TEST_INTERCEPTOR_HAS_DLL) && (TEST_INTERCEPTOR_HAS_DLL == 1)
 #  if defined (TEST_INTERCEPTOR_BUILD_DLL)
-#    define Test_Interceptor_Export ACE_Proper_Export_Flag
-#    define TEST_INTERCEPTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TEST_INTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define Test_Interceptor_Export TAOX11_Proper_Export_Flag
+#    define TEST_INTERCEPTOR_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define TEST_INTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* TEST_INTERCEPTOR_BUILD_DLL */
-#    define Test_Interceptor_Export ACE_Proper_Import_Flag
-#    define TEST_INTERCEPTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TEST_INTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define Test_Interceptor_Export TAOX11_Proper_Import_Flag
+#    define TEST_INTERCEPTOR_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define TEST_INTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* TEST_INTERCEPTOR_BUILD_DLL */
 #else /* TEST_INTERCEPTOR_HAS_DLL == 1 */
 #  define Test_Interceptor_Export
@@ -37,5 +37,3 @@
 #endif /* TEST_INTERCEPTOR_HAS_DLL == 1 */
 
 #endif /* TEST_INTERCEPTOR_EXPORT_H */
-
-// End of auto generated file.