Sun Sep 1 00:43:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

        * NEWS:
        * ace/ACE.h:
        * ace/ACE.cpp:
        * ace/MEM_Acceptor.cpp:
        * ace/MMAP_Memory_Pool.cpp:
        * ace/Naming_Context.cpp:
        * ace/SPIPE_Connector.cpp:
        * ace/System_Time.cpp:

          Remove unneeded includes from ACE.h. ACE.h is included a lot,
          and bringing in any extra includes increases the risk of
          namespace collisions.

          All the cpp files above were implicitly dependent on ACE.h to
          include, which are now explicit.

9 files changed, 32 insertions, 7 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e70f694cc1d..74e29875c91 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Sun Sep  1 00:43:55 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+        * ace/ACE.h:
+        * ace/ACE.cpp:
+        * ace/MEM_Acceptor.cpp:
+        * ace/MMAP_Memory_Pool.cpp:
+        * ace/Naming_Context.cpp:
+        * ace/SPIPE_Connector.cpp:
+        * ace/System_Time.cpp:
+
+          Remove unneeded includes from ACE.h. ACE.h is included a lot,
+          and bringing in any extra includes increases the risk of
+          namespace collisions.
+
+          All the cpp files above were implicitly dependent on ACE.h to
+          include, which are now explicit.
+
 Fri Aug 30 12:10:23 UTC 2013  Steve Huston  <shuston@riverace.com>
 
         * ace/Process.cpp (spawn): Supply correct type to command_line_buf()
@@ -16,7 +34,7 @@ Thu Aug 29 22:06:55 UTC 2013  Steve Huston  <shuston@riverace.com>
         * ace/Process.h:
         * ace/Process.inl: Changed ACE_Process::command_line_buf(int*) to
           command_line_buf(size_t*) to align with the member whose value is
-          returned. 
+          returned.
 
         * ace/README: Added ACE_HAS_INT_SWAB description.
 
diff --git a/ACE/NEWS b/ACE/NEWS
index 4433d06bbaf..11e90f5b31f 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -5,6 +5,11 @@ USER VISIBLE CHANGES BETWEEN ACE-6.2.1 and ACE-6.2.2
   to size_t*. This corrects a mismatch between the argument type and the
   data member in ACE_Process from which the value comes.
 
+. Removed some include files from ACE.h. These were not required for ACE.
+  The removed includes are OS_NS_math, Flag_Manip, Handle_Ops, Lib_Find,
+  Init_ACE, Sock_Connect.h. You may have to explicitly add one of these
+  in your own code to restore compiling.
+
 USER VISIBLE CHANGES BETWEEN ACE-6.2.0 and ACE-6.2.1
 ====================================================
 
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 8d635d8f399..efc1a410657 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -9,6 +9,7 @@
 #include "ace/Version.h"
 #include "ace/Message_Block.h"
 #include "ace/Log_Category.h"
+#include "ace/Flag_Manip.h"
 #include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_strings.h"
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h
index c8625f1e460..76e84f34f1a 100644
--- a/ACE/ace/ACE.h
+++ b/ACE/ace/ACE.h
@@ -28,12 +28,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS_NS_math.h"
-#include "ace/Flag_Manip.h"
-#include "ace/Handle_Ops.h"
-#include "ace/Lib_Find.h"
-#include "ace/Init_ACE.h"
-#include "ace/Sock_Connect.h"
+#include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
 
 #if defined (ACE_EXPORT_MACRO)
diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp
index 89df3ae728b..2fabdfe5fa4 100644
--- a/ACE/ace/MEM_Acceptor.cpp
+++ b/ACE/ace/MEM_Acceptor.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/MEM_Acceptor.h"
+#include "ace/Lib_Find.h"
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index e5eb2a4be1a..bc942e03e8f 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -8,6 +8,7 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/Log_Category.h"
 #include "ace/Truncate.h"
+#include "ace/Lib_Find.h"
 
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 #include "ace/Based_Pointer_T.h"
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index f588c153131..42701dc4044 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -6,6 +6,7 @@
 #include "ace/Local_Name_Space_T.h"
 #include "ace/Registry_Name_Space.h"
 #include "ace/MMAP_Memory_Pool.h"
+#include "ace/Lib_Find.h"
 #include "ace/RW_Process_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp
index eb2947e52fc..a61c7ca62da 100644
--- a/ACE/ace/SPIPE_Connector.cpp
+++ b/ACE/ace/SPIPE_Connector.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/SPIPE_Connector.h"
+#include "ace/Handle_Ops.h"
 #include "ace/Log_Category.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_fcntl.h"
diff --git a/ACE/ace/System_Time.cpp b/ACE/ace/System_Time.cpp
index 47efd1e7b36..967a49b3f45 100644
--- a/ACE/ace/System_Time.cpp
+++ b/ACE/ace/System_Time.cpp
@@ -5,6 +5,8 @@
 #include "ace/Malloc_T.h"
 #include "ace/Null_Mutex.h"
 #include "ace/Time_Value.h"
+#include "ace/Lib_Find.h"
+
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_time.h"