gcoap: Remove coap.h include file, which is no longer used.

Also change references in dependencies to the net/gcoap.h include.

examples/gcoap/gcoap_cli.c

@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
 #include "od.h"
 #include "fmt.h"
 

examples/gcoap/main.c

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include "msg.h"
 
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
 #include "kernel_types.h"
 #include "shell.h"
 

sys/auto_init/auto_init.c

@@ -89,7 +89,7 @@
 #endif
 
 #ifdef MODULE_GCOAP
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
 #endif
 
 #define ENABLE_DEBUG (0)

sys/include/net/gnrc/coap.h

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Ken Bannister. All rights reserved.
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @ingroup     net_gcoap
- * @brief       Adapter for migration of GNRC-based gcoap to sock-based gcoap
- * @deprecated  Use net/gcoap.h instead.
- *
- * @{
- *
- * @file
- *
- * @author      Ken Bannister <kb2ma@runbox.com>
- */
-
-#include "net/gcoap.h"
-
-/** @} */

tests/unittests/tests-gcoap/tests-gcoap.c

@@ -17,7 +17,7 @@
 
 #include "embUnit.h"
 
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
 
 #include "unittests-constants.h"
 #include "tests-gcoap.h"