For capchild headers, include <capchild/XXX.h>.

Change-Id: I780c69ee637dcd9846756a2e2d6a35baf02d826d
Reviewed-on: https://code.wireshark.org/review/2594
Reviewed-by: Guy Harris <guy@alum.mit.edu>

capchild/capture_ifinfo.c

@@ -48,10 +48,10 @@
 
 #include "capture_opts.h"
 #include "capture_session.h"
-#include "capture_sync.h"
+#include <capchild/capture_sync.h>
 #include "log.h"
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 
 #ifdef HAVE_PCAP_REMOTE
 static GList *remote_interface_list = NULL;

capchild/capture_sync.c

@@ -85,7 +85,7 @@
 #include "file.h"
 
 #include "capture.h"
-#include "capture_sync.h"
+#include <capchild/capture_sync.h>
 
 #include "sync_pipe.h"
 

capture-pcap-util-unix.c

@@ -64,7 +64,7 @@ struct rtentry;
 
 #endif  /* HAVE_PCAP_FINDALLDEVS */
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
 

capture-pcap-util.c

@@ -42,7 +42,7 @@
 #include <wtap.h>
 #include <libpcap.h>
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
 

capture-wpcap.c

@@ -30,7 +30,7 @@
 
 #include <epan/strutil.h>
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #include "capture-pcap-util-int.h"
 #include "capture-wpcap.h"

capture.c

@@ -38,8 +38,8 @@
 #include <epan/dfilter/dfilter.h>
 #include "file.h"
 #include "capture.h"
-#include "capture_ifinfo.h"
-#include "capture_sync.h"
+#include <capchild/capture_ifinfo.h>
+#include <capchild/capture_sync.h>
 #include "capture_info.h"
 #include "capture_ui_utils.h"
 #include "ui/util.h"

capture_opts.c

@@ -45,7 +45,7 @@
 #include "clopts_common.h"
 #include "cmdarg_err.h"
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #include <wsutil/file_util.h>
 

capture_ui_utils.c

@@ -32,7 +32,7 @@
 
 #include "epan/prefs.h"
 #include "epan/ex-opt.h"
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture_ui_utils.h"
 #include "wiretap/wtap.h"
 #include "epan/to_str.h"

capture_win_ifnames.c

@@ -47,7 +47,7 @@
 
 #include "log.h"
 
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture_win_ifnames.h"
 #include "wsutil/file_util.h"
 

dumpcap.c

@@ -119,8 +119,8 @@
 
 #include "capture_opts.h"
 #include "capture_session.h"
-#include "capture_ifinfo.h"
-#include "capture_sync.h"
+#include <capchild/capture_ifinfo.h>
+#include <capchild/capture_sync.h>
 
 #include "conditions.h"
 #include "capture_stop_conditions.h"

echld/echld-int.h

@@ -62,8 +62,8 @@
 
 #include "capture_opts.h"
 #include "capture_session.h"
-#include "capture_ifinfo.h"
-#include "capture_sync.h"
+#include <capchild/capture_ifinfo.h>
+#include <capchild/capture_sync.h>
 #include "version_info.h"
 #include "cfile.h"
 #include "wsutil/crash_info.h"

tshark.c

@@ -102,14 +102,14 @@
 
 #ifdef HAVE_LIBPCAP
 #include "capture_ui_utils.h"
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture-pcap-util.h"
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
 #include "capture_session.h"
-#include "capture_sync.h"
+#include <capchild/capture_sync.h>
 #include "capture_opts.h"
 #endif /* HAVE_LIBPCAP */
 #include "log.h"

ui/gtk/capture_if_dlg.h

@@ -44,7 +44,7 @@ capture_if_cb(GtkWidget *widget, gpointer data);
 
 #ifdef HAVE_LIBPCAP
 
-#include "capture_ifinfo.h"	/* for if_info_t */
+#include <capchild/capture_ifinfo.h>	/* for if_info_t */
 
 /*
  * Used to retrieve the interface icon

ui/gtk/main.c

@@ -132,9 +132,9 @@
 #ifdef HAVE_LIBPCAP
 #include "capture_ui_utils.h"
 #include "capture-pcap-util.h"
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture.h"
-#include "capture_sync.h"
+#include <capchild/capture_sync.h>
 #endif
 
 #ifdef _WIN32

ui/gtk/prefs_capture.c

@@ -30,7 +30,7 @@
 #include <epan/prefs.h>
 
 #include "capture_opts.h"
-#include "capture_ifinfo.h"
+#include <capchild/capture_ifinfo.h>
 #include "capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"

ui/qt/main.cpp

@@ -105,9 +105,9 @@
 #ifdef HAVE_LIBPCAP
 #  include "capture_ui_utils.h"
 #  include "capture-pcap-util.h"
-#  include "capture_ifinfo.h"
+#  include <capchild/capture_ifinfo.h>
 #  include "capture.h"
-#  include "capture_sync.h"
+#  include <capchild/capture_sync.h>
 #endif
 
 #ifdef _WIN32