diff --git a/compiler/cpp/src/generate/t_c_glib_generator.cc b/compiler/cpp/src/generate/t_c_glib_generator.cc
index 8012770..f16a7fc 100644
--- a/compiler/cpp/src/generate/t_c_glib_generator.cc
+++ b/compiler/cpp/src/generate/t_c_glib_generator.cc
@@ -197,8 +197,8 @@
   f_types_ <<
     "/* base includes */" << endl <<
     "#include <glib-object.h>" << endl <<
-    "#include <thrift/thrift_struct.h>" << endl <<
-    "#include <thrift/protocol/thrift_protocol.h>" << endl;
+    "#include <thrift/c_glib/thrift_struct.h>" << endl <<
+    "#include <thrift/c_glib/protocol/thrift_protocol.h>" << endl;
 
   /* include other thrift includes */
   const vector<t_program *> &includes = program_->get_includes();
@@ -229,7 +229,7 @@
     endl <<
     "#include \"" << this->nspace_lc << program_name_u << 
         "_types.h\"" << endl <<
-    "#include <thrift/thrift.h>" << endl <<
+    "#include <thrift/c_glib/thrift.h>" << endl <<
     endl;
 
   f_types_ <<
@@ -422,8 +422,8 @@
   // include the headers
   f_service_ <<
     "#include <string.h>" << endl <<
-    "#include <thrift/thrift.h>" << endl <<
-    "#include <thrift/thrift_application_exception.h>" << endl <<
+    "#include <thrift/c_glib/thrift.h>" << endl <<
+    "#include <thrift/c_glib/thrift_application_exception.h>" << endl <<
     "#include \"" << filename << ".h\"" << endl <<
     endl;
 
diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
index d89b22c..f72ff96 100644
--- a/lib/c_glib/Makefile.am
+++ b/lib/c_glib/Makefile.am
@@ -24,7 +24,7 @@
 lib_LTLIBRARIES = libthrift_c_glib.la
 pkgconfig_DATA = thrift_c_glib.pc
 
-common_cflags = -g -Wall -W -Werror -Isrc -I src/thrift $(GLIB_CFLAGS)
+common_cflags = -g -Wall -W -Werror -Isrc -I src/thrift/c_glib $(GLIB_CFLAGS)
 common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
 
 # this removes optimizations and adds coverage flags
@@ -32,56 +32,56 @@
 
 # Define the source files for the module
 
-libthrift_c_glib_la_SOURCES = src/thrift/thrift.c \
-                              src/thrift/thrift_struct.c \
-                              src/thrift/thrift_application_exception.c \
-                              src/thrift/processor/thrift_processor.c \
-                              src/thrift/protocol/thrift_protocol.c \
-                              src/thrift/protocol/thrift_protocol_factory.c \
-                              src/thrift/protocol/thrift_binary_protocol.c \
-                              src/thrift/protocol/thrift_binary_protocol_factory.c \
-                              src/thrift/transport/thrift_transport.c \
-                              src/thrift/transport/thrift_transport_factory.c \
-                              src/thrift/transport/thrift_socket.c \
-                              src/thrift/transport/thrift_server_transport.c \
-                              src/thrift/transport/thrift_server_socket.c \
-                              src/thrift/transport/thrift_buffered_transport.c \
-                              src/thrift/transport/thrift_framed_transport.c \
-                              src/thrift/transport/thrift_memory_buffer.c \
-                              src/thrift/server/thrift_server.c \
-                              src/thrift/server/thrift_simple_server.c
+libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \
+                              src/thrift/c_glib/thrift_struct.c \
+                              src/thrift/c_glib/thrift_application_exception.c \
+                              src/thrift/c_glib/processor/thrift_processor.c \
+                              src/thrift/c_glib/protocol/thrift_protocol.c \
+                              src/thrift/c_glib/protocol/thrift_protocol_factory.c \
+                              src/thrift/c_glib/protocol/thrift_binary_protocol.c \
+                              src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c \
+                              src/thrift/c_glib/transport/thrift_transport.c \
+                              src/thrift/c_glib/transport/thrift_transport_factory.c \
+                              src/thrift/c_glib/transport/thrift_socket.c \
+                              src/thrift/c_glib/transport/thrift_server_transport.c \
+                              src/thrift/c_glib/transport/thrift_server_socket.c \
+                              src/thrift/c_glib/transport/thrift_buffered_transport.c \
+                              src/thrift/c_glib/transport/thrift_framed_transport.c \
+                              src/thrift/c_glib/transport/thrift_memory_buffer.c \
+                              src/thrift/c_glib/server/thrift_server.c \
+                              src/thrift/c_glib/server/thrift_simple_server.c
 
 libthrift_c_glib_la_CFLAGS = $(common_cflags)
 
 include_thriftdir = $(includedir)/thrift/c_glib
 include_thrift_HEADERS = \
                          $(top_builddir)/config.h \
