Include external headers with #include <foo.h>

I find it more readable to include headers from outside the sssd tree
with <foo.h>, not "foo.h". The latter should be used for in-tree headers
only.

21 files changed, 66 insertions, 50 deletions

diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h
index d1587cd4a..38e855656 100644
--- a/src/confdb/confdb.h
+++ b/src/confdb/confdb.h
@@ -23,10 +23,11 @@
 #define _CONF_DB_H
 
 #include <stdbool.h>
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "ldb_errors.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <ldb_errors.h>
+
 #include "config.h"
 
 /**
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 3d8ba2628..7d8a150c2 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -34,19 +34,19 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <popt.h>
+#include <tevent.h>
+#include <dbus/dbus.h>
 
 /* Needed for res_init() */
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
 
-#include "popt.h"
-#include "tevent.h"
 #include "confdb/confdb.h"
 #include "confdb/confdb_setup.h"
 #include "db/sysdb.h"
 #include "monitor/monitor.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "monitor/monitor_interfaces.h"
 #include "responder/common/responder_sbus.h"
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index d086d5d2f..55891c9f2 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -32,12 +32,13 @@
 #include <sys/types.h>
 #include <keyutils.h>
 #endif
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sbus_client.h"
 #include "sss_client/sss_cli.h"
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index 6b58d88ab..e7037d8de 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -30,15 +30,15 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
 #include "db/sysdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/dp_backend.h"
 #include "providers/fail_over.h"
diff --git a/src/providers/dp_sbus.c b/src/providers/dp_sbus.c
index f9dd28216..623d7dd9c 100644
--- a/src/providers/dp_sbus.c
+++ b/src/providers/dp_sbus.c
@@ -20,8 +20,9 @@
 */
 
 #include "config.h"
-#include "talloc.h"
-#include "tevent.h"
+#include <talloc.h>
+#include <tevent.h>
+
 #include "confdb/confdb.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/data_provider.h"
diff --git a/src/providers/proxy/proxy_child.c b/src/providers/proxy/proxy_child.c
index 66afcfb64..00fd38c96 100644
--- a/src/providers/proxy/proxy_child.c
+++ b/src/providers/proxy/proxy_child.c
@@ -34,14 +34,14 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/proxy/proxy.h"
 
diff --git a/src/responder/common/responder.h b/src/responder/common/responder.h
index 5331d5b75..fad16eb89 100644
--- a/src/responder/common/responder.h
+++ b/src/responder/common/responder.h
@@ -22,15 +22,17 @@
 #ifndef __SSS_RESPONDER_H__
 #define __SSS_RESPONDER_H__
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/un.h>
 #include <pcre.h>
 #include <sys/resource.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dhash.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dhash.h>
+
 #include "sbus/sssd_dbus.h"
 #include "sss_client/sss_cli.h"
 
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 908031a0d..8a9188707 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -32,11 +32,12 @@
 #include <sys/time.h>
 #include <errno.h>
 #include <popt.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "util/strtonum.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder.h"
 #include "responder/common/responder_packet.h"
diff --git a/src/responder/common/responder_packet.c b/src/responder/common/responder_packet.c
index 6476bd6e5..ecee206b4 100644
--- a/src/responder/common/responder_packet.c
+++ b/src/responder/common/responder_packet.c
@@ -23,7 +23,8 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
-#include "talloc.h"
+#include <talloc.h>
+
 #include "util/util.h"
 #include "responder/common/responder_packet.h"
 
diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
index a6e6d77f7..0baa80845 100644
--- a/src/responder/nss/nsssrv.c
+++ b/src/responder/nss/nsssrv.c
@@ -29,8 +29,9 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "responder/nss/nsssrv.h"
 #include "responder/nss/nsssrv_private.h"
@@ -39,7 +40,6 @@
 #include "responder/common/negcache.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/nss/nsssrv.h b/src/responder/nss/nsssrv.h
index b279f8a76..2153d014f 100644
--- a/src/responder/nss/nsssrv.h
+++ b/src/responder/nss/nsssrv.h
@@ -22,13 +22,15 @@
 #ifndef __NSSSRV_H__
 #define __NSSSRV_H__
 
+#include "config.h"
+
 #include <stdint.h>
 #include <sys/un.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dbus/dbus.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pac/pacsrv.c b/src/responder/pac/pacsrv.c
index a06d768bb..7a736adae 100644
--- a/src/responder/pac/pacsrv.c
+++ b/src/responder/pac/pacsrv.c
@@ -29,13 +29,13 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "responder/pac/pacsrv.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pac/pacsrv.h b/src/responder/pac/pacsrv.h
index f90b40c67..bda95eb0f 100644
--- a/src/responder/pac/pacsrv.h
+++ b/src/responder/pac/pacsrv.h
@@ -21,6 +21,9 @@
 
 #ifndef __PACSRV_H__
 #define __PACSRV_H__
+
+#include "config.h"
+
 #include <stdbool.h>
 #include <util/data_blob.h>
 #include <ndr.h>
@@ -29,11 +32,11 @@
 
 #include <stdint.h>
 #include <sys/un.h>
-#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
-#include "dbus/dbus.h"
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
+#include <dbus/dbus.h>
+
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "responder/common/responder.h"
diff --git a/src/responder/pam/pamsrv.c b/src/responder/pam/pamsrv.c
index fad564a04..2e6afd087 100644
--- a/src/responder/pam/pamsrv.c
+++ b/src/responder/pam/pamsrv.c
@@ -30,12 +30,12 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <popt.h>
+#include <dbus/dbus.h>
 
-#include "popt.h"
 #include "util/util.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "responder/common/responder_packet.h"
 #include "providers/data_provider.h"
diff --git a/src/sbus/sbus_client.c b/src/sbus/sbus_client.c
index a06b28d2b..992b2a25c 100644
--- a/src/sbus/sbus_client.c
+++ b/src/sbus/sbus_client.c
@@ -19,8 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <talloc.h>
+
 #include "util/util.h"
-#include "talloc.h"
 #include "sbus_client.h"
 
 int sbus_client_init(TALLOC_CTX *mem_ctx,
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index 49b09331e..7604797c1 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -24,7 +24,7 @@
 
 struct sbus_connection;
 
-#include "dbus/dbus.h"
+#include <dbus/dbus.h>
 
 typedef int (*sbus_msg_handler_fn)(DBusMessage *, struct sbus_connection *);
 
diff --git a/src/sbus/sssd_dbus_common.c b/src/sbus/sssd_dbus_common.c
index d16a763ae..baf74ec54 100644
--- a/src/sbus/sssd_dbus_common.c
+++ b/src/sbus/sssd_dbus_common.c
@@ -20,8 +20,9 @@
 */
 
 #include <sys/time.h>
-#include "tevent.h"
-#include "dbus/dbus.h"
+#include <tevent.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
diff --git a/src/sbus/sssd_dbus_connection.c b/src/sbus/sssd_dbus_connection.c
index ccea88e6d..c96a8f4c2 100644
--- a/src/sbus/sssd_dbus_connection.c
+++ b/src/sbus/sssd_dbus_connection.c
@@ -20,8 +20,9 @@
 */
 
 #include <sys/time.h>
+#include <dbus/dbus.h>
+
 #include "util/util.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
 
diff --git a/src/sbus/sssd_dbus_server.c b/src/sbus/sssd_dbus_server.c
index 3ada25b61..597118973 100644
--- a/src/sbus/sssd_dbus_server.c
+++ b/src/sbus/sssd_dbus_server.c
@@ -21,10 +21,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <tevent.h>
+#include <dbus/dbus.h>
 
-#include "tevent.h"
 #include "util/util.h"
-#include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_private.h"
 
diff --git a/src/util/memory.c b/src/util/memory.c
index a2c8b54b8..672129ee5 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -18,7 +18,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "talloc.h"
+#include <talloc.h>
+
 #include "util/util.h"
 
 /*
diff --git a/src/util/util.c b/src/util/util.c
index 9ab154db3..5931549f4 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -23,11 +23,11 @@
 #include <poll.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <talloc.h>
+#include <dhash.h>
 
-#include "talloc.h"
 #include "util/util.h"
 #include "util/sss_utf8.h"
-#include "dhash.h"
 
 int split_on_separator(TALLOC_CTX *mem_ctx, const char *str,
                        const char sep, bool trim, bool skip_empty,