11 files changed, 35 insertions, 113 deletions
diff --git a/include/afb/afb-binding-v1.h b/include/afb/afb-binding-v1.h
index bafb8761..79254cd8 100644
--- a/include/afb/afb-binding-v1.h
+++ b/include/afb/afb-binding-v1.h
@@ -21,8 +21,8 @@ struct json_object;
 
 #include "afb-req.h"
 #include "afb-event.h"
-#include "afb-service-common.h"
-#include "afb-daemon-common.h"
+#include "afb-service-itf.h"
+#include "afb-daemon-itf.h"
 
 #include "afb-req-v1.h"
 #include "afb-session-v1.h"
diff --git a/include/afb/afb-binding-v2.h b/include/afb/afb-binding-v2.h
index 621ddce6..e0ade91a 100644
--- a/include/afb/afb-binding-v2.h
+++ b/include/afb/afb-binding-v2.h
@@ -22,8 +22,8 @@
 #include "afb-auth.h"
 #include "afb-event.h"
 #include "afb-req.h"
-#include "afb-service-common.h"
-#include "afb-daemon-common.h"
+#include "afb-service-itf.h"
+#include "afb-daemon-itf.h"
 
 #include "afb-req-v2.h"
 #include "afb-session-v2.h"
diff --git a/include/afb/afb-daemon-common.h b/include/afb/afb-daemon-itf.h
index b78f9af9..b78f9af9 100644
--- a/include/afb/afb-daemon-common.h
+++ b/include/afb/afb-daemon-itf.h
diff --git a/include/afb/afb-daemon-v1.h b/include/afb/afb-daemon-v1.h
index 9ac4f916..d1a0cc2a 100644
--- a/include/afb/afb-daemon-v1.h
+++ b/include/afb/afb-daemon-v1.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "afb-daemon-common.h"
+#include "afb-daemon-itf.h"
 
 /*
  * Retrieves the common systemd's event loop of AFB
diff --git a/include/afb/afb-daemon-v2.h b/include/afb/afb-daemon-v2.h
index 186fc6d6..1ea40e96 100644
--- a/include/afb/afb-daemon-v2.h
+++ b/include/afb/afb-daemon-v2.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "afb-daemon-common.h"
+#include "afb-daemon-itf.h"
 
 /*
  * Retrieves the common systemd's event loop of AFB
diff --git a/include/afb/afb-event-itf.h b/include/afb/afb-event-itf.h
deleted file mode 100644
index 8f2bfc78..00000000
--- a/include/afb/afb-event-itf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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-event-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/include/afb/afb-req-itf.h b/include/afb/afb-req-itf.h
deleted file mode 100644
index bf044f1c..00000000
--- a/include/afb/afb-req-itf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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-req-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/include/afb/afb-service-common.h b/include/afb/afb-service-common.h
deleted file mode 100644
index 081b1db6..00000000
--- a/include/afb/afb-service-common.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
-
-/* avoid inclusion of <json-c/json.h> */
-struct json_object;
-
-/*
- * Interface for internal of services
- * It records the functions to be called for the request.
- * Don't use this structure directly.
- * Use the helper functions documented below.
- */
-struct afb_service_itf
-{
-	/* CAUTION: respect the order, add at the end */
-
-	void (*call)(void *closure, const char *api, const char *verb, struct json_object *args,
-	             void (*callback)(void*, int, struct json_object*), void *callback_closure);
-
-	int (*call_sync)(void *closure, const char *api, const char *verb, struct json_object *args,
-	                 struct json_object **result);
-};
-
-/*
- * Object that encapsulate accesses to service items
- */
-struct afb_service
-{
-	const struct afb_service_itf *itf;
-	void *closure;
-};
-
diff --git a/include/afb/afb-service-itf.h b/include/afb/afb-service-itf.h
index 490d77e7..081b1db6 100644
--- a/include/afb/afb-service-itf.h
+++ b/include/afb/afb-service-itf.h
@@ -17,10 +17,32 @@
 
 #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"
+/* avoid inclusion of <json-c/json.h> */
+struct json_object;
 
-#include "afb-binding.h"
+/*
+ * Interface for internal of services
+ * It records the functions to be called for the request.
+ * Don't use this structure directly.
+ * Use the helper functions documented below.
+ */
+struct afb_service_itf
+{
+	/* CAUTION: respect the order, add at the end */
+
+	void (*call)(void *closure, const char *api, const char *verb, struct json_object *args,
+	             void (*callback)(void*, int, struct json_object*), void *callback_closure);
+
+	int (*call_sync)(void *closure, const char *api, const char *verb, struct json_object *args,
+	                 struct json_object **result);
+};
+
+/*
+ * Object that encapsulate accesses to service items
+ */
+struct afb_service
+{
+	const struct afb_service_itf *itf;
+	void *closure;
+};
 
diff --git a/include/afb/afb-service-v1.h b/include/afb/afb-service-v1.h
index db798382..61a01e28 100644
--- a/include/afb/afb-service-v1.h
+++ b/include/afb/afb-service-v1.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "afb-service-common.h"
+#include "afb-service-itf.h"
 
 /**
  * Calls the 'verb' of the 'api' with the arguments 'args' and 'verb' in the name of the binding.
diff --git a/include/afb/afb-service-v2.h b/include/afb/afb-service-v2.h
index 08974c9d..75a262be 100644
--- a/include/afb/afb-service-v2.h
+++ b/include/afb/afb-service-v2.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "afb-service-common.h"
+#include "afb-service-itf.h"
 
 /**
  * Calls the 'verb' of the 'api' with the arguments 'args' and 'verb' in the name of the binding.