ChangeLogTag:Mon Feb 14 18:45:28 2005 Steve Huston <shuston@riverace.com>

13 files changed, 33 insertions, 32 deletions

diff --git a/protocols/ace/RMCast/Acknowledge.cpp b/protocols/ace/RMCast/Acknowledge.cpp
index 91627768ec4..f25bd02b165 100644
--- a/protocols/ace/RMCast/Acknowledge.cpp
+++ b/protocols/ace/RMCast/Acknowledge.cpp
@@ -2,10 +2,10 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include <ace/RMCast/Acknowledge.h>
-
 #include "ace/OS_NS_unistd.h"
 
+#include "Acknowledge.h"
+
 namespace ACE_RMCast
 {
   ACE_Time_Value const tick (0, 5000);
diff --git a/protocols/ace/RMCast/Acknowledge.h b/protocols/ace/RMCast/Acknowledge.h
index 4289ec729db..85c0cc9b0b6 100644
--- a/protocols/ace/RMCast/Acknowledge.h
+++ b/protocols/ace/RMCast/Acknowledge.h
@@ -8,9 +8,9 @@
 #include <ace/Hash_Map_Manager.h>
 #include <ace/Thread_Manager.h>
 
-#include <ace/RMCast/Stack.h>
-#include <ace/RMCast/Protocol.h>
-#include <ace/RMCast/Bits.h>
+#include "Stack.h"
+#include "Protocol.h"
+#include "Bits.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Link.h b/protocols/ace/RMCast/Link.h
index e6e66bbbd80..e7b2250aba5 100644
--- a/protocols/ace/RMCast/Link.h
+++ b/protocols/ace/RMCast/Link.h
@@ -10,8 +10,8 @@
 
 #include <ace/Thread_Manager.h>
 
-#include <ace/RMCast/Stack.h>
-#include <ace/RMCast/Protocol.h>
+#include "Stack.h"
+#include "Protocol.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Protocol.cpp b/protocols/ace/RMCast/Protocol.cpp
index 8c62bef6c00..f27583cff0e 100644
--- a/protocols/ace/RMCast/Protocol.cpp
+++ b/protocols/ace/RMCast/Protocol.cpp
@@ -2,7 +2,7 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include <ace/RMCast/Protocol.h>
+#include "Protocol.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Protocol.h b/protocols/ace/RMCast/Protocol.h
index 989cd618699..be18e8d9f16 100644
--- a/protocols/ace/RMCast/Protocol.h
+++ b/protocols/ace/RMCast/Protocol.h
@@ -7,8 +7,6 @@
 #ifndef ACE_RMCAST_PROTOCOL_H
 #define ACE_RMCAST_PROTOCOL_H
 
-#include "ace/RMCast/Bits.h"
-
 #include "ace/Refcounted_Auto_Ptr.h"
 
 #include "ace/Vector_T.h"
@@ -20,6 +18,8 @@
 
 #include "ace/OS_NS_string.h"
 
+#include "Bits.h"
+
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Retransmit.cpp b/protocols/ace/RMCast/Retransmit.cpp
index e04cec2f689..05e59e1879a 100644
--- a/protocols/ace/RMCast/Retransmit.cpp
+++ b/protocols/ace/RMCast/Retransmit.cpp
@@ -4,7 +4,7 @@
 
 #include <ace/OS.h>
 
-#include <ace/RMCast/Retransmit.h>
+#include "Retransmit.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Retransmit.h b/protocols/ace/RMCast/Retransmit.h
index 6348ba66009..fbfd20fa62c 100644
--- a/protocols/ace/RMCast/Retransmit.h
+++ b/protocols/ace/RMCast/Retransmit.h
@@ -9,9 +9,9 @@
 
 #include <ace/Thread_Manager.h>
 
-#include <ace/RMCast/Stack.h>
-#include <ace/RMCast/Protocol.h>
-#include <ace/RMCast/Bits.h>
+#include "Stack.h"
+#include "Protocol.h"
+#include "Bits.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Simulator.cpp b/protocols/ace/RMCast/Simulator.cpp
index 4b08f37f3da..8b024d1d299 100644
--- a/protocols/ace/RMCast/Simulator.cpp
+++ b/protocols/ace/RMCast/Simulator.cpp
@@ -2,7 +2,7 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include <ace/RMCast/Simulator.h>
+#include "Simulator.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Simulator.h b/protocols/ace/RMCast/Simulator.h
index 5aa37d48279..f8ffe13473f 100644
--- a/protocols/ace/RMCast/Simulator.h
+++ b/protocols/ace/RMCast/Simulator.h
@@ -7,12 +7,12 @@
 #ifndef ACE_RMCAST_SIMULATOR_H
 #define ACE_RMCAST_SIMULATOR_H
 
-#include "ace/RMCast/Stack.h"
-#include "ace/RMCast/Protocol.h"
-#include "ace/RMCast/Bits.h"
-
 #include "ace/Thread_Mutex.h"
 
+#include "Stack.h"
+#include "Protocol.h"
+#include "Bits.h"
+
 namespace ACE_RMCast
 {
   class Simulator : public Element
diff --git a/protocols/ace/RMCast/Socket.cpp b/protocols/ace/RMCast/Socket.cpp
index 640a1a7d694..cdaa663fa25 100644
--- a/protocols/ace/RMCast/Socket.cpp
+++ b/protocols/ace/RMCast/Socket.cpp
@@ -2,9 +2,10 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include <ace/OS.h>
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
 
-#include <ace/RMCast/Socket.h>
+#include "Socket.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Socket.h b/protocols/ace/RMCast/Socket.h
index b83a162602b..4d096456fa5 100644
--- a/protocols/ace/RMCast/Socket.h
+++ b/protocols/ace/RMCast/Socket.h
@@ -7,19 +7,19 @@
 #ifndef ACE_RMCAST_SOCKET_H
 #define ACE_RMCAST_SOCKET_H
 
-#include "ace/RMCast/Stack.h"
-#include "ace/RMCast/Protocol.h"
-#include "ace/RMCast/Bits.h"
-
-#include "ace/RMCast/Link.h"
-#include "ace/RMCast/Simulator.h"
-#include "ace/RMCast/Retransmit.h"
-#include "ace/RMCast/Acknowledge.h"
-
 #include "ace/Unbounded_Queue.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/Condition_T.h"
 
+#include "Stack.h"
+#include "Protocol.h"
+#include "Bits.h"
+
+#include "Link.h"
+#include "Simulator.h"
+#include "Retransmit.h"
+#include "Acknowledge.h"
+
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Stack.cpp b/protocols/ace/RMCast/Stack.cpp
index 729e289cf0e..f9b2ddf78ea 100644
--- a/protocols/ace/RMCast/Stack.cpp
+++ b/protocols/ace/RMCast/Stack.cpp
@@ -2,7 +2,7 @@
 // author    : Boris Kolpackov <boris@kolpackov.net>
 // cvs-id    : $Id$
 
-#include <ace/RMCast/Stack.h>
+#include "Stack.h"
 
 namespace ACE_RMCast
 {
diff --git a/protocols/ace/RMCast/Stack.h b/protocols/ace/RMCast/Stack.h
index e371370977d..8f7078c6504 100644
--- a/protocols/ace/RMCast/Stack.h
+++ b/protocols/ace/RMCast/Stack.h
@@ -5,7 +5,7 @@
 #ifndef ACE_RMCAST_STACK_H
 #define ACE_RMCAST_STACK_H
 
-#include <ace/RMCast/Protocol.h>
+#include "Protocol.h"
 
 namespace ACE_RMCast
 {