diff --git a/src/apps/snmp/snmp_threadsync.c b/src/apps/snmp/snmp_threadsync.c
index 3271e8fe..8c2b5d65 100644
--- a/src/apps/snmp/snmp_threadsync.c
+++ b/src/apps/snmp/snmp_threadsync.c
@@ -29,7 +29,7 @@
 
 #include "lwip/apps/snmp_opts.h"
 
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
+#if LWIP_SNMP && (NO_SYS == 0) /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/apps/snmp_threadsync.h"
 #include "lwip/apps/snmp_core.h"
diff --git a/src/include/lwip/apps/snmp_opts.h b/src/include/lwip/apps/snmp_opts.h
index 7b23d63e..98c430c8 100644
--- a/src/include/lwip/apps/snmp_opts.h
+++ b/src/include/lwip/apps/snmp_opts.h
@@ -246,4 +246,5 @@
 #define SNMP_LWIP_GETBULK_MAX_REPETITIONS 0
 #endif
 
-#endif /* SNMP_LWIP_MIB2 */
+#endif /* LWIP_HDR_SNMP_OPTS_H */
+