diff --git a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h
index 69306d09d..104804422 100644
--- a/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h
+++ b/Examples/minimum_user_for_s2e/src/src_user/Settings/System/event_logger_params.h
@@ -15,10 +15,10 @@
 #undef EL_CLOG_TLM_PAGE_MAX_MIDDLE
 #undef EL_CLOG_TLM_PAGE_MAX_LOW
 
-#undef EL_TLOG_SIZE_MAX_EL
-#undef EL_CLOG_SIZE_MAX_EL
-#undef EL_TLOG_SIZE_MAX_EH
-#undef EL_CLOG_SIZE_MAX_EH
+#undef EL_TLOG_LOG_SIZE_MAX_EL
+#undef EL_CLOG_LOG_SIZE_MAX_EL
+#undef EL_TLOG_LOG_SIZE_MAX_EH
+#undef EL_CLOG_LOG_SIZE_MAX_EH
 
 #undef EL_IS_ENABLE_TLOG
 #undef EL_IS_ENABLE_CLOG
@@ -38,10 +38,10 @@
 #define EL_CLOG_TLM_PAGE_MAX_MIDDLE   (4)
 #define EL_CLOG_TLM_PAGE_MAX_LOW      (4)
 
-#define EL_TLOG_SIZE_MAX_EL           (16)
-#define EL_CLOG_SIZE_MAX_EL           (8)
-#define EL_TLOG_SIZE_MAX_EL           (16)
-#define EL_CLOG_SIZE_MAX_EL           (8)
+#define EL_TLOG_LOG_SIZE_MAX_EL           (16)
+#define EL_CLOG_LOG_SIZE_MAX_EL           (8)
+#define EL_TLOG_LOG_SIZE_MAX_EH           (16)
+#define EL_CLOG_LOG_SIZE_MAX_EH           (8)
 
 #define EL_IS_ENABLE_TLOG
 #define EL_IS_ENABLE_CLOG
diff --git a/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py b/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py
index 3c6c3b6a2..9b9d9c614 100644
--- a/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py
+++ b/Examples/minimum_user_for_s2e/src/src_user/Test/test/src_core/System/EventManager/test_event_logger.py
@@ -27,8 +27,8 @@
 EL_CLOG_TLM_PAGE_MAX_MIDDLE  = 4
 EL_CLOG_TLM_PAGE_MAX_LOW     = 4
 
-EL_TLOG_SIZE_MAX_EL          = 16
-EL_CLOG_SIZE_MAX_EL          = 8
+EL_TLOG_LOG_SIZE_MAX_EL      = 16
+EL_CLOG_LOG_SIZE_MAX_EL      = 8
 
 EL_ERROR_LEVEL_HIGH    = 0
 EL_ERROR_LEVEL_MIDDLE  = 1
diff --git a/System/EventManager/event_logger.h b/System/EventManager/event_logger.h
index 88ae5dd7a..96827ec89 100644
--- a/System/EventManager/event_logger.h
+++ b/System/EventManager/event_logger.h
@@ -84,8 +84,6 @@
 // 上部で定義されている，各種tableサイズ
 #include <src_user/Settings/System/event_logger_params.h>
 
-#include "event_logger.h"
-
 #define EL_LOG_MINIMUM_REQUIRED           (2)   //!< ログに求められる最小要素数
 #define EL_LOG_MINIMUM_REQUIRED_EL_LOG    (4)   //!< ELログに求められる最小要素数
 
@@ -120,8 +118,13 @@
 #undef EL_TLOG_LOG_SIZE_MAX_EL
 #endif  // EL_IS_ENABLE_EL_ERROR_LEVEL
 
-#if EL_TLOG_LOG_SIZE_MAX_EH <= EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES
-#error EL_TLOG_LOG_SIZE_MAX_EH is too small
+// FIXME: event_logger.h と event_handler.h が相互 include になってしまいビルドできないので，一時的にこのアサーションを無効化
+// #include "event_handler.h"
+// #if EL_TLOG_LOG_SIZE_MAX_EH <= EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES
+// #error EL_TLOG_LOG_SIZE_MAX_EH is too small
+// #endif
+#if EL_TLOG_LOG_SIZE_MAX_EH <= 0
+#error EL_TLOG_LOG_SIZE_MAX_EH must be a positive number
 #endif
 
 #else   // EL_IS_ENABLE_TLOG