Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE

105 files changed, 14 insertions, 221 deletions

diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index 50e43905185..eb03fc776f4 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -320,9 +320,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/ARGV.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_ARGUMENT_VECTOR_H */
diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h
index a67a1d43190..23e46afc4c1 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -218,9 +218,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Abstract_Timer_Queue.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_ABSTRACT_TIMER_QUEUE_H */
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index 7dc9deaf300..5ebbeeb5fa7 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -684,9 +684,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Acceptor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 513f42ccfdc..be1e78ad596 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -192,9 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Active_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Active_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */
diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h
index 32d792d9875..c714b992ecb 100644
--- a/ACE/ace/Arg_Shifter.h
+++ b/ACE/ace/Arg_Shifter.h
@@ -226,9 +226,7 @@ typedef ACE_Arg_Shifter_T<ACE_TCHAR> ACE_Arg_Shifter;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Arg_Shifter.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h
index 33ccbd01d0b..f16aa65ed69 100644
--- a/ACE/ace/Array_Base.h
+++ b/ACE/ace/Array_Base.h
@@ -236,9 +236,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Array_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Array_Base.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h
index 64593cdb701..d7ddf25535c 100644
--- a/ACE/ace/Array_Map.h
+++ b/ACE/ace/Array_Map.h
@@ -287,9 +287,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # include "ace/Array_Map.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "ace/Array_Map.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+#include "ace/Array_Map.cpp"
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h
index 5354fde8d6c..16f4edb0dc3 100644
--- a/ACE/ace/Asynch_Acceptor.h
+++ b/ACE/ace/Asynch_Acceptor.h
@@ -260,9 +260,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Asynch_Acceptor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index f2790657583..aa1f763411a 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -154,9 +154,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Asynch_Connector.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h
index 3855803a448..751387f9ce7 100644
--- a/ACE/ace/Atomic_Op_GCC_T.h
+++ b/ACE/ace/Atomic_Op_GCC_T.h
@@ -120,9 +120,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Atomic_Op_GCC_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Atomic_Op_GCC_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */
 
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index 9cd9f49b7dd..e3752ccbd4c 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -344,9 +344,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Atomic_Op_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Atomic_Op_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /*ACE_ATOMIC_OP_T_H*/
diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h
index 707f6a0813b..c71e46c17be 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -92,9 +92,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Auto_Event.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_AUTO_EVENT_H */
diff --git a/ACE/ace/Auto_Functor.h b/ACE/ace/Auto_Functor.h
index cbf4827b6a4..e64bcdf6bb3 100644
--- a/ACE/ace/Auto_Functor.h
+++ b/ACE/ace/Auto_Functor.h
@@ -109,9 +109,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # include "ace/Auto_Functor.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined(ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "ace/Auto_Functor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+#include "ace/Auto_Functor.cpp"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_AUTO_FUNCTOR_H*/
diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h
index f7c10f7a00d..afbde550e51 100644
--- a/ACE/ace/Auto_IncDec_T.h
+++ b/ACE/ace/Auto_IncDec_T.h
@@ -65,9 +65,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Auto_IncDec_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Auto_IncDec_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h
index 6897e82feb7..43b704e02bb 100644
--- a/ACE/ace/Auto_Ptr.h
+++ b/ACE/ace/Auto_Ptr.h
@@ -192,9 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Auto_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Auto_Ptr.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (_MSC_VER)
 // Restore the warning state to what it was before entry.
diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h
index 79f8df104a1..254371f305e 100644
--- a/ACE/ace/Based_Pointer_T.h
+++ b/ACE/ace/Based_Pointer_T.h
@@ -176,9 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Based_Pointer_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Based_Pointer_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index dcbe4b1e753..3b736a14942 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -366,9 +366,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Bound_Ptr.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Bound_Ptr.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index 4f7d3473f6a..ce8016af06e 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -384,9 +384,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Cache_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index 2788d808506..dd762faa2eb 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -247,9 +247,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Cached_Connect_Strategy_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* CACHED_CONNECT_STRATEGY_T_H */
diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h
index c3741ce4e30..8960ddd937b 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -538,9 +538,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Caching_Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Caching_Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h
index 24903b8dbd9..66ba434c9dd 100644
--- a/ACE/ace/Caching_Utility_T.h
+++ b/ACE/ace/Caching_Utility_T.h
@@ -288,9 +288,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Caching_Utility_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h
index 4abd3a1246f..9ec2afcdb6e 100644
--- a/ACE/ace/Cleanup_Strategies_T.h
+++ b/ACE/ace/Cleanup_Strategies_T.h
@@ -130,9 +130,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Cleanup_Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* CLEANUP_STRATEGIES_H */
diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h
index d460075e63d..f70ea1dad13 100644
--- a/ACE/ace/Condition_T.h
+++ b/ACE/ace/Condition_T.h
@@ -152,9 +152,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Condition_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Condition_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_HAS_THREADS */
 
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 673d1d8455e..2903ad6a750 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -564,9 +564,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Connector.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index 1d9a03d92f7..8282dca833d 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -2019,9 +2019,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Containers_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Containers_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h
index 5dc11013c0e..86bbf224f7e 100644
--- a/ACE/ace/Countdown_Time_T.h
+++ b/ACE/ace/Countdown_Time_T.h
@@ -89,8 +89,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Countdown_Time_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Countdown_Time_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_COUNTDOWN_TIME_T_H */
diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h
index c791f476d18..3d1cc3650ac 100644
--- a/ACE/ace/Dump_T.h
+++ b/ACE/ace/Dump_T.h
@@ -68,9 +68,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
           ((void *) this);
 #endif /* ACE_NDEBUG */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Dump_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_DUMP_T_H */
diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h
index 5f99474b72a..ed866b3f78e 100644
--- a/ACE/ace/Dynamic_Service.h
+++ b/ACE/ace/Dynamic_Service.h
@@ -74,9 +74,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Dynamic_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 # include "ace/Dynamic_Service.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h
index 99ed94690d3..e080cafcec6 100644
--- a/ACE/ace/Env_Value_T.h
+++ b/ACE/ace/Env_Value_T.h
@@ -78,9 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Env_Value_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Env_Value_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h
index 314fd3398d2..f0727003f53 100644
--- a/ACE/ace/Event.h
+++ b/ACE/ace/Event.h
@@ -77,9 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Event.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Event.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_EVENT_H */
diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h
index 15dd2d720bc..c4597926762 100644
--- a/ACE/ace/Event_Handler_T.h
+++ b/ACE/ace/Event_Handler_T.h
@@ -173,9 +173,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Event_Handler_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Event_Handler_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_EVENT_HANDLER_H */
diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h
index fd9ae43fffb..e23f11889f5 100644
--- a/ACE/ace/Framework_Component_T.h
+++ b/ACE/ace/Framework_Component_T.h
@@ -57,9 +57,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
         ACE_Framework_Repository::instance ()->register_component \
           (new ACE_Framework_Component_T<CLASS> (INSTANCE));
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Framework_Component_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_FRAMEWORK_COMPONENT_T_H */
diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h
index a71f99c204c..a6252fe85ed 100644
--- a/ACE/ace/Free_List.h
+++ b/ACE/ace/Free_List.h
@@ -137,9 +137,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Free_List.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_FREE_LIST_H */
diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h
index 2c26f645c0d..4a9fb185dd2 100644
--- a/ACE/ace/Functor_T.h
+++ b/ACE/ace/Functor_T.h
@@ -180,9 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Functor_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Functor_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_FUNCTOR_T_H */
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index 092682752ec..e07756fc880 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -362,9 +362,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Future.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_HAS_THREADS */
 
diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h
index 2d43f193730..ed1eb0999bf 100644
--- a/ACE/ace/Future_Set.h
+++ b/ACE/ace/Future_Set.h
@@ -126,9 +126,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Future_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_HAS_THREADS */
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index b95fb142ef6..b73346b6b4e 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -378,9 +378,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Guard_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_GUARD_T_H */
diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h
index fa6127e63ca..9b94124afab 100644
--- a/ACE/ace/Hash_Cache_Map_Manager_T.h
+++ b/ACE/ace/Hash_Cache_Map_Manager_T.h
@@ -196,9 +196,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Hash_Cache_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Hash_Cache_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 5b15ab8dde4..045c2935020 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -1281,9 +1281,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  include "ace/Hash_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Hash_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HASH_MAP_MANAGER_T_H */
diff --git a/ACE/ace/Hash_Map_With_Allocator_T.h b/ACE/ace/Hash_Map_With_Allocator_T.h
index 7636acca610..eb8473305d6 100644
--- a/ACE/ace/Hash_Map_With_Allocator_T.h
+++ b/ACE/ace/Hash_Map_With_Allocator_T.h
@@ -97,9 +97,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Hash_Map_With_Allocator_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Hash_Map_With_Allocator_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */
diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h
index ba3651084ef..dfa34ea9c5f 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.h
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.h
@@ -946,9 +946,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  include "ace/Hash_Multi_Map_Manager_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Hash_Multi_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */
diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h
index 9034b5e4129..0ac556978a5 100644
--- a/ACE/ace/IOStream_T.h
+++ b/ACE/ace/IOStream_T.h
@@ -266,13 +266,11 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#  if defined (__ACE_INLINE__)
-#    include "ace/IOStream_T.inl"
-#  endif /* __ACE_INLINE__ */
+#if defined (__ACE_INLINE__)
+# include "ace/IOStream_T.inl"
+#endif /* __ACE_INLINE__ */
 
-#  if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#    include "ace/IOStream_T.cpp"
-#  endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+#include "ace/IOStream_T.cpp"
 
 #include /**/ "ace/post.h"
 #endif /* ACE_IOSTREAM_T_H */
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 86ebe780aec..88357cf0215 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -140,9 +140,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Intrusive_Auto_Ptr.inl"
 #endif /* __ACE_INLINE __ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Intrusive_Auto_Ptr.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h
index a6455ae7ff1..58a820a840b 100644
--- a/ACE/ace/Intrusive_List.h
+++ b/ACE/ace/Intrusive_List.h
@@ -124,9 +124,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Intrusive_List.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Intrusive_List.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_INTRUSIVE_LIST_H */
diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h
index f834f3ba67f..73506d48ba7 100644
--- a/ACE/ace/Intrusive_List_Node.h
+++ b/ACE/ace/Intrusive_List_Node.h
@@ -70,9 +70,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Intrusive_List_Node.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Intrusive_List_Node.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_INTRUSIVE_LIST_NODE_H */
diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h
index 298bc5ea097..907e6f3bca1 100644
--- a/ACE/ace/LOCK_SOCK_Acceptor.h
+++ b/ACE/ace/LOCK_SOCK_Acceptor.h
@@ -53,9 +53,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/LOCK_SOCK_Acceptor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */
diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h
index fc811bfdb72..04dc0e5acd2 100644
--- a/ACE/ace/Local_Name_Space_T.h
+++ b/ACE/ace/Local_Name_Space_T.h
@@ -254,9 +254,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Local_Name_Space_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCAL_NAME_SPACE_T_H */
diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h
index 4ad62bbb9b0..dbc02adb6bb 100644
--- a/ACE/ace/Lock_Adapter_T.h
+++ b/ACE/ace/Lock_Adapter_T.h
@@ -107,9 +107,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Lock_Adapter_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Lock_Adapter_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_LOCK_ADAPTER_T_H */
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index 31d5b8006c5..273bb013dcb 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -881,9 +881,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Malloc_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Malloc_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MALLOC_H */
diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h
index ee9b7464da8..d18863842af 100644
--- a/ACE/ace/Managed_Object.h
+++ b/ACE/ace/Managed_Object.h
@@ -146,9 +146,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Managed_Object.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Managed_Object.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h
index 3f52aa3ca41..b4754c49194 100644
--- a/ACE/ace/Manual_Event.h
+++ b/ACE/ace/Manual_Event.h
@@ -88,9 +88,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Manual_Event.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MANUAL_EVENT_H */
diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h
index f04faa5d95e..0c887a412a9 100644
--- a/ACE/ace/Map_Manager.h
+++ b/ACE/ace/Map_Manager.h
@@ -696,9 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Map_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Map_Manager.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h
index e7cb62d0045..3e6d29fa145 100644
--- a/ACE/ace/Map_T.h
+++ b/ACE/ace/Map_T.h
@@ -1552,9 +1552,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Map_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MAP_T_H */
diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h
index 4423a888c73..0265992931c 100644
--- a/ACE/ace/Message_Block_T.h
+++ b/ACE/ace/Message_Block_T.h
@@ -73,9 +73,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Message_Block_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Message_Block_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_MESSAGE_BLOCK_T_H */
diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h
index 3edecb2565b..cfd3fdd43a6 100644
--- a/ACE/ace/Message_Queue_T.h
+++ b/ACE/ace/Message_Queue_T.h
@@ -1561,9 +1561,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Message_Queue_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h
index 6fb9acbd566..9488c81b7ae 100644
--- a/ACE/ace/Metrics_Cache_T.h
+++ b/ACE/ace/Metrics_Cache_T.h
@@ -222,9 +222,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Metrics_Cache_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Metrics_Cache_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* defined (ACE_COMPILE_TIMEPROBES) */
 
diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h
index ecb7a4c5a05..bb5f31578d2 100644
--- a/ACE/ace/Module.h
+++ b/ACE/ace/Module.h
@@ -201,9 +201,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Module.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Module.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h
index 4fe6c4e47f3..523cbec4b35 100644
--- a/ACE/ace/Node.h
+++ b/ACE/ace/Node.h
@@ -70,9 +70,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Node.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_NODE_H */
diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h
index 585f6ff3ad5..27d08d37976 100644
--- a/ACE/ace/Obstack_T.h
+++ b/ACE/ace/Obstack_T.h
@@ -114,9 +114,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Obstack_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Obstack_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_OBSTACK_T_H */
diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h
index d1cd354b800..ac352ef5d54 100644
--- a/ACE/ace/Pair_T.h
+++ b/ACE/ace/Pair_T.h
@@ -63,9 +63,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Pair_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Pair_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_PAIR_T_H */
diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h
index 0540abb8154..0bf1f40d9a7 100644
--- a/ACE/ace/RB_Tree.h
+++ b/ACE/ace/RB_Tree.h
@@ -118,11 +118,9 @@ public:
   /**
    * @note This method is inlined here rather than in RB_Tree.inl
    *       since that file may be included multiple times when
-   *       inlining is disabled and on platforms where
-   *       @c ACE_TEMPLATES_REQUIRE_SOURCE is defined.  In those
-   *       platform/configuration combinations, multiple definitions
-   *       of this method occurred.  Placing the definition inline in
-   *       the header avoids such errors.
+   *       inlining is disabled.  In those platform/configuration
+   *       combinations, multiple definitions of this method occurred.
+   *       Placing the definition inline in the header avoids such errors.
    */
   ACE_Allocator * allocator () const { return this->allocator_; }
 
@@ -871,9 +869,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/RB_Tree.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/RB_Tree.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ! defined (ACE_RB_TREE_H) */
diff --git a/ACE/ace/README b/ACE/ace/README
index 6fabe1a489c..9e80e74fe35 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -79,10 +79,6 @@ ACE_HAS_TRACE                           Defined when ACE_NTRACE=0 to
 ACE_PAGE_SIZE                           Defines the page size of the
                                         system (not used on Win32 or
                                         with ACE_HAS_GETPAGESIZE).
-ACE_TEMPLATES_REQUIRE_SOURCE            Compiler's template mechanim
-                                        must see source code (i.e.,
-                                        .cpp files).  This is used for
-                                        GNU G++.
 ACE_TIMEPROBE_ASSERTS_FIXED_SIZE        If enabled then ACE_Timeprobe_Ex<>::timeprobe()
                                         will assert if the end of the
                                         buffer is reached.  If disabled, the
diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h
index d30178e5283..2d7933fb834 100644
--- a/ACE/ace/Reactor_Token_T.h
+++ b/ACE/ace/Reactor_Token_T.h
@@ -79,9 +79,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Reactor_Token_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_REACTOR_TOKEN_T_H */
diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h
index 234aa4bdf04..5dab2e6e540 100644
--- a/ACE/ace/Refcountable_T.h
+++ b/ACE/ace/Refcountable_T.h
@@ -54,9 +54,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Refcountable_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Refcountable_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /*ACE_REFCOUNTABLE_T_H*/
diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h
index 199f3fe6056..e63af3a0481 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.h
+++ b/ACE/ace/Refcounted_Auto_Ptr.h
@@ -183,9 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include "ace/Refcounted_Auto_Ptr.inl"
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Refcounted_Auto_Ptr.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h
index 0f54e717e38..9f0d2ae659f 100644
--- a/ACE/ace/Reverse_Lock_T.h
+++ b/ACE/ace/Reverse_Lock_T.h
@@ -122,9 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Reverse_Lock_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Reverse_Lock_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_REVERSE_LOCK_T_H */
diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl
index 75b261a34c2..1757425725c 100644
--- a/ACE/ace/SString.inl
+++ b/ACE/ace/SString.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
-// Include ACE.h only if it hasn't already been included, e.g., if
-// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by
-// String_Base.cpp.
+// Include ACE.h only if it hasn't already been included
 #ifndef ACE_ACE_H
 #  include "ace/ACE.h"
 #endif /* !ACE_ACE_H */
diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h
index 48b36a2611f..e515bc756b0 100644
--- a/ACE/ace/Select_Reactor_T.h
+++ b/ACE/ace/Select_Reactor_T.h
@@ -696,9 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Select_Reactor_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Select_Reactor_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_SELECT_REACTOR_T_H */
diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h
index 44616f094e7..c8c7f7de56d 100644
--- a/ACE/ace/Singleton.h
+++ b/ACE/ace/Singleton.h
@@ -324,9 +324,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Singleton.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_SINGLETON_H */
diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h
index ff512109b80..4b7b7f00510 100644
--- a/ACE/ace/Strategies_T.h
+++ b/ACE/ace/Strategies_T.h
@@ -1032,9 +1032,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Strategies_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h
index 018e221e0b1..09e2f0f3335 100644
--- a/ACE/ace/Stream.h
+++ b/ACE/ace/Stream.h
@@ -237,9 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Stream.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Stream.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h
index 0ca292e907b..f3812e0fa86 100644
--- a/ACE/ace/Stream_Modules.h
+++ b/ACE/ace/Stream_Modules.h
@@ -152,9 +152,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Stream_Modules.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_STREAM_MODULES */
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index 8217e76cb55..6231151de70 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -876,9 +876,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/String_Base.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/String_Base.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 2a44184023a..176ab2ba328 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -337,9 +337,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Svc_Handler.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h
index cb2e6b8ddce..af13d17b733 100644
--- a/ACE/ace/TSS_T.h
+++ b/ACE/ace/TSS_T.h
@@ -252,9 +252,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/TSS_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/TSS_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TSS_T_H */
diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h
index 881ab40bd26..744bbff9122 100644
--- a/ACE/ace/Task_Ex_T.h
+++ b/ACE/ace/Task_Ex_T.h
@@ -180,9 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Task_Ex_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Task_Ex_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TASK_EX_H */
diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h
index b9574fee36c..701b96b88e6 100644
--- a/ACE/ace/Task_T.h
+++ b/ACE/ace/Task_T.h
@@ -183,9 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Task_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Task_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TASK_T_H */
diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h
index 56fb8f57d15..c174ca3d4da 100644
--- a/ACE/ace/Test_and_Set.h
+++ b/ACE/ace/Test_and_Set.h
@@ -57,9 +57,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Test_and_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TEST_AND_SET_H */
diff --git a/ACE/ace/Time_Policy_T.h b/ACE/ace/Time_Policy_T.h
index cd0de6649e5..de54653af13 100644
--- a/ACE/ace/Time_Policy_T.h
+++ b/ACE/ace/Time_Policy_T.h
@@ -62,8 +62,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Time_Policy_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Time_Policy_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_TIME_POLICY_T_H */
diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h
index 5b570e00fa7..32b32df3d41 100644
--- a/ACE/ace/Time_Value_T.h
+++ b/ACE/ace/Time_Value_T.h
@@ -178,9 +178,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Time_Value_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Time_Value_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIME_VALUE_T_H */
diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h
index a51e3fd2238..883c9e19e0d 100644
--- a/ACE/ace/Timeprobe_T.h
+++ b/ACE/ace/Timeprobe_T.h
@@ -203,9 +203,7 @@ protected:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timeprobe_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* ACE_COMPILE_TIMEPROBES */
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h
index 9529f8e6d98..2bbe5fff078 100644
--- a/ACE/ace/Timer_Hash_T.h
+++ b/ACE/ace/Timer_Hash_T.h
@@ -337,9 +337,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_Hash_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE  */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_HASH_T_H */
diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h
index c15b373cace..edde952efcd 100644
--- a/ACE/ace/Timer_Heap_T.h
+++ b/ACE/ace/Timer_Heap_T.h
@@ -332,9 +332,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_Heap_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_HEAP_T_H */
diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h
index 73479f624ca..18a05c4fe01 100644
--- a/ACE/ace/Timer_List_T.h
+++ b/ACE/ace/Timer_List_T.h
@@ -215,9 +215,7 @@ private:
   void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &) = delete;
 };
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_List_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_LIST_T_H */
diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
index 20970a7dc21..6e731a1caf9 100644
--- a/ACE/ace/Timer_Queue_Adapters.h
+++ b/ACE/ace/Timer_Queue_Adapters.h
@@ -251,9 +251,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # include "ace/Timer_Queue_Adapters.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 # include "ace/Timer_Queue_Adapters.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index 7ba8cd0bfe3..d550397791b 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -187,9 +187,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Timer_Queue_Iterator.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_Queue_Iterator.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_ITERATOR_H */
diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index 8978f7a0e44..060285cdf19 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -237,9 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Timer_Queue_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_Queue_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_QUEUE_T_H */
diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h
index 65b14a7f9b1..8d16b81400b 100644
--- a/ACE/ace/Timer_Wheel_T.h
+++ b/ACE/ace/Timer_Wheel_T.h
@@ -213,9 +213,7 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Timer_Wheel_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TIMER_WHEEL_T_H */
diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h
index 911478182c3..a9ade225b02 100644
--- a/ACE/ace/Tokenizer_T.h
+++ b/ACE/ace/Tokenizer_T.h
@@ -226,9 +226,7 @@ typedef ACE_Tokenizer_T <ACE_TCHAR> ACE_Tokenizer;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Tokenizer_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h
index 66c6af0ca19..a901e1de01c 100644
--- a/ACE/ace/Typed_SV_Message.h
+++ b/ACE/ace/Typed_SV_Message.h
@@ -91,9 +91,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Typed_SV_Message.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Typed_SV_Message.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h
index c482ea06e1b..7e9fe558bf6 100644
--- a/ACE/ace/Typed_SV_Message_Queue.h
+++ b/ACE/ace/Typed_SV_Message_Queue.h
@@ -77,9 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Typed_SV_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Typed_SV_Message_Queue.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_TYPED_MESSAGE_QUEUE_H */
diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h
index 51d2d09a7bd..6d20557c0b5 100644
--- a/ACE/ace/Unbounded_Queue.h
+++ b/ACE/ace/Unbounded_Queue.h
@@ -279,9 +279,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Unbounded_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Unbounded_Queue.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_UNBOUNDED_QUEUE_H */
diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h
index 8edc0bc06a5..79fd80c7610 100644
--- a/ACE/ace/Unbounded_Set.h
+++ b/ACE/ace/Unbounded_Set.h
@@ -86,9 +86,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Unbounded_Set.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Unbounded_Set.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_UNBOUNDED_SET_H */
diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h
index e8ab9ba21a7..e30a8e1a3ba 100644
--- a/ACE/ace/Unbounded_Set_Ex.h
+++ b/ACE/ace/Unbounded_Set_Ex.h
@@ -356,9 +356,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Unbounded_Set_Ex.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Unbounded_Set_Ex.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 #endif /* ACE_UNBOUNDED_SET_H */
diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h
index 7d3f7b08711..1674d2856d0 100644
--- a/ACE/ace/Vector_T.h
+++ b/ACE/ace/Vector_T.h
@@ -260,9 +260,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Vector_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Vector_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h
index 53925b24e02..102923c1941 100644
--- a/ACE/ace/config-all.h
+++ b/ACE/ace/config-all.h
@@ -70,6 +70,10 @@
 #  include "ace/Trace.h"
 #endif /* ACE_OS_NTRACE */
 
