diff --git a/eabout/eabout.cpp b/eabout/eabout.cpp
index 006ff32..54a4b4a 100644
--- a/eabout/eabout.cpp
+++ b/eabout/eabout.cpp
@@ -10,14 +10,14 @@
  * See COPYING for details.
  */
 
-#include <FL/Fl.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Text_Display.h>
-#include <FL/Fl_Text_Buffer.h>
-#include <FL/Fl_Pixmap.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Text_Display.H>
+#include <FL/Fl_Text_Buffer.H>
+#include <FL/Fl_Pixmap.H>
 
 #include <edelib/Nls.h>
 #include "icons/ede.xpm"
diff --git a/econtrol/econtrol.cpp b/econtrol/econtrol.cpp
index 3a40efd..5fbd3d8 100644
--- a/econtrol/econtrol.cpp
+++ b/econtrol/econtrol.cpp
@@ -22,11 +22,11 @@
 #include <edelib/Run.h>
 #include <edelib/File.h>
 
-#include <FL/Fl.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Shared_Image.h>
-#include <FL/fl_draw.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/fl_draw.H>
 
 typedef edelib::list<edelib::String> StrList;
 typedef edelib::list<edelib::String>::iterator StrListIter;
diff --git a/ecrasher/CrashDialog.cpp b/ecrasher/CrashDialog.cpp
index 905641f..6c6e6db 100644
--- a/ecrasher/CrashDialog.cpp
+++ b/ecrasher/CrashDialog.cpp
@@ -13,9 +13,9 @@
 #include "icons/core.xpm"
 #include "CrashDialog.h"
 
-#include <FL/Fl.h>
-#include <FL/Fl_Pixmap.h>
-#include <FL/Fl_File_Chooser.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Pixmap.H>
+#include <FL/Fl_File_Chooser.H>
 
 #include <sys/utsname.h>
 #include <sys/types.h>
diff --git a/ecrasher/CrashDialog.h b/ecrasher/CrashDialog.h
index 681a32b..4ae1134 100644
--- a/ecrasher/CrashDialog.h
+++ b/ecrasher/CrashDialog.h
@@ -13,12 +13,12 @@
 #ifndef __CRASHDIALOG_H__
 #define __CRASHDIALOG_H__
 
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Pixmap.h>
-#include <FL/Fl_Text_Display.h>
-#include <FL/Fl_Text_Buffer.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Pixmap.H>
+#include <FL/Fl_Text_Display.H>
+#include <FL/Fl_Text_Buffer.H>
 
 #include <edelib/String.h>
 
diff --git a/eiconman/DesktopIcon.cpp b/eiconman/DesktopIcon.cpp
index 4fb38e9..a640a5d 100644
--- a/eiconman/DesktopIcon.cpp
+++ b/eiconman/DesktopIcon.cpp
@@ -10,11 +10,11 @@
  * See COPYING for details.
  */
 
-#include <FL/Fl.h>
-#include <FL/fl_draw.h>
-#include <FL/Fl_Shared_Image.h>
-#include <FL/Fl_Menu_Button.h>
-#include <FL/x.h>
+#include <FL/Fl.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_Menu_Button.H>
+#include <FL/x.H>
 
 #include <edelib/Debug.h>
 #include <edelib/IconTheme.h>
diff --git a/eiconman/DesktopIcon.h b/eiconman/DesktopIcon.h
index b3d7529..df345e6 100644
--- a/eiconman/DesktopIcon.h
+++ b/eiconman/DesktopIcon.h
@@ -13,11 +13,11 @@
 #ifndef __DESKTOPICON_H__
 #define __DESKTOPICON_H__
 
-#include <FL/Fl_Widget.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Image.h>
+#include <FL/Fl_Widget.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Image.H>
 
 #include <X11/Xlib.h> // Pixmap
 
diff --git a/eiconman/IconProperties.cpp b/eiconman/IconProperties.cpp
index 6603d35..136865d 100644
--- a/eiconman/IconProperties.cpp
+++ b/eiconman/IconProperties.cpp
@@ -16,13 +16,13 @@
 #include <time.h>
 #include <stdio.h>
 
-#include <FL/Fl.h>
-#include <FL/Fl_Tabs.h>
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Input.h>
-#include <FL/Fl_Output.h>
-#include <FL/Fl_Shared_Image.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Output.H>
+#include <FL/Fl_Shared_Image.H>
 
 #include <edelib/Nls.h>
 #include <edelib/Window.h>
diff --git a/eiconman/Utils.cpp b/eiconman/Utils.cpp
index 7707604..cfbbde4 100644
--- a/eiconman/Utils.cpp
+++ b/eiconman/Utils.cpp
@@ -12,7 +12,7 @@
 
 #include "Utils.h"
 #include <X11/Xproto.h> // CARD32