-                         src/thrift/thrift.h \
-                         src/thrift/thrift_application_exception.h \
-                         src/thrift/thrift_struct.h
+                         src/thrift/c_glib/thrift.h \
+                         src/thrift/c_glib/thrift_application_exception.h \
+                         src/thrift/c_glib/thrift_struct.h
 
 include_protocoldir = $(include_thriftdir)/protocol
-include_protocol_HEADERS = src/thrift/protocol/thrift_protocol.h \
-                           src/thrift/protocol/thrift_protocol_factory.h \
-                           src/thrift/protocol/thrift_binary_protocol.h \
-                           src/thrift/protocol/thrift_binary_protocol_factory.h
+include_protocol_HEADERS = src/thrift/c_glib/protocol/thrift_protocol.h \
+                           src/thrift/c_glib/protocol/thrift_protocol_factory.h \
+                           src/thrift/c_glib/protocol/thrift_binary_protocol.h \
+                           src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
 
 include_transportdir = $(include_thriftdir)/transport
-include_transport_HEADERS = src/thrift/transport/thrift_buffered_transport.h \
-                            src/thrift/transport/thrift_framed_transport.h \
-                            src/thrift/transport/thrift_memory_buffer.h \
-                            src/thrift/transport/thrift_server_socket.h \
-                            src/thrift/transport/thrift_server_transport.h \
-                            src/thrift/transport/thrift_socket.h \
-                            src/thrift/transport/thrift_transport.h \
-                            src/thrift/transport/thrift_transport_factory.h
+include_transport_HEADERS = src/thrift/c_glib/transport/thrift_buffered_transport.h \
+                            src/thrift/c_glib/transport/thrift_framed_transport.h \
+                            src/thrift/c_glib/transport/thrift_memory_buffer.h \
+                            src/thrift/c_glib/transport/thrift_server_socket.h \
+                            src/thrift/c_glib/transport/thrift_server_transport.h \
+                            src/thrift/c_glib/transport/thrift_socket.h \
+                            src/thrift/c_glib/transport/thrift_transport.h \
+                            src/thrift/c_glib/transport/thrift_transport_factory.h
 
 include_serverdir = $(include_thriftdir)/server
-include_server_HEADERS = src/thrift/server/thrift_server.h \
-                         src/thrift/server/thrift_simple_server.h
+include_server_HEADERS = src/thrift/c_glib/server/thrift_server.h \
+                         src/thrift/c_glib/server/thrift_simple_server.h
 
 include_processordir = $(include_thriftdir)/processor
-include_processor_HEADERS = src/thrift/processor/thrift_processor.h
+include_processor_HEADERS = src/thrift/c_glib/processor/thrift_processor.h
 
 
 EXTRA_DIST = \
diff --git a/lib/c_glib/src/thrift/processor/thrift_processor.c b/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
similarity index 93%
rename from lib/c_glib/src/thrift/processor/thrift_processor.c
rename to lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
index a993a62..dac8783 100644
--- a/lib/c_glib/src/thrift/processor/thrift_processor.c
+++ b/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/processor/thrift_processor.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/processor/thrift_processor.h>
 
 G_DEFINE_ABSTRACT_TYPE(ThriftProcessor, thrift_processor, G_TYPE_OBJECT)
 
diff --git a/lib/c_glib/src/thrift/processor/thrift_processor.h b/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
similarity index 97%
rename from lib/c_glib/src/thrift/processor/thrift_processor.h
rename to lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
index 90af7e9..a96a555 100644
--- a/lib/c_glib/src/thrift/processor/thrift_processor.h
+++ b/lib/c_glib/src/thrift/c_glib/processor/thrift_processor.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
similarity index 99%
rename from lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
index 4e3ee1e..da59628 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <thrift/thrift.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
 
 G_DEFINE_TYPE(ThriftBinaryProtocol, thrift_binary_protocol, THRIFT_TYPE_PROTOCOL)
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
similarity index 95%
rename from lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
index 782d469..b9e6b19 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol.h
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
similarity index 91%
rename from lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
index 1e36b37..390c809 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.c
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol_factory.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
 
 G_DEFINE_TYPE(ThriftBinaryProtocolFactory, thrift_binary_protocol_factory, THRIFT_TYPE_PROTOCOL_FACTORY)
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
similarity index 97%
rename from lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
index 48e48f9..a4256b2 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_binary_protocol_factory.h
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/protocol/thrift_protocol_factory.h>
+#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_protocol.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
similarity index 99%
rename from lib/c_glib/src/thrift/protocol/thrift_protocol.c
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
index a322fef..d6315d8 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.c
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 /* define the GError domain string */
 #define THRIFT_PROTOCOL_ERROR_DOMAIN "thrift-protocol-error-quark"
diff --git a/lib/c_glib/src/thrift/protocol/thrift_protocol.h b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
similarity index 99%
rename from lib/c_glib/src/thrift/protocol/thrift_protocol.h
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
index 5dd562d..b47498b 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_protocol.h
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
similarity index 93%
rename from lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
index e4c7c12..bef4087 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/protocol/thrift_protocol_factory.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
 
 G_DEFINE_ABSTRACT_TYPE(ThriftProtocolFactory, thrift_protocol_factory, G_TYPE_OBJECT)
 
diff --git a/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
similarity index 95%
rename from lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h
rename to lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
index 5975e31..a9cd5f5 100644
--- a/lib/c_glib/src/thrift/protocol/thrift_protocol_factory.h
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_protocol_factory.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/server/thrift_server.c b/lib/c_glib/src/thrift/c_glib/server/thrift_server.c
similarity index 99%
rename from lib/c_glib/src/thrift/server/thrift_server.c
rename to lib/c_glib/src/thrift/c_glib/server/thrift_server.c
index cef5a01..0171cee 100644
--- a/lib/c_glib/src/thrift/server/thrift_server.c
+++ b/lib/c_glib/src/thrift/c_glib/server/thrift_server.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
+#include <thrift/c_glib/thrift.h>
 #include "thrift_server.h"
 
 /* object properties */
diff --git a/lib/c_glib/src/thrift/server/thrift_server.h b/lib/c_glib/src/thrift/c_glib/server/thrift_server.h
similarity index 91%
rename from lib/c_glib/src/thrift/server/thrift_server.h
rename to lib/c_glib/src/thrift/c_glib/server/thrift_server.h
index a091a20..a3aa94e 100644
--- a/lib/c_glib/src/thrift/server/thrift_server.h
+++ b/lib/c_glib/src/thrift/c_glib/server/thrift_server.h
@@ -22,10 +22,10 @@
 
 #include <glib-object.h>
 
