From 8c215112dfc278f704ba37db8699a829f9cabf3a Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 13 Feb 2023 14:13:15 +0100
Subject: Compile fixes

    * TAO/tao/PortableServer/Active_Policy_Strategies.h:
    * TAO/tao/PortableServer/ThreadStrategy.h:
---
 TAO/tao/PortableServer/Active_Policy_Strategies.h | 15 ++++++++-------
 TAO/tao/PortableServer/ThreadStrategy.h           |  3 +--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index 9f982b3998e..c0ff0e06b21 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -28,6 +28,14 @@
 #include "tao/PortableServer/ImplicitActivationPolicyC.h"
 #include "tao/PortableServer/RequestProcessingPolicyC.h"
 
+#include "tao/PortableServer/ThreadStrategy.h"
+#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "tao/PortableServer/LifespanStrategy.h"
+#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "tao/PortableServer/ServantRetentionStrategy.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Root_POA;
@@ -37,13 +45,6 @@ namespace TAO
   namespace Portable_Server
   {
     class Cached_Policies;
-    class ThreadStrategy;
-    class RequestProcessingStrategy;
-    class IdAssignmentStrategy;
-    class LifespanStrategy;
-    class IdUniquenessStrategy;
-    class ImplicitActivationStrategy;
-    class ServantRetentionStrategy;
 
     /**
      * This class stores the active policy strategies used for a certain POA.
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index 6ad68bcb0cd..5ee79a7a354 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -12,13 +12,12 @@
 #define TAO_THREAD_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ThreadPolicyC.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-- 
cgit v1.2.1