diff --git a/README-2-REBUILD.txt b/README-2-REBUILD.txt
index 84af1b3..7d21211 100644
--- a/README-2-REBUILD.txt
+++ b/README-2-REBUILD.txt
@@ -1,15 +1,13 @@
 REBUILD STEPS (on every upgrade of: ECL, Qt, EQL)
 =============
 
-Change to eql/src/ and do:
-
-1) remove directory tmp/
-   remove slime/thread-safe.fas*
-   remove src/lisp/ecl-readline.fas* (only on upgrading ECL; to recompile manually)
+1) remove directory src/tmp/
+   remove file slime/thread-safe.fas*
+   remove file src/lisp/ecl-readline.fas*
 
 2) ecl -shell make-eql-lib.lisp
 
-3) qmake, make in this order: (MSVC: nmake; use qmake-qt4 if you have Qt5 installed)
+3) qmake, make in this order: (MSVC: nmake)
 
     eql_lib.pro
     eql_exe.pro
@@ -17,6 +15,10 @@ Change to eql/src/ and do:
     module_network.pro
     module_...
 
+  for readline (Unix):
+
+    ecl -compile src/lisp/ecl-readline.lisp
+
 Optionally (integrate wrapper functions):
 
 4) eql5 make-eql-lib-wrappers.lisp
diff --git a/doc/style.css b/doc/style.css
index 6c459bf..9844781 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -2,5 +2,3 @@ a:link, a:visited { text-decoration: none; color: blue; }
 a:hover { text-decoration: underline; }
 body { font-family: sans-serif; font-size: 10.5pt; }
 code, pre { color: mediumblue; }
-.added { color: red; }
-
diff --git a/examples/9-simple-lisp-editor/exe/main.cpp b/examples/9-simple-lisp-editor/exe/main.cpp
index 0d4733d..44bf78e 100644
--- a/examples/9-simple-lisp-editor/exe/main.cpp
+++ b/examples/9-simple-lisp-editor/exe/main.cpp
@@ -1,6 +1,8 @@
+#undef SLOT
+
+#include <ecl/ecl.h>
 #include <QCoreApplication>
 #include <QTextCodec>
-#include <ecl/ecl.h>
 #include "eql.h"
 
 extern "C" void ini_app(cl_object);
diff --git a/examples/X-extras/palindrome/exe/main.cpp b/examples/X-extras/palindrome/exe/main.cpp
index 98b4db5..52f1121 100644
--- a/examples/X-extras/palindrome/exe/main.cpp
+++ b/examples/X-extras/palindrome/exe/main.cpp
@@ -1,3 +1,5 @@
+#undef SLOT
+
 #include <ecl/ecl.h>
 #include "eql.h"
 #include "main.h"
diff --git a/my_app/main.cpp b/my_app/main.cpp
index 3524f09..9701839 100644
--- a/my_app/main.cpp
+++ b/my_app/main.cpp
@@ -1,8 +1,10 @@
+#undef SLOT
+
+#include <ecl/ecl.h>
 #include <QApplication>
 #include <QTextCodec>
 #include <QSettings>
 #include <QTranslator>
-#include <ecl/ecl.h>
 #include "eql.h"
 
 extern "C" void ini_app(cl_object);
diff --git a/src/ecl_fun.h b/src/ecl_fun.h
index 4a86149..3643972 100644
--- a/src/ecl_fun.h
+++ b/src/ecl_fun.h
@@ -3,8 +3,10 @@
 #ifndef ECL_FUN_H
 #define ECL_FUN_H
 
-#include "eql_global.h"
+#undef SLOT
+
 #include <ecl/ecl.h>
+#include "eql_global.h"
 #include <QList>
 #include <QUiLoader>
 #include <QByteArray>
diff --git a/src/eql.h b/src/eql.h
index 5ff339c..0c5a694 100644
--- a/src/eql.h
+++ b/src/eql.h
@@ -3,11 +3,13 @@
 #ifndef EQL_H
 #define EQL_H
 
+#undef SLOT
+
+#include <ecl/ecl.h>
 #include <QObject>
 #include <QByteArray>
 #include <QStringList>
 #include <QCoreApplication>
-#include <ecl/ecl.h>
 #include "dyn_object.h"
 #include "eql_global.h"
 
diff --git a/src/gen/_lobjects.h b/src/gen/_lobjects.h
index e9cdbf0..e656265 100644
--- a/src/gen/_lobjects.h
+++ b/src/gen/_lobjects.h
@@ -1,11 +1,13 @@
 #ifndef LOBJECTS_H
 #define LOBJECTS_H
 
+#undef SLOT
+
+#include <ecl/ecl.h>
 #include "../eql_global.h"
 #include "../ecl_fun.h"
 #include <QtWidgets>
 #include <QtPrintSupport>
-#include <ecl/ecl.h>
 
 Q_DECLARE_METATYPE(QList<QAction*>)
 Q_DECLARE_METATYPE(QList<QByteArray>)
diff --git a/src/qt_eql.cpp b/src/qt_eql.cpp
index 318cdff..f5a849d 100644
--- a/src/qt_eql.cpp
+++ b/src/qt_eql.cpp
@@ -1,8 +1,10 @@
 // copyright (c) Polos Ruetz
 // see Qt_EQL, QtWebKit: JavaScript / Lisp bridge
 
-#include <QtGui>
+#undef SLOT
+
 #include <ecl/ecl.h>
+#include <QtGui>
 #include "qt_eql.h"
 #include "ecl_fun.h"
 #include "eql.h"
diff --git a/src/single_shot.h b/src/single_shot.h
index 01c9e5c..194fb1d 100644
--- a/src/single_shot.h
+++ b/src/single_shot.h
@@ -3,8 +3,10 @@
 #ifndef SINGLE_SHOT_H
 #define SINGLE_SHOT_H
 
-#include <QObject>
+#undef SLOT
+
 #include <ecl/ecl.h>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE