diff --git a/src/kits/storage/sniffer/Parser.cpp b/src/kits/storage/sniffer/Parser.cpp
index 09e4a26733..edcb80ced3 100644
--- a/src/kits/storage/sniffer/Parser.cpp
+++ b/src/kits/storage/sniffer/Parser.cpp
@@ -18,6 +18,7 @@
 #include "RPatternList.h"
 #include "Range.h"
 #include "Rule.h"
+#include "Err.h"
 
 #include <String.h>
 #include <new>
diff --git a/src/kits/storage/sniffer/Parser.h b/src/kits/storage/sniffer/Parser.h
index 68e2addcc9..e8e8ad7201 100644
--- a/src/kits/storage/sniffer/Parser.h
+++ b/src/kits/storage/sniffer/Parser.h
@@ -20,10 +20,6 @@
 #include <string>
 #include <vector>
 
-#include "Err.h"
-#include "Range.h"
-#include "Rule.h"
-
 class BString;
 
 //! MIME Sniffer related classes
@@ -35,6 +31,8 @@ class Rule;
 class DisjList;
 class RPattern;
 class Pattern;
+class Range;
+class Err;
 
 //! The mighty parsing function ;-)
 status_t parse(const char* rule, Rule* result, BString* parseError = NULL);