-#include <FL/x.h>
+#include <FL/x.H>
 #include <edelib/Debug.h>
 
 #include <string.h> // strrchr, strncpy, strlen
diff --git a/eiconman/Utils.h b/eiconman/Utils.h
index f3e93a3..0e9b051 100644
--- a/eiconman/Utils.h
+++ b/eiconman/Utils.h
@@ -13,8 +13,8 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Image.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Image.H>
 
 #include <X11/Xlib.h> // Pixmap
 
diff --git a/eiconman/Wallpaper.cpp b/eiconman/Wallpaper.cpp
index ebe4de5..466a06f 100644
--- a/eiconman/Wallpaper.cpp
+++ b/eiconman/Wallpaper.cpp
@@ -15,10 +15,10 @@
 
 #include <edelib/Debug.h>
 
-#include <FL/Fl_Shared_Image.h>
-#include <FL/Fl_RGB_Image.h>
-#include <FL/fl_draw.h>
-#include <FL/x.h>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_RGB_Image.H>
+#include <FL/fl_draw.H>
+#include <FL/x.H>
 
 #include <string.h> // memcpy
 #include <stdlib.h> // malloc
diff --git a/eiconman/Wallpaper.h b/eiconman/Wallpaper.h
index 7658e55..4f62b14 100644
--- a/eiconman/Wallpaper.h
+++ b/eiconman/Wallpaper.h
@@ -13,7 +13,7 @@
 #ifndef __WALLPAPER_H__
 #define __WALLPAPER_H__
 
-#include <FL/Fl_Box.h>
+#include <FL/Fl_Box.H>
 
 #include <X11/Xlib.h>  // XImage, Pixmap
 
diff --git a/eiconman/eiconman.cpp b/eiconman/eiconman.cpp
index df8a8a6..a8fd403 100644
--- a/eiconman/eiconman.cpp
+++ b/eiconman/eiconman.cpp
@@ -31,13 +31,13 @@
 #include <edelib/Util.h>
 #include <edelib/Nls.h>
 
-#include <FL/Fl.h>
-#include <FL/x.h>
-#include <FL/fl_draw.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Shared_Image.h>
-#include <FL/Fl_Menu_Button.h>
-#include <FL/fl_ask.h>
+#include <FL/Fl.H>
+#include <FL/x.H>
+#include <FL/fl_draw.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl_Menu_Button.H>
+#include <FL/fl_ask.H>
 
 #include <unistd.h> // sleep
 #include <signal.h>
diff --git a/eiconman/eiconman.h b/eiconman/eiconman.h
index c01aad6..ce0dcea 100644
--- a/eiconman/eiconman.h
+++ b/eiconman/eiconman.h
@@ -16,11 +16,11 @@
 #ifdef USE_EDELIB_WINDOW
 	#include <edelib/Window.h>
 #else
-	#include <FL/Fl_Window.h>
-	#include <FL/Fl_Double_Window.h>
+	#include <FL/Fl_Window.H>
+	#include <FL/Fl_Double_Window.H>
 #endif
 
-#include <FL/Fl_Image.h>
+#include <FL/Fl_Image.H>
 
 #include <edelib/String.h>
 #include <edelib/Resource.h>
diff --git a/eiconman/test/notify.cpp b/eiconman/test/notify.cpp
index a125c2c..f0fc303 100644
--- a/eiconman/test/notify.cpp
+++ b/eiconman/test/notify.cpp
@@ -3,8 +3,8 @@
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Button.H>
 #include <FL/Fl_Box.H>
-#include <FL/fl_show_colormap.h>
-#include <FL/x.h>
+#include <FL/fl_show_colormap.H>
+#include <FL/x.H>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/elma/Background.cpp b/elma/Background.cpp
index ca5f4a6..97f7453 100644
--- a/elma/Background.cpp
+++ b/elma/Background.cpp
@@ -11,7 +11,7 @@
  */
 
 #include "Background.h"
