7 files changed, 10 insertions, 11 deletions
diff --git a/qpid/cpp/rubygen/0-10/handlers.rb b/qpid/cpp/rubygen/0-10/handlers.rb
index db4fdc871b..981ea890e6 100755
--- a/qpid/cpp/rubygen/0-10/handlers.rb
+++ b/qpid/cpp/rubygen/0-10/handlers.rb
@@ -35,7 +35,7 @@ class GenHandlers < CppGen
 
   def generate()
     h_file("#{@dir}/handlers.h") {
-      include "specification"
+      include "#{@dir}/specification"
       namespace("#{@ns}") { 
         action_handler "Command", @amqp.collect_all(AmqpCommand)
         action_handler "Control", @amqp.collect_all(AmqpControl)
diff --git a/qpid/cpp/rubygen/0-10/specification.rb b/qpid/cpp/rubygen/0-10/specification.rb
index e27ad00231..7366599eba 100755
--- a/qpid/cpp/rubygen/0-10/specification.rb
+++ b/qpid/cpp/rubygen/0-10/specification.rb
@@ -342,8 +342,8 @@ class Specification < CppGen
     }
     
     cpp_file("#{@dir}/#{name}") {
-      include "#{name}"
-      include "exceptions.h"
+      include "#{@dir}/#{name}"
+      include "#{@dir}/exceptions.h"
       namespace(@ns) {
         genl "using framing::in_place;"
         genl
diff --git a/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
index 3bacdbd812..00962de4f9 100755
--- a/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
@@ -42,7 +42,7 @@ class MethodBodyDefaultVisitorGen < CppGen
 
     cpp_file(@filename) {
       include(@filename)
-      include("all_method_bodies.h")
+      include("qpid/framing/all_method_bodies.h")
       namespace(@namespace) {
         @amqp.methods_.each { |m|
           genl "void #{@classname}::visit(const #{m.body_name}& b) { defaultVisit(b); }"
diff --git a/qpid/cpp/rubygen/framing.0-10/Proxy.rb b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
index 7e11d62d9b..6e3cb4fd4d 100755
--- a/qpid/cpp/rubygen/framing.0-10/Proxy.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
@@ -86,7 +86,7 @@ EOS
   # .cpp file
   cpp_file(@filename) {
       include "<sstream>"
-      include "#{@classname}.h"
+      include "qpid/framing/#{@classname}.h"
       include "qpid/framing/amqp_types_full.h"
       methods_on(@amqp, @chassis).each {
         |m| include "qpid/framing/"+m.body_name
diff --git a/qpid/cpp/rubygen/framing.0-10/Session.rb b/qpid/cpp/rubygen/framing.0-10/Session.rb
index e681a4a23d..7b92a17f41 100644..100755
--- a/qpid/cpp/rubygen/framing.0-10/Session.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Session.rb
@@ -158,7 +158,7 @@ class SessionNoKeywordGen < CppGen
       }}
 
     cpp_file(@file) { 
-      include @classname
+      include "qpid/client/#{@classname}"
       include "qpid/framing/all_method_bodies.h"
       include "qpid/client/SessionImpl.h"
       include "qpid/client/MessageImpl.h"
diff --git a/qpid/cpp/rubygen/framing.0-10/constants.rb b/qpid/cpp/rubygen/framing.0-10/constants.rb
index fa2031b0ce..ea74c82f73 100755
--- a/qpid/cpp/rubygen/framing.0-10/constants.rb
+++ b/qpid/cpp/rubygen/framing.0-10/constants.rb
@@ -164,7 +164,7 @@ EOS
     h_file("#{@dir}/reply_exceptions") {
       include "qpid/Exception"
       include "qpid/sys/ExceptionHolder"
-      include "enum"
+      include "qpid/framing/enum"
       include "qpid/CommonImportExport.h"
       namespace(@namespace) {
         declare_exceptions("execution", "error-code", "SessionException")
diff --git a/qpid/cpp/rubygen/framing.0-10/structs.rb b/qpid/cpp/rubygen/framing.0-10/structs.rb
index 8ea8a91172..823d062dd5 100644..100755
--- a/qpid/cpp/rubygen/framing.0-10/structs.rb
+++ b/qpid/cpp/rubygen/framing.0-10/structs.rb
@@ -462,9 +462,8 @@ EOS
         buffer = "/*buffer*/"
       end
       gen <<EOS
-#include "#{classname}.h"
-
-#include "reply_exceptions.h"
+#include "qpid/framing/#{classname}.h"
+#include "qpid/framing/reply_exceptions.h"
 
 using namespace qpid::framing;
 
@@ -605,7 +604,7 @@ EOS
     structs.each { |s| define_struct(s) }
     @amqp.methods_.each { |m| define_struct(m) }
     #generate a single include file containing the list of structs for convenience
-    h_file("qpid/framing/amqp_structs.h") { structs.each { |s| genl "#include \"#{s.cppname}.h\"" } }
+    h_file("qpid/framing/amqp_structs.h") { structs.each { |s| genl "#include \"qpid/framing/#{s.cppname}.h\"" } }
   end
 end