9 files changed, 55 insertions, 8 deletions
diff --git a/bindings/intrinsics/afb-dbus-binding.c b/bindings/intrinsics/afb-dbus-binding.c
index 4eab2eb2..7a1bec54 100644
--- a/bindings/intrinsics/afb-dbus-binding.c
+++ b/bindings/intrinsics/afb-dbus-binding.c
@@ -23,6 +23,7 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-bus-protocol.h>
 
+#define AFB_BINDING_VERSION 1
 #include <afb/afb-binding.h>
 
 /*
diff --git a/bindings/samples/AuthLogin.c b/bindings/samples/AuthLogin.c
index 62205176..298834f2 100644
--- a/bindings/samples/AuthLogin.c
+++ b/bindings/samples/AuthLogin.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 1
 #include <afb/afb-binding.h>
 
 // Dummy sample of Client Application Context
diff --git a/bindings/samples/DemoContext.c b/bindings/samples/DemoContext.c
index 26677949..a2fec750 100644
--- a/bindings/samples/DemoContext.c
+++ b/bindings/samples/DemoContext.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 1
 #include <afb/afb-binding.h>
 
 typedef struct {
diff --git a/bindings/samples/DemoPost.c b/bindings/samples/DemoPost.c
index bed5d444..c5d6ff7f 100644
--- a/bindings/samples/DemoPost.c
+++ b/bindings/samples/DemoPost.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 1
 #include <afb/afb-binding.h>
 
 
diff --git a/bindings/samples/tic-tac-toe.c b/bindings/samples/tic-tac-toe.c
index fb5eb926..ee76bca0 100644
--- a/bindings/samples/tic-tac-toe.c
+++ b/bindings/samples/tic-tac-toe.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <json-c/json.h>
 
+#define AFB_BINDING_VERSION 1
 #include <afb/afb-binding.h>
 
 /*
diff --git a/include/afb/afb-binding.h b/include/afb/afb-binding.h
index b1830184..82f702ec 100644
--- a/include/afb/afb-binding.h
+++ b/include/afb/afb-binding.h
@@ -26,18 +26,33 @@
  *
  * Functions of bindings of afb-daemon are accessible by authorized clients
  * through the apis module of afb-daemon.
- *
- * A binding is a shared library. This shared library must have at least one
- * exported symbol for being registered in afb-daemon.
- *
  */
 
 #define AFB_BINDING_LOWER_VERSION     1
 #define AFB_BINDING_UPPER_VERSION     2
-#define AFB_BINDING_DEFAULT_VERSION   1
 
 #ifndef AFB_BINDING_VERSION
-#define AFB_BINDING_VERSION   AFB_BINDING_DEFAULT_VERSION
+#define AFB_BINDING_VERSION   1
+#pragma GCC warning "\
+\n\
+\n\
+  AFB_BINDING_VERSION should be defined before including <afb/afb-binding.h>\n\
+  AFB_BINDING_VERSION defines the version of binding that you use.\n\
+  Currently, known versions are 1 or 2.\n\
+  Setting now AFB_BINDING_VERSION to 1 (version 1 by default)\n\
+  NOTE THAT VERSION 2 IS NOW RECOMMENDED!\n\
+  Consider to add one of the following define before including <afb/afb-binding.h>:\n\
+\n\
+    #define AFB_BINDING_VERSION 1\n\
+    #define AFB_BINDING_VERSION 2\n\
+\n\
+  Note that in some case it will enforce you to include <stdio.h>\n\
+"
+#include <stdio.h> /* old version side effect */
+#else
+#  if AFB_BINDING_VERSION == 1
+#    pragma GCC warning "Using binding version 1, consider to switch to version 2"
+#  endif
 #endif
 
 #if AFB_BINDING_VERSION != 0
diff --git a/include/afb/afb-service-itf.h b/include/afb/afb-service-itf.h
new file mode 100644
index 00000000..490d77e7
--- /dev/null
+++ b/include/afb/afb-service-itf.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#pragma GCC warning "\n\n\
+    This header file <afb/afb-service-itf.h> is OBSOLETE.\n\
+    It is provided for COMPATIBILITY ONLY.\n\n\
+    Please USE <afb/afb-binding.h> and ADAPT YOUR CODE to new names.\n"
+
+#include "afb-binding.h"
+
diff --git a/src/afb-config.c b/src/afb-config.c
index ebacee99..dc3388e4 100644
--- a/src/afb-config.c
+++ b/src/afb-config.c
@@ -31,7 +31,7 @@
 #include "afb-config.h"
 #include "afb-hook.h"
 
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
 
 #if !defined(BINDING_INSTALL_DIR)
 #error "you should define BINDING_INSTALL_DIR"
diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 61ba4fd9..ba533c90 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 
 #include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
 
 #include "afb-context.h"
 #include "afb-xreq.h"