-#include <FL/Fl_Shared_Image.h>
+#include <FL/Fl_Shared_Image.H>
 #include <edelib/Debug.h>
 
 bool Background::load_images(const char* bpath, const char* ppath) {
diff --git a/elma/Background.h b/elma/Background.h
index ea4f292..61e3d07 100644
--- a/elma/Background.h
+++ b/elma/Background.h
@@ -13,7 +13,7 @@
 #ifndef __BACKGROUND_H__
 #define __BACKGROUND_H__
 
-#include <FL/Fl_Box.h>
+#include <FL/Fl_Box.H>
 
 class Fl_Image;
 
diff --git a/elma/ElmaService.cpp b/elma/ElmaService.cpp
index 5f4d3fa..236842b 100644
--- a/elma/ElmaService.cpp
+++ b/elma/ElmaService.cpp
@@ -15,8 +15,8 @@
 
 #include <edelib/Config.h>
 
-#include <FL/Fl.h>
-#include <FL/x.h>
+#include <FL/Fl.H>
+#include <FL/x.H>
 #include <stdlib.h>
 
 ElmaService::ElmaService() : config(NULL), theme(NULL) {
diff --git a/elma/ElmaWindow.cpp b/elma/ElmaWindow.cpp
index 3bc39c1..fd789aa 100644
--- a/elma/ElmaWindow.cpp
+++ b/elma/ElmaWindow.cpp
@@ -10,7 +10,7 @@
  * See COPYING for details.
  */
 
-#include <FL/Fl.h>
+#include <FL/Fl.H>
 #include <edelib/Debug.h>
 
 #include <sys/types.h>
diff --git a/elma/ElmaWindow.h b/elma/ElmaWindow.h
index 1ff9532..d736b1a 100644
--- a/elma/ElmaWindow.h
+++ b/elma/ElmaWindow.h
@@ -13,7 +13,7 @@
 #ifndef __ELMAWINDOW_H__
 #define __ELMAWINDOW_H__
 
-#include <FL/Fl_Double_Window.h>
+#include <FL/Fl_Double_Window.H>
 
 class Background;
 class TextArea;
diff --git a/elma/TextArea.h b/elma/TextArea.h
index f78c863..b242589 100644
--- a/elma/TextArea.h
+++ b/elma/TextArea.h
@@ -13,7 +13,7 @@
 #ifndef __TEXTAREA_H__
 #define __TEXTAREA_H__
 
-#include <FL/Fl_Input.h>
+#include <FL/Fl_Input.H>
 #include <edelib/Debug.h>
 
 /*
diff --git a/elma/elma.cpp b/elma/elma.cpp
index 999c73d..efe734f 100644
--- a/elma/elma.cpp
+++ b/elma/elma.cpp
@@ -14,8 +14,8 @@
 
 #if 0
 #include <string.h>
-#include <FL/x.h>
-#include <FL/Fl.h>
+#include <FL/x.H>
+#include <FL/Fl.H>
 #include <edelib/String.h>
 #include <edelib/Config.h>
 
diff --git a/etip/etip.cpp b/etip/etip.cpp
index 96fa9c2..df7be41 100644
--- a/etip/etip.cpp
+++ b/etip/etip.cpp
@@ -10,13 +10,13 @@
  * See COPYING for the details.
  */
 
-#include <FL/Fl.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Check_Button.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Pixmap.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Check_Button.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Pixmap.H>
 
 #include <edelib/Nls.h>
 #include <edelib/Config.h>
diff --git a/evoke/Autostart.cpp b/evoke/Autostart.cpp
index 7cb062c..83817a6 100644
--- a/evoke/Autostart.cpp
+++ b/evoke/Autostart.cpp
@@ -15,8 +15,8 @@
 #include "EvokeService.h"
 
 #include <edelib/Nls.h>
-#include <FL/Fl_Pixmap.h>
-#include <FL/Fl.h>
+#include <FL/Fl_Pixmap.H>
+#include <FL/Fl.H>
 
 Fl_Pixmap warnpix(warning_xpm);
 
diff --git a/evoke/Autostart.h b/evoke/Autostart.h
index 1ea1dad..c083099 100644
--- a/evoke/Autostart.h
+++ b/evoke/Autostart.h
@@ -13,10 +13,10 @@
 #ifndef __AUTOSTART_H__
 #define __AUTOSTART_H__
 
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Check_Browser.h>
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Check_Browser.H>
+#include <FL/Fl_Button.H>
 
 #include <edelib/String.h>
 
diff --git a/evoke/Composite.cpp b/evoke/Composite.cpp
index bd2bdfe..a783a66 100644
--- a/evoke/Composite.cpp
+++ b/evoke/Composite.cpp
@@ -16,8 +16,8 @@
 
 #include <edelib/Debug.h>
 
-#include <FL/x.h>
-#include <FL/Fl.h>
+#include <FL/x.H>
+#include <FL/Fl.H>
 
 #include <string.h> // memcpy
 #include <stdlib.h> // malloc, realloc
diff --git a/evoke/EvokeService.cpp b/evoke/EvokeService.cpp
index 7c8e213..bb3ffbf 100644
--- a/evoke/EvokeService.cpp
+++ b/evoke/EvokeService.cpp
@@ -589,7 +589,7 @@ void EvokeService::service_watcher(int pid, int ret) {
 	write(wake_up_pipe[1], &ret, sizeof(int));
 }
 
-#include <FL/fl_ask.h>
+#include <FL/fl_ask.H>
 void EvokeService::wake_up(int fd) {
 	puts("=== wake_up() ===");
 
diff --git a/evoke/EvokeService.h b/evoke/EvokeService.h
index 38d5bda..82c9c57 100644
--- a/evoke/EvokeService.h
+++ b/evoke/EvokeService.h
@@ -13,7 +13,7 @@
 #ifndef __EVOKESERVICE_H__
 #define __EVOKESERVICE_H__
 
-#include <FL/x.h>
+#include <FL/x.H>
 #include <pthread.h>
 
 #include <edelib/List.h>
diff --git a/evoke/Logout.cpp b/evoke/Logout.cpp
index e3dd97d..491ac70 100644
--- a/evoke/Logout.cpp
+++ b/evoke/Logout.cpp
@@ -10,13 +10,13 @@
  * See COPYING for details.
  */
 
-#include <FL/Fl_Double_Window.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Button.h>
-#include <FL/Fl_Round_Button.h>
-#include <FL/Fl_RGB_Image.h>
-#include <FL/Fl.h>
-#include <FL/x.h>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Round_Button.H>
+#include <FL/Fl_RGB_Image.H>
+#include <FL/Fl.H>
+#include <FL/x.H>
 #include <string.h> // memset
 
 #include <edelib/Nls.h>
diff --git a/evoke/Splash.cpp b/evoke/Splash.cpp
index 01bb15b..ae14460 100644
--- a/evoke/Splash.cpp
+++ b/evoke/Splash.cpp
@@ -12,8 +12,8 @@
 
 #include <stdio.h> // snprintf
 
-#include <FL/Fl_Shared_Image.h>
-#include <FL/Fl.h>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/Fl.H>
 
 #include <edelib/Run.h>
 #include <edelib/Debug.h>
diff --git a/evoke/Splash.h b/evoke/Splash.h
index 791b6cc..1c1d80b 100644
--- a/evoke/Splash.h
+++ b/evoke/Splash.h
@@ -13,8 +13,8 @@
 #ifndef __SPLASH_H__
 #define __SPLASH_H__
 
-#include <FL/Fl_Double_Window.h>
-#include <FL/Fl_Box.h>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Box.H>
 
 #include "EvokeService.h"
 
diff --git a/evoke/Xsm.cpp b/evoke/Xsm.cpp
index d3bcac0..f0d5009 100644
--- a/evoke/Xsm.cpp
+++ b/evoke/Xsm.cpp
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include <FL/x.h>
+#include <FL/x.H>
 #include <X11/Xresource.h>
 
 #include <edelib/Debug.h>
diff --git a/evoke/evoke.cpp b/evoke/evoke.cpp
index b9dd818..ed11516 100644
--- a/evoke/evoke.cpp
+++ b/evoke/evoke.cpp
@@ -17,8 +17,8 @@
 #include <edelib/Debug.h>
 #include <edelib/File.h>
 
-#include <FL/Fl.h>
-#include <FL/x.h>
+#include <FL/Fl.H>
+#include <FL/x.H>
 
 #include "EvokeService.h"
 
diff --git a/evoke/test/evoke_test.cpp b/evoke/test/evoke_test.cpp
index fb687ba..a365064 100644
--- a/evoke/test/evoke_test.cpp
+++ b/evoke/test/evoke_test.cpp
@@ -1,8 +1,8 @@
-#include <FL/Fl.h>
-#include <FL/Fl_Double_Window.h>
-#include <FL/Fl_Input.h>
-#include <FL/Fl_Button.h>
-#include <FL/x.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Input.H>
+#include <FL/Fl_Button.H>
+#include <FL/x.H>
 
 #include <string.h>
 
diff --git a/evoke/test/opacity_test.cpp b/evoke/test/opacity_test.cpp
index 58a5c30..7311164 100644
--- a/evoke/test/opacity_test.cpp
+++ b/evoke/test/opacity_test.cpp
@@ -1,8 +1,8 @@
-#include <FL/Fl.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Value_Slider.h>
-#include <FL/x.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Value_Slider.H>
+#include <FL/x.H>
 
 #include <stdio.h>
 
diff --git a/evoke/test/stress_test.cpp b/evoke/test/stress_test.cpp
index 16bb735..b641f22 100644
--- a/evoke/test/stress_test.cpp
+++ b/evoke/test/stress_test.cpp
@@ -1,5 +1,5 @@
-#include <FL/x.h>
-#include <FL/Fl.h>
+#include <FL/x.H>
+#include <FL/Fl.H>
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>