abrtlib.h: include <assert.h> and "strbuf.h"

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

12 files changed, 4 insertions, 25 deletions

diff --git a/lib/plugins/Bugzilla.cpp b/lib/plugins/Bugzilla.cpp
index 5d660688..f10baff6 100644
--- a/lib/plugins/Bugzilla.cpp
+++ b/lib/plugins/Bugzilla.cpp
@@ -24,7 +24,6 @@
 #include "debug_dump.h"
 #include "abrt_exception.h"
 #include "comm_layer_inner.h"
-#include "strbuf.h"
 
 #define XML_RPC_SUFFIX      "/xmlrpc.cgi"
 #define MAX_HOPS            5
diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp
index c6bbaf28..2ecf9308 100644
--- a/lib/plugins/CCpp.cpp
+++ b/lib/plugins/CCpp.cpp
@@ -20,10 +20,7 @@
 */
 #include <set>
 #include <iomanip>
-//#include <nss.h>
-//#include <sechash.h>
 #include "abrtlib.h"
-#include "strbuf.h"
 #include "CCpp.h"
 #include "abrt_exception.h"
 #include "debug_dump.h"
@@ -31,7 +28,6 @@
 #include "Polkit.h"
 #include "backtrace.h"
 #include "CCpp_sha1.h"
-#include "strbuf.h"
 
 using namespace std;
 
diff --git a/lib/plugins/KerneloopsScanner.cpp b/lib/plugins/KerneloopsScanner.cpp
index 7e0e8e74..8c25dff8 100644
--- a/lib/plugins/KerneloopsScanner.cpp
+++ b/lib/plugins/KerneloopsScanner.cpp
@@ -20,8 +20,6 @@
     Anton Arapov <anton@redhat.com>
     Arjan van de Ven <arjan@linux.intel.com>
 */
-
-#include <assert.h>
 #include <syslog.h>
 #include <asm/unistd.h> /* __NR_syslog */
 #include "abrtlib.h"
diff --git a/lib/plugins/KerneloopsSysLog.cpp b/lib/plugins/KerneloopsSysLog.cpp
index 8fdd1ac7..5c90aead 100644
--- a/lib/plugins/KerneloopsSysLog.cpp
+++ b/lib/plugins/KerneloopsSysLog.cpp
@@ -16,10 +16,8 @@
        Anton Arapov <anton@redhat.com>
        Arjan van de Ven <arjan@linux.intel.com>
  */
-
 #include "abrtlib.h"
 #include "KerneloopsSysLog.h"
-#include <assert.h>
 
 static void queue_oops(vector_string_t &vec, const char *data, const char *version)
 {
diff --git a/lib/plugins/RHTSupport.cpp b/lib/plugins/RHTSupport.cpp
index b3d82701..de6dc873 100644
--- a/lib/plugins/RHTSupport.cpp
+++ b/lib/plugins/RHTSupport.cpp
@@ -27,7 +27,6 @@
 #include "abrt_exception.h"
 #include "comm_layer_inner.h"
 #include "RHTSupport.h"
-#include "strbuf.h"
 
 using namespace std;
 
diff --git a/lib/plugins/SOSreport.cpp b/lib/plugins/SOSreport.cpp
index a3e7f612..4c9358da 100644
--- a/lib/plugins/SOSreport.cpp
+++ b/lib/plugins/SOSreport.cpp
@@ -18,7 +18,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#include "abrt_types.h"
 #include "abrt_exception.h"
 #include "SOSreport.h"
 #include "debug_dump.h"
diff --git a/lib/utils/CrashTypes.cpp b/lib/utils/CrashTypes.cpp
index 96be28c1..a31f2c00 100644
--- a/lib/utils/CrashTypes.cpp
+++ b/lib/utils/CrashTypes.cpp
@@ -16,7 +16,6 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "abrt_types.h"
 #include "abrtlib.h"
 #include "crash_types.h"
 
diff --git a/lib/utils/Makefile.am b/lib/utils/Makefile.am
index c399fdff..4d5720bb 100644
--- a/lib/utils/Makefile.am
+++ b/lib/utils/Makefile.am
@@ -29,7 +29,7 @@ libABRTUtils_la_SOURCES = \
     ABRTException.cpp \
     backtrace.h backtrace.c \
     backtrace_parser.y \
-    strbuf.h strbuf.c \
+    strbuf.c \
     abrt_packages.c abrt_packages.h \
     hooklib.c hooklib.h
 libABRTUtils_la_CPPFLAGS = \
diff --git a/lib/utils/backtrace.c b/lib/utils/backtrace.c
index a2efa766..f507cba3 100644
--- a/lib/utils/backtrace.c
+++ b/lib/utils/backtrace.c
@@ -15,11 +15,11 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "backtrace.h"
-#include "strbuf.h"
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include "backtrace.h"
+#include "strbuf.h"
 #include "xfuncs.h"
 
 struct frame *frame_new()
diff --git a/lib/utils/make_descr.cpp b/lib/utils/make_descr.cpp
index 50f68501..131a0a37 100644
--- a/lib/utils/make_descr.cpp
+++ b/lib/utils/make_descr.cpp
@@ -19,7 +19,6 @@
 #include "abrtlib.h"
 #include "crash_types.h"
 #include "debug_dump.h" /* FILENAME_ARCHITECTURE etc */
-#include "strbuf.h"
 
 
 using namespace std;
diff --git a/lib/utils/parse_release.cpp b/lib/utils/parse_release.cpp
index e648dc63..f9057bfe 100644
--- a/lib/utils/parse_release.cpp
+++ b/lib/utils/parse_release.cpp
@@ -17,7 +17,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "abrtlib.h"
-#include "strbuf.h"
 
 // caller is reposible for freeing *product* and *version*
 void parse_release(const char *release, char** product, char** version)
diff --git a/lib/utils/strbuf.c b/lib/utils/strbuf.c
index f0962541..6250cf4d 100644
--- a/lib/utils/strbuf.c
+++ b/lib/utils/strbuf.c
@@ -17,14 +17,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "strbuf.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <stdarg.h>
-#include "xfuncs.h"
-
+#include "abrtlib.h"
 
 int prefixcmp(const char *str, const char *prefix)
 {