diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index f1adc8549..db93ea0ce 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -45,10 +45,8 @@ extern int optind;
 #endif
 
 #include "e2fsbb.h"
-#include "et/com_err.h"
 #include "e2fsck/e2fsck.h"
 #include "e2fsck/problem.h"
-//#include "../version.h"
 
 /* Command line options */
 static int swapfs;
diff --git a/e2fsprogs/e2fsck/badblocks.c b/e2fsprogs/e2fsck/badblocks.c
index 09ef3ab1b..1ab76a091 100644
--- a/e2fsprogs/e2fsck/badblocks.c
+++ b/e2fsprogs/e2fsck/badblocks.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #endif
 
-#include <et/com_err.h>
 #include "e2fsck.h"
 
 static int check_bb_inode_blocks(ext2_filsys fs, blk_t *block_nr, int blockcnt,
diff --git a/e2fsprogs/e2fsck/dict.c b/e2fsprogs/e2fsck/dict.c
index 48a1e74f7..b0809a76d 100644
--- a/e2fsprogs/e2fsck/dict.c
+++ b/e2fsprogs/e2fsck/dict.c
@@ -30,7 +30,9 @@
 #define DICT_IMPLEMENTATION
 #include "dict.h"
 
-#define NDEBUG
+#ifndef NDEBUG
+# define NDEBUG
+#endif
 
 /*
  * These macros provide short convenient names for structure members,
diff --git a/e2fsprogs/e2fsck/swapfs.c b/e2fsprogs/e2fsck/swapfs.c
index 8d464043a..a737b9624 100644
--- a/e2fsprogs/e2fsck/swapfs.c
+++ b/e2fsprogs/e2fsck/swapfs.c
@@ -13,7 +13,6 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include <et/com_err.h>
 #include "e2fsck.h"
 
 #ifdef ENABLE_SWAPFS