diff --git a/epan/except.h b/epan/except.h
index 6dcfb23a49..a9dcfb437c 100644
--- a/epan/except.h
+++ b/epan/except.h
@@ -182,4 +182,4 @@ WS_DLL_PUBLIC void except_free(void *);
 	except_pop();						\
     }
 
-#endif
+#endif /* XCEPT_H */
diff --git a/epan/exceptions.h b/epan/exceptions.h
index 601206e986..2ddb515357 100644
--- a/epan/exceptions.h
+++ b/epan/exceptions.h
@@ -25,9 +25,7 @@
 #ifndef __EXCEPTIONS_H__
 #define __EXCEPTIONS_H__
 
-#ifndef XCEPT_H
 #include "except.h"
-#endif
 
 /* Wireshark has only one exception group, to make these macros simple */
 #define XCEPT_GROUP_WIRESHARK 1