diff --git a/core/DebuggerUI.cc b/core/DebuggerUI.cc
index e12e1de2ee9163a99dfb854bc8ddf2651ee31786..b176990101afc599d323b485c2d4425800544799 100644
--- a/core/DebuggerUI.cc
+++ b/core/DebuggerUI.cc
@@ -18,7 +18,7 @@
 #include <ctype.h>
 
 #ifdef ADVANCED_DEBUGGER_UI
-#include <editline/readline.h>
+#include <readline.h>
 // use a different file, than the MCTR CLI, since not all commands are the same
 #define TTCN3_HISTORY_FILENAME ".ttcn3_history_single"
 #endif
diff --git a/core/Makefile b/core/Makefile
index e6db442d36117fe90d3b9e7929f66ca3f29c94e0..8cacb359c7050c5d81608754715d4b1516795bdb 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -87,7 +87,7 @@ ifeq ($(ADVANCED_DEBUGGER_UI), yes)
   SOLARIS8_LIBS  += -lcurses -lbsd -ledit
   LINUX_LIBS     += -lncurses -lbsd -ledit
   FREEBSD_LIBS   += -lncurses -lbsd -ledit
-  WIN32_LIBS     += -lncurses -lbsd -ledit
+  WIN32_LIBS     += -lncurses -ledit
   INTERIX_LIBS   += -lncurses -lbsd -ledit
 endif
 
@@ -151,6 +151,10 @@ ifeq ($(PLATFORM),INTERIX)
   CPPFLAGS += -I/usr/local/include
 endif
 
+ifeq ($(ADVANCED_DEBUGGER_UI), yes)
+  CPPFLAGS += -I/usr/include/editline -I/usr/include/readline
+endif
+
 
 OBJECTS := $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SOURCES)))
 	
diff --git a/mctr2/cli/Cli.cc b/mctr2/cli/Cli.cc
index c88388adfdec63928b5761eea2d7b7b1d4b34985..85088e8bf0e62dac61e502ca02dbc1a2c8c952e2 100644
--- a/mctr2/cli/Cli.cc
+++ b/mctr2/cli/Cli.cc
@@ -31,7 +31,7 @@
 #include "../mctr/MainController.h"
 
 #include <stdio.h>
-#include <editline/readline.h>
+#include <readline.h>
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
diff --git a/mctr2/cli/Makefile b/mctr2/cli/Makefile
index 5ef23033f6bb7d91704228b067e2ce8c0af970b8..ae27deb7c2353bf292ba4c7aff26e284f5b5f115 100644
--- a/mctr2/cli/Makefile
+++ b/mctr2/cli/Makefile
@@ -40,7 +40,7 @@ OBJECTS := $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SOURCES)))
 
 DEPFILES := $(patsubst %.cc,%.d,$(patsubst %.c,%.d,$(SOURCES)))
 
-CPPFLAGS += -D_REENTRANT
+CPPFLAGS += -D_REENTRANT -I/usr/include/editline -I/usr/include/readline
 
 ifdef OPENSSL_DIR
 ifneq ($(OPENSSL_DIR), default)