diff --git a/c/zmq.h b/bindings/c/zmq.h
similarity index 100%
rename from c/zmq.h
rename to bindings/c/zmq.h
diff --git a/cpp/zmq.hpp b/bindings/cpp/zmq.hpp
similarity index 100%
rename from cpp/zmq.hpp
rename to bindings/cpp/zmq.hpp
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 966f77dd..c9e430cf 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -22,7 +22,7 @@ libjzmq_la_SOURCES = \
     org_zmq_Socket.h
 
 libjzmq_la_CXXFLAGS = -I$(top_srcdir)/src/libzmq \
-@JAVA_INCLUDE@ -I$(top_srcdir)/c -Wall
+@JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall
 libjzmq_la_LDFLAGS = -version-info @JLTVER@
 libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
 
diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am
index 892b7fe8..ff51d888 100644
--- a/devices/zmq_forwarder/Makefile.am
+++ b/devices/zmq_forwarder/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp
+INCLUDES = -I$(top_builddir)/bindings/c
 
 bin_PROGRAMS = zmq_forwarder
 
diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp
index 8acbc85c..32af5dd6 100644
--- a/devices/zmq_forwarder/zmq_forwarder.cpp
+++ b/devices/zmq_forwarder/zmq_forwarder.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../../cpp/zmq.hpp"
+#include "../../bindings/cpp/zmq.hpp"
 #include "../../foreign/xmlParser/xmlParser.cpp"
 
 int main (int argc, char *argv [])
diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am
index 430a9f29..e23816ba 100644
--- a/perf/c/Makefile.am
+++ b/perf/c/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/c
+INCLUDES = -I$(top_builddir)/bindings/c
 
 noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
 
diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am
index 1ea01a08..65ffe684 100644
--- a/perf/cpp/Makefile.am
+++ b/perf/cpp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/cpp -I$(top_srcdir)/c
+INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
 
 noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
 
diff --git a/perf/java/Makefile.am b/perf/java/Makefile.am
index 6552e802..4f370b80 100644
--- a/perf/java/Makefile.am
+++ b/perf/java/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-classpath $(top_builddir)/java 
+AM_JAVACFLAGS=-classpath $(top_builddir)/bindings/java 
 
 dist_noinst_JAVA = local_lat.java remote_lat.java local_thr.java \
 remote_thr.java
diff --git a/src/Makefile.am b/src/Makefile.am
index 398c8612..27012376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,14 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libzmq.pc
 
 if BUILD_CPP
-include_HEADERS = ../cpp/zmq.hpp ../c/zmq.h
+include_HEADERS = ../bindings/cpp/zmq.hpp ../bindings/c/zmq.h
 endif
 
 if BUILD_C
 if BUILD_CPP
 
 else
-include_HEADERS = ../c/zmq.h
+include_HEADERS = ../bindings/c/zmq.h
 endif
 endif
 
diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index feaa4d65..f523f403 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "platform.hpp"
 
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 6ac9fa24..4c4ec803 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "dispatcher.hpp"
 #include "app_thread.hpp"
diff --git a/src/i_inout.hpp b/src/i_inout.hpp
index 4664b13b..6be61691 100644
--- a/src/i_inout.hpp
+++ b/src/i_inout.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_I_INOUT_HPP_INCLUDED__
 #define __ZMQ_I_INOUT_HPP_INCLUDED__
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 namespace zmq
 {
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index d5de4973..afac11cd 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "io_thread.hpp"
 #include "command.hpp"
diff --git a/src/msg_content.hpp b/src/msg_content.hpp
index 6c91966f..22dd915b 100644
--- a/src/msg_content.hpp
+++ b/src/msg_content.hpp
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "atomic_counter.hpp"
 
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 6e590df2..f4cf0c4a 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "pipe.hpp"
 
diff --git a/src/pipe.hpp b/src/pipe.hpp
index 81316e4d..ede73b8e 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_PIPE_HPP_INCLUDED__
 #define __ZMQ_PIPE_HPP_INCLUDED__
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "stdint.hpp"
 #include "i_endpoint.hpp"
diff --git a/src/pub.cpp b/src/pub.cpp
index 5c6e3297..ca8afaeb 100644
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "pub.hpp"
 #include "err.hpp"
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 570be9e8..9806465c 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <algorithm>
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "socket_base.hpp"
 #include "app_thread.hpp"
diff --git a/src/sub.cpp b/src/sub.cpp
index 101c62f4..515a843b 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "sub.hpp"
 #include "err.hpp"
diff --git a/src/zmq.cpp b/src/zmq.cpp
index c9664487..c567b098 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp
index 16b53129..59c8671f 100644
--- a/src/zmq_decoder.hpp
+++ b/src/zmq_decoder.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
 #define __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "decoder.hpp"
 
diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp
index 55826a55..102c4348 100644
--- a/src/zmq_encoder.hpp
+++ b/src/zmq_encoder.hpp
@@ -20,7 +20,7 @@
 #ifndef __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
 #define __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "encoder.hpp"