1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index dc718fa94b4..961eef75e08 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -11,6 +11,13 @@
 #include <Ice/Ice.h>
 #include <Ice/Service.h>
 #include <IceGrid/RegistryI.h>
+#ifdef __BCPLUSPLUS__
+#  include <IceGrid/AdminSessionI.h>
+#  include <IceGrid/WaitQueue.h>
+#  include <IceGrid/ReapThread.h>
+#  include <IceGrid/TraceLevels.h>
+#  include <IceGrid/Database.h>
+#endif
 
 using namespace std;
 using namespace Ice;
@@ -57,7 +64,7 @@ RegistryService::start(int argc, char* argv[])
     vector<string> args;
     try
     {
-    	args = opts.parse(argc, argv);
+    	args = opts.parse(argc, (const char**)argv);
     }
     catch(const IceUtil::Options::BadOpt& e)
     {