diff --git a/src/include/securerom/ecverify.H b/src/include/securerom/ecverify.H
index 6c6bfe07cdc..8df719517a1 100644
--- a/src/include/securerom/ecverify.H
+++ b/src/include/securerom/ecverify.H
@@ -43,6 +43,4 @@ int ec_verify (const uint8_t *publicpt,     /* 2*EC_COORDBYTES */
                const uint8_t *hash,         /*   EC_HASHBYTES  */
                const uint8_t *signature) ;  /* 2*EC_COORDBYTES */
 
-#define NDEBUG
-
 #endif    /* defined(__ECVERIFY_H__) */
diff --git a/src/kernel/bltohbdatamgr.C b/src/kernel/bltohbdatamgr.C
index 8358c5840ab..919509c96fb 100644
--- a/src/kernel/bltohbdatamgr.C
+++ b/src/kernel/bltohbdatamgr.C
@@ -148,8 +148,8 @@ printk("Version=%lX\n",i_data.version);
     if( iv_data.version >= Bootloader::BLTOHB_MMIOBARS )
     {
 printk("lpc=%lX, xscom=%lX\n", i_data.lpcBAR, i_data.xscomBAR );
-        kassert(i_data.lpcBar>0);
-        kassert(i_data.xscomBar>0);
+        kassert(i_data.lpcBAR>0);
+        kassert(i_data.xscomBAR>0);
         iv_data.lpcBAR = i_data.lpcBAR;
         iv_data.xscomBAR = i_data.xscomBAR;
     }
diff --git a/src/securerom/ecverify.C b/src/securerom/ecverify.C
index a4ba85a6550..6df77df1514 100644
--- a/src/securerom/ecverify.C
+++ b/src/securerom/ecverify.C
@@ -42,6 +42,8 @@
 #include <stdint.h>                /* uint_fast8_t, uintN_t        */
 #include "inttypes.H"          /* PRIx64 used to format bn_t's */
 
+#define NDEBUG
+
 /**
  *  Define __LITTLE_ENDIAN or __BIG_ENDIAN for target.
  */