diff --git a/configure.ac b/configure.ac
index 586bcf12632947a3603e32c41befc0821c47e7a8..62e633a82cae65e8d8e1543671a557a80ef7d451 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,7 @@ AX_PTHREAD( [
 # Not all compilers include /usr/local in the include and link path
 if test -d /usr/local/include; then
     CFLAGS="$CFLAGS -I/usr/local/include"
+    CXXFLAGS="$CFLAGS -I/usr/local/include" # Added this in case fiwalk needs it
     LDFLAGS="$LDFLAGS -L/usr/local/lib"
 fi
 
@@ -173,7 +174,8 @@ AS_IF([test "x$with_libewf" != "xno"],
     # Test the dir if they specified something beyond yes/no
     [AS_IF([test "x$with_libewf" != "xyes"],
         [AS_IF([test -d ${with_libewf}/include],
-            [CFLAGS="$CFLAGS -I${with_libewf}/include"
+            [CFLAGS="$CFLAGS -I${with_libewf}/include"  # TSK needs this
+                CXXFLAGS="$CXXFLAGS -I${with_libewf}/include"  # fiwalk needs this
                 LDFLAGS="$LDFLAGS -L${with_libewf}/lib"],
             # Dir given was not correct
             [AC_MSG_FAILURE([libewf directory not found at ${with_libewf}])])