diff --git a/doc/asciidoc/asciidoc.py b/doc/asciidoc/asciidoc.py
index 5013e24..1b2a106 100755
--- a/doc/asciidoc/asciidoc.py
+++ b/doc/asciidoc/asciidoc.py
@@ -3944,7 +3944,7 @@ def asciidoc(backend, doctype, confiles, infile, outfile, options):
             raise EAsciiDoc,'input file %s missing' % infile
         if '-e' not in options:
             # Load global configuration from system configuration directory.
-            config.load_all(GLOBAL_CONFIG_DIR)
+            #config.load_all(GLOBAL_CONFIG_DIR)
             # Load global configuration files from asciidoc directory.
             config.load_all(APP_DIR)
             # Load configuration files from ~/.asciidoc if it exists.
diff --git a/ede-desktop/DesktopIcon.cpp b/ede-desktop/DesktopIcon.cpp
index e95e230..e54709c 100644
--- a/ede-desktop/DesktopIcon.cpp
+++ b/ede-desktop/DesktopIcon.cpp
@@ -14,6 +14,8 @@
 #include <config.h>
 #endif
 
+#define FL_LIBRARY 1
+
 #include <FL/Fl.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Shared_Image.H>
diff --git a/ede-image-view/ede-image-view.cpp b/ede-image-view/ede-image-view.cpp
index ddf6f2b..66f4d47 100644
--- a/ede-image-view/ede-image-view.cpp
+++ b/ede-image-view/ede-image-view.cpp
@@ -20,14 +20,14 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include <Fl/Fl.H>
-#include <Fl/Fl_Double_Window.H>
-#include <Fl/Fl_Button.H>
-#include <Fl/Fl_Shared_Image.H>
-#include <Fl/Fl_Scroll.H>
-#include <Fl/Fl_Widget.H>
-#include <Fl/Fl_File_Chooser.H>
-#include <Fl/filename.H>
+#include <FL/Fl.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_Scroll.H>
+#include <FL/Fl_Widget.H>
+#include <FL/Fl_File_Chooser.H>
+#include <FL/filename.H>
 #include <edelib/Ede.h>
 
 #define DEBUG 1