-#include <thrift/processor/thrift_processor.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_transport_factory.h>
-#include <thrift/protocol/thrift_protocol_factory.h>
+#include <thrift/c_glib/processor/thrift_processor.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_transport_factory.h>
+#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/server/thrift_simple_server.c b/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
similarity index 93%
rename from lib/c_glib/src/thrift/server/thrift_simple_server.c
rename to lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
index c39a58d..7a39bc2 100644
--- a/lib/c_glib/src/thrift/server/thrift_simple_server.c
+++ b/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.c
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-#include <thrift/server/thrift_simple_server.h>
-#include <thrift/transport/thrift_transport_factory.h>
-#include <thrift/protocol/thrift_protocol_factory.h>
-#include <thrift/protocol/thrift_binary_protocol_factory.h>
+#include <thrift/c_glib/server/thrift_simple_server.h>
+#include <thrift/c_glib/transport/thrift_transport_factory.h>
+#include <thrift/c_glib/protocol/thrift_protocol_factory.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol_factory.h>
 
 G_DEFINE_TYPE(ThriftSimpleServer, thrift_simple_server, THRIFT_TYPE_SERVER)
 
diff --git a/lib/c_glib/src/thrift/server/thrift_simple_server.h b/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
similarity index 97%
rename from lib/c_glib/src/thrift/server/thrift_simple_server.h
rename to lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
index 3547982..d45dc21 100644
--- a/lib/c_glib/src/thrift/server/thrift_simple_server.h
+++ b/lib/c_glib/src/thrift/c_glib/server/thrift_simple_server.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/server/thrift_server.h>
+#include <thrift/c_glib/server/thrift_server.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/thrift.c b/lib/c_glib/src/thrift/c_glib/thrift.c
similarity index 96%
rename from lib/c_glib/src/thrift/thrift.c
rename to lib/c_glib/src/thrift/c_glib/thrift.c
index 34cadd4..0051df0 100644
--- a/lib/c_glib/src/thrift/thrift.c
+++ b/lib/c_glib/src/thrift/c_glib/thrift.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
+#include <thrift/c_glib/thrift.h>
 
 /**
  * GHashTable callback to add keys to a GList.
diff --git a/lib/c_glib/src/thrift/thrift.h b/lib/c_glib/src/thrift/c_glib/thrift.h
similarity index 100%
rename from lib/c_glib/src/thrift/thrift.h
rename to lib/c_glib/src/thrift/c_glib/thrift.h
diff --git a/lib/c_glib/src/thrift/thrift_application_exception.c b/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
similarity index 98%
rename from lib/c_glib/src/thrift/thrift_application_exception.c
rename to lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
index c10a95e..2b8b395 100644
--- a/lib/c_glib/src/thrift/thrift_application_exception.c
+++ b/lib/c_glib/src/thrift/c_glib/thrift_application_exception.c
@@ -18,7 +18,7 @@
  */
 
 #include "thrift_application_exception.h"
-#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
 
 G_DEFINE_TYPE(ThriftApplicationException, thrift_application_exception, THRIFT_TYPE_STRUCT)
 
diff --git a/lib/c_glib/src/thrift/thrift_application_exception.h b/lib/c_glib/src/thrift/c_glib/thrift_application_exception.h
similarity index 100%
rename from lib/c_glib/src/thrift/thrift_application_exception.h
rename to lib/c_glib/src/thrift/c_glib/thrift_application_exception.h
diff --git a/lib/c_glib/src/thrift/thrift_struct.c b/lib/c_glib/src/thrift/c_glib/thrift_struct.c
similarity index 97%
rename from lib/c_glib/src/thrift/thrift_struct.c
rename to lib/c_glib/src/thrift/c_glib/thrift_struct.c
index 233d622..f24f2a1 100644
--- a/lib/c_glib/src/thrift/thrift_struct.c
+++ b/lib/c_glib/src/thrift/c_glib/thrift_struct.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
+#include <thrift/c_glib/thrift.h>
 #include "thrift_struct.h"
 
 G_DEFINE_ABSTRACT_TYPE(ThriftStruct, thrift_struct, G_TYPE_OBJECT)