+#if !defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+# define ACE_TEMPLATES_REQUIRE_SOURCE
+#endif
+
 #if !defined (ACE_HAS_MONITOR_FRAMEWORK)
 # define ACE_HAS_MONITOR_FRAMEWORK 1
 #endif
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index a6b51e705ad..9ab89245007 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -14,8 +14,6 @@
 #define ACE_CC_MINOR_VERSION __GNUC_MINOR__
 #define ACE_CC_BETA_VERSION (0)
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 #if __cplusplus >= 202002L
 # define ACE_HAS_CPP20
 #endif
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index ce825d2beed..65a21df7f52 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -57,8 +57,6 @@
 # define ACE_HAS_INTEL_ASSEMBLY
 #endif
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 #if (__INTEL_COMPILER >= 910)
 # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
 #endif
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index 3628279d01e..92495ed7cd3 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -24,7 +24,6 @@
 #define ACE_LACKS_GETEGID
 #define ACE_LACKS_GETGID
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #define TAO_USE_SEQUENCE_TEMPLATES
 #define _REENTRANT
 #define ACE_MT_SAFE 1
diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h
index b27de279666..028b9c367af 100644
--- a/ACE/ace/config-mqx.h
+++ b/ACE/ace/config-mqx.h
@@ -55,7 +55,6 @@ extern "C" {
 #define ACE_RENAME_EQUIVALENT MQX_Filesystem::inst().rename
 
 #define ACE_MQX
-#define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_PAGE_SIZE 4096
 #define ACE_SOCKET_LEN uint16_t
 #define ACE_SOCKOPT_LEN socklen_t
diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h
index 908aef297c9..75fafb245d4 100644
--- a/ACE/ace/config-suncc-common.h
+++ b/ACE/ace/config-suncc-common.h
@@ -38,7 +38,5 @@
 # define ACE_LACKS_PRAGMA_ONCE
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 #include /**/ "ace/post.h"
 #endif /* ACE_SUNCC_COMMON_H */
diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h
index 2e2ef3b9d03..cea92f98471 100644
--- a/ACE/ace/config-sunos5.6.h
+++ b/ACE/ace/config-sunos5.6.h
@@ -33,9 +33,6 @@
 #ifndef ACE_LACKS_UNBUFFERED_STREAMBUF
 #define ACE_LACKS_UNBUFFERED_STREAMBUF 1
 #endif /* ACE_LACKS_UNBUFFERED_STREAMBUF */
-#ifndef ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_TEMPLATES_REQUIRE_SOURCE            1
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 // Forte 7 seems to botch this one...
 #ifndef ACE_HAS_THR_C_DEST
 #define ACE_HAS_THR_C_DEST                      1
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 430923a9c7e..91983c3f2d6 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -42,9 +42,6 @@
 #   define _C99
 #  endif
 # endif
-
-#elif defined (__DCC__)
-# define ACE_TEMPLATES_REQUIRE_SOURCE
 #else  /* ! __GNUG__ && !__DCC__ */
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #    error unsupported compiler on VxWorks
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 096feb0eb43..1ffc9968e98 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -114,7 +114,6 @@
 #define ACE_HAS_USER_MODE_MASKS 1
 #define ACE_LACKS_ACE_IOSTREAM 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-#define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #if defined (ACE_HAS_BCC32)
 # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu"
 # define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld"
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
index b3978f03544..18fea9a9a5e 100644
--- a/ACE/ace/config-win32-msvc-14.h
+++ b/ACE/ace/config-win32-msvc-14.h
@@ -50,8 +50,6 @@
 
 #define ACE_LACKS_STRRECVFD
 
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 // Platform provides ACE_TLI function prototypes.
 // For Win32, this is not really true, but saves a lot of hassle!
 #define ACE_HAS_TLI_PROTOTYPES