6 files changed, 4 insertions, 14 deletions
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)
 {