diff --git a/lib/c_glib/src/thrift/thrift_struct.h b/lib/c_glib/src/thrift/c_glib/thrift_struct.h
similarity index 97%
rename from lib/c_glib/src/thrift/thrift_struct.h
rename to lib/c_glib/src/thrift/c_glib/thrift_struct.h
index 7542c05..656cb54 100644
--- a/lib/c_glib/src/thrift/thrift_struct.h
+++ b/lib/c_glib/src/thrift/c_glib/thrift_struct.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
similarity index 98%
rename from lib/c_glib/src/thrift/transport/thrift_buffered_transport.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
index 1193b13..a32e5ad 100644
--- a/lib/c_glib/src/thrift/transport/thrift_buffered_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
@@ -24,9 +24,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_buffered_transport.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_buffered_transport.h>
 
 /* object properties */
 enum _ThriftBufferedTransportProperties
diff --git a/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_buffered_transport.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
index 5082cea..6abe10e 100644
--- a/lib/c_glib/src/thrift/transport/thrift_buffered_transport.h
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_framed_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
similarity index 98%
rename from lib/c_glib/src/thrift/transport/thrift_framed_transport.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
index ad4c2eb..a58b875 100644
--- a/lib/c_glib/src/thrift/transport/thrift_framed_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.c
@@ -26,9 +26,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_framed_transport.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_framed_transport.h>
 
 /* object properties */
 enum _ThriftFramedTransportProperties
diff --git a/lib/c_glib/src/thrift/transport/thrift_framed_transport.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_framed_transport.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
index da2e42e..055f4f0 100644
--- a/lib/c_glib/src/thrift/transport/thrift_framed_transport.h
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_framed_transport.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_memory_buffer.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
index b32d4a5..aa05e96 100644
--- a/lib/c_glib/src/thrift/transport/thrift_memory_buffer.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.c
@@ -24,9 +24,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_memory_buffer.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_memory_buffer.h>
 
 /* object properties */
 enum _ThriftMemoryBufferProperties
diff --git a/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_memory_buffer.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
index 8ee697e..7214d30 100644
--- a/lib/c_glib/src/thrift/transport/thrift_memory_buffer.h
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_memory_buffer.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_server_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
similarity index 96%
rename from lib/c_glib/src/thrift/transport/thrift_server_socket.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
index c7c6664..6ab7fde 100644
--- a/lib/c_glib/src/thrift/transport/thrift_server_socket.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
@@ -25,11 +25,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 /* object properties */
 enum _ThriftServerSocketProperties
diff --git a/lib/c_glib/src/thrift/transport/thrift_server_socket.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h
similarity index 100%
rename from lib/c_glib/src/thrift/transport/thrift_server_socket.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.h
diff --git a/lib/c_glib/src/thrift/transport/thrift_server_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
similarity index 93%
rename from lib/c_glib/src/thrift/transport/thrift_server_transport.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
index d0a46c3..c25d138 100644
--- a/lib/c_glib/src/thrift/transport/thrift_server_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.c
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_server_transport.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
 
 G_DEFINE_ABSTRACT_TYPE(ThriftServerTransport, thrift_server_transport, G_TYPE_OBJECT)
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_server_transport.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h
similarity index 100%
rename from lib/c_glib/src/thrift/transport/thrift_server_transport.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_server_transport.h
diff --git a/lib/c_glib/src/thrift/transport/thrift_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
similarity index 98%
rename from lib/c_glib/src/thrift/transport/thrift_socket.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
index 6584a93..694a84c 100644
--- a/lib/c_glib/src/thrift/transport/thrift_socket.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.c
@@ -25,9 +25,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
 
 /* object properties */
 enum _ThriftSocketProperties
diff --git a/lib/c_glib/src/thrift/transport/thrift_socket.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_socket.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
index dde269c..a130370 100644
--- a/lib/c_glib/src/thrift/transport/thrift_socket.h
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_socket.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
similarity index 97%
rename from lib/c_glib/src/thrift/transport/thrift_transport.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
index 890bcad..59d464c 100644
--- a/lib/c_glib/src/thrift/transport/thrift_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
 
 /* define the GError domain string */
 #define THRIFT_TRANSPORT_ERROR_DOMAIN "thrift-transport-error-quark"
diff --git a/lib/c_glib/src/thrift/transport/thrift_transport.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
similarity index 100%
rename from lib/c_glib/src/thrift/transport/thrift_transport.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
diff --git a/lib/c_glib/src/thrift/transport/thrift_transport_factory.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
similarity index 93%
rename from lib/c_glib/src/thrift/transport/thrift_transport_factory.c
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
index e1125a3..a2025cf 100644
--- a/lib/c_glib/src/thrift/transport/thrift_transport_factory.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <thrift/thrift.h>
-#include <thrift/transport/thrift_transport_factory.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/transport/thrift_transport_factory.h>
 
 G_DEFINE_TYPE(ThriftTransportFactory, thrift_transport_factory, G_TYPE_OBJECT)
 
diff --git a/lib/c_glib/src/thrift/transport/thrift_transport_factory.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h
similarity index 100%
rename from lib/c_glib/src/thrift/transport/thrift_transport_factory.h
rename to lib/c_glib/src/thrift/c_glib/transport/thrift_transport_factory.h
diff --git a/lib/c_glib/test/testbinaryprotocol.c b/lib/c_glib/test/testbinaryprotocol.c
old mode 100644
new mode 100755
index a07118f..f75c796
--- a/lib/c_glib/test/testbinaryprotocol.c
+++ b/lib/c_glib/test/testbinaryprotocol.c
@@ -24,9 +24,9 @@
 #include <netdb.h>
 #include <string.h>
 
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_BOOL TRUE
 #define TEST_BYTE 123
@@ -71,7 +71,7 @@
 
 #define thrift_transport_read my_thrift_transport_read
 #define thrift_transport_write my_thrift_transport_write
-#include "../src/thrift/protocol/thrift_binary_protocol.c"
+#include "../src/thrift/c_glib/protocol/thrift_binary_protocol.c"
 #undef thrift_transport_read
 #undef thrift_transport_write
 
diff --git a/lib/c_glib/test/testbufferedtransport.c b/lib/c_glib/test/testbufferedtransport.c
old mode 100644
new mode 100755
index d04343e..86b5314
--- a/lib/c_glib/test/testbufferedtransport.c
+++ b/lib/c_glib/test/testbufferedtransport.c
@@ -20,14 +20,14 @@
 #include <assert.h>
 #include <netdb.h>
 
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
 
-#include "../src/thrift/transport/thrift_buffered_transport.c"
+#include "../src/thrift/c_glib/transport/thrift_buffered_transport.c"
 
 static const char TEST_ADDRESS[] = "localhost";
 static const short TEST_PORT = 64444;
diff --git a/lib/c_glib/test/testframedtransport.c b/lib/c_glib/test/testframedtransport.c
old mode 100644
new mode 100755
index dcaabda..03c9f9b
--- a/lib/c_glib/test/testframedtransport.c
+++ b/lib/c_glib/test/testframedtransport.c
@@ -20,14 +20,14 @@
 #include <assert.h>
 #include <netdb.h>
 
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
 
-#include "../src/thrift/transport/thrift_framed_transport.c"
+#include "../src/thrift/c_glib/transport/thrift_framed_transport.c"
 
 static const char TEST_ADDRESS[] = "localhost";
 static const short TEST_PORT = 64444;
diff --git a/lib/c_glib/test/testmemorybuffer.c b/lib/c_glib/test/testmemorybuffer.c
old mode 100644
new mode 100755
index 9698185..7169a5c
--- a/lib/c_glib/test/testmemorybuffer.c
+++ b/lib/c_glib/test/testmemorybuffer.c
@@ -20,14 +20,14 @@
 #include <assert.h>
 #include <netdb.h>
 
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
 
-#include "../src/thrift/transport/thrift_memory_buffer.c"
+#include "../src/thrift/c_glib/transport/thrift_memory_buffer.c"
 
 /* test object creation and destruction */
 static void
diff --git a/lib/c_glib/test/testoptionalrequired.c b/lib/c_glib/test/testoptionalrequired.c
old mode 100644
new mode 100755
index 4f6fe15..2839dd4
--- a/lib/c_glib/test/testoptionalrequired.c
+++ b/lib/c_glib/test/testoptionalrequired.c
@@ -20,10 +20,10 @@
 #include <assert.h>
 #include <glib.h>
 
-#include <thrift/thrift_struct.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
-#include <thrift/transport/thrift_memory_buffer.h>
+#include <thrift/c_glib/thrift_struct.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/transport/thrift_memory_buffer.h>
 #include "gen-c_glib/t_test_optional_required_test_types.h"
 
 #include "gen-c_glib/t_test_optional_required_test_types.c"
diff --git a/lib/c_glib/test/testsimpleserver.c b/lib/c_glib/test/testsimpleserver.c
old mode 100644
new mode 100755
index 6f7d3a4..fca2dcd
--- a/lib/c_glib/test/testsimpleserver.c
+++ b/lib/c_glib/test/testsimpleserver.c
@@ -24,13 +24,13 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <thrift/thrift.h>
-#include <thrift/processor/thrift_processor.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/processor/thrift_processor.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_PORT 51199
 
-#include <thrift/server/thrift_simple_server.c>
+#include <thrift/c_glib/server/thrift_simple_server.c>
 
 /* create a rudimentary processor */
 #define TEST_PROCESSOR_TYPE (test_processor_get_type ())
diff --git a/lib/c_glib/test/teststruct.c b/lib/c_glib/test/teststruct.c
old mode 100644
new mode 100755
index 50b10dc..182a6ac
--- a/lib/c_glib/test/teststruct.c
+++ b/lib/c_glib/test/teststruct.c
@@ -20,7 +20,7 @@
 #include <assert.h>
 #include <glib-object.h>
 
-#include "../src/thrift/thrift_struct.c"
+#include "../src/thrift/c_glib/thrift_struct.c"
 
 /* tests to ensure we can extend a ThriftStruct */
 
diff --git a/lib/c_glib/test/testthrifttest.c b/lib/c_glib/test/testthrifttest.c
old mode 100644
new mode 100755
index 806166e..a42d089
--- a/lib/c_glib/test/testthrifttest.c
+++ b/lib/c_glib/test/testthrifttest.c
@@ -1,8 +1,8 @@
 #include <assert.h>
 #include <netdb.h>
 
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 static const char TEST_ADDRESS[] = "localhost";
 static const int TEST_PORT = 64444;
diff --git a/lib/c_glib/test/testthrifttestclient.cpp b/lib/c_glib/test/testthrifttestclient.cpp
old mode 100644
new mode 100755
index 5d40331..48ece70
--- a/lib/c_glib/test/testthrifttestclient.cpp
+++ b/lib/c_glib/test/testthrifttestclient.cpp
@@ -314,9 +314,9 @@
 
 #include "t_test_thrift_test.h"
 #include "t_test_thrift_test_types.h"
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
 
 static void
 test_thrift_client (void)
diff --git a/lib/c_glib/test/testtransportsocket.c b/lib/c_glib/test/testtransportsocket.c
old mode 100644
new mode 100755
index 41e0ea4..836ddd0
--- a/lib/c_glib/test/testtransportsocket.c
+++ b/lib/c_glib/test/testtransportsocket.c
@@ -20,9 +20,9 @@
 #include <assert.h>
 #include <netdb.h>
 
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
 
 #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
 
@@ -63,7 +63,7 @@
 #define socket my_socket
 #define recv my_recv
 #define send my_send
-#include "../src/thrift/transport/thrift_socket.c"
+#include "../src/thrift/c_glib/transport/thrift_socket.c"
 #undef socket
 #undef recv
 #undef send
diff --git a/lib/c_glib/thrift_c_glib.pc.in b/lib/c_glib/thrift_c_glib.pc.in
index 1377203..3921d05 100644
--- a/lib/c_glib/thrift_c_glib.pc.in
+++ b/lib/c_glib/thrift_c_glib.pc.in
@@ -27,4 +27,4 @@
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0
 Libs: -L${libdir} -lthrift_c_glib
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}/thrift/c_glib