diff --git a/src/bin/app_server.c b/src/bin/app_server.c
index 3763d9e8..911a5582 100644
--- a/src/bin/app_server.c
+++ b/src/bin/app_server.c
@@ -8,10 +8,19 @@
 
 #if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
 
-#if (ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 10)
+#ifndef ELM_APP_SERVER_VIEW_EVENT_CLOSED
 #define ELM_APP_SERVER_VIEW_EVENT_CLOSED    ELM_APP_SERVER_VIEW_EV_CLOSED
+#endif
+
+#ifndef ELM_APP_SERVER_VIEW_EVENT_RESUMED
 #define ELM_APP_SERVER_VIEW_EVENT_RESUMED   ELM_APP_SERVER_VIEW_EV_RESUMED
+#endif
+
+#ifndef ELM_APP_SERVER_VIEW_EVENT_SAVE
 #define ELM_APP_SERVER_VIEW_EVENT_SAVE      ELM_APP_SERVER_VIEW_EV_SAVE
+#endif
+
+#ifndef ELM_APP_SERVER_EVENT_TERMINATE
 #define ELM_APP_SERVER_EVENT_TERMINATE      ELM_APP_SERVER_EV_TERMINATE
 #endif