diff --git a/libs/esl/Makefile b/libs/esl/Makefile
index c1d431f57e..fab911e5a4 100644
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@@ -2,7 +2,7 @@ INCS=-Isrc/include
 LIBEDIT_DIR=../../libs/libedit
 DEBUG=-g -ggdb
 PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=$(INCS) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
+CFLAGS=$(INCS) -DHAVE_EDITLINE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
 MYLIB=libesl.a
 LIBS=-lncurses -lpthread -lesl
 LDFLAGS=-L.
diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index 1d526207fd..f672fdd9f2 100644
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -16,14 +16,14 @@
 #else
 #include <sys/select.h>
 #include <unistd.h>
-#include <histedit.h>
-#ifndef HAVE_EDITLINE
-#define HAVE_EDITLINE
-#endif
 #endif
 
 #include <getopt.h>
 
+#ifdef HAVE_EDITLINE
+#include <histedit.h>
+#endif
+
 static char prompt_str[512] = "";
 
 typedef struct {