Header fixes, warning fixes.

3 files changed, 4 insertions, 4 deletions

diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 8ea9b259f9b..b1cca8ad05b 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -80,11 +80,11 @@ public:
 
 private:
 
-    void throwNullHandleException(char *, int) const;
+    void throwNullHandleException(const char *, int) const;
 };
 
 template<typename T> void
-HandleBase<T>::throwNullHandleException(char* file, int line) const
+HandleBase<T>::throwNullHandleException(const char* file, int line) const
 {
     throw NullHandleException(file, line);
 }
diff --git a/cpp/src/IceUtil/Random.cpp b/cpp/src/IceUtil/Random.cpp
index d3e217a2fc1..79b6eb32103 100644
--- a/cpp/src/IceUtil/Random.cpp
+++ b/cpp/src/IceUtil/Random.cpp
@@ -13,8 +13,6 @@
 #   include <Wincrypt.h>
 #else
 #   include <IceUtil/StaticMutex.h>
-#   include <sys/types.h>
-#   include <sys/stat.h>
 #   include <fcntl.h>
 #   include <unistd.h>
 #endif
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 77f01bb8bfd..0f1c9a905b8 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -18,6 +18,8 @@
 #   include <rpc.h>
 #else
 #   include <IceUtil/Random.h>
+#   include <sys/types.h>
+#   include <unistd.h>
 #endif
 
 using namespace std;