Use abrtlib.h instead of component header files

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 6 insertions, 22 deletions

diff --git a/lib/utils/Makefile.am b/lib/utils/Makefile.am
index 6d46a05a..2e279743 100644
--- a/lib/utils/Makefile.am
+++ b/lib/utils/Makefile.am
@@ -14,8 +14,8 @@ libABRTUtils_la_SOURCES = \
     concat_path_file.c \
     append_to_malloced_string.c \
     encbase64.c \
-    read_write.c read_write.h \
-    logging.c logging.h \
+    read_write.c \
+    logging.c \
     copyfd.c \
     daemon.c \
     skip_whitespace.c \
diff --git a/lib/utils/abrt_packages.c b/lib/utils/abrt_packages.c
index 0e409a31..a64897fb 100644
--- a/lib/utils/abrt_packages.c
+++ b/lib/utils/abrt_packages.c
@@ -16,10 +16,8 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-
+#include "abrtlib.h"
 #include "abrt_packages.h"
-#include "logging.h"
-#include "xfuncs.h"
 
 /* cuts the name from the NVR format: foo-1.2.3-1.el6
    returns a newly allocated string
diff --git a/lib/utils/copyfd.c b/lib/utils/copyfd.c
index 1e6e43b8..bfe0fa49 100644
--- a/lib/utils/copyfd.c
+++ b/lib/utils/copyfd.c
@@ -21,9 +21,7 @@
  * Utility routines.
  *
  */
-
 #include "abrtlib.h"
-#include "read_write.h"
 
 #define CONFIG_FEATURE_COPYBUF_KB 4
 
diff --git a/lib/utils/logging.c b/lib/utils/logging.c
index 1cdb0453..b552fa8a 100644
--- a/lib/utils/logging.c
+++ b/lib/utils/logging.c
@@ -21,10 +21,7 @@
  * Utility routines.
  *
  */
-
-#include "logging.h"
-#include "read_write.h"
-#include "xfuncs.h"
+#include "abrtlib.h"
 
 void (*g_custom_logger)(const char*);
 const char *msg_prefix = "";
diff --git a/lib/utils/read_write.c b/lib/utils/read_write.c
index 1a3e589d..9d7f0135 100644
--- a/lib/utils/read_write.c
+++ b/lib/utils/read_write.c
@@ -3,9 +3,7 @@
  *
  * Licensed under GPLv2 or later, see file COPYING in this tarball for details.
  */
-
-#include "read_write.h"
-#include "logging.h"
+#include "abrtlib.h"
 
 /* Die with an error message if we can't read the entire buffer. */
 void xread(int fd, void *buf, size_t count)
diff --git a/lib/utils/xfuncs.c b/lib/utils/xfuncs.c
index 02ad9fd8..71796371 100644
--- a/lib/utils/xfuncs.c
+++ b/lib/utils/xfuncs.c
@@ -21,14 +21,7 @@
  * Utility routines.
  *
  */
-
-#include "xfuncs.h"
-#include "logging.h"
-#include "read_write.h"
-#include <fcntl.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "abrtlib.h"
 
 /* Turn on nonblocking I/O on a fd */
 int ndelay_on(int fd)