5 files changed, 27 insertions, 27 deletions

diff --git a/src/findbar.cc b/src/findbar.cc
index d35719d6..8cca52ba 100644
--- a/src/findbar.cc
+++ b/src/findbar.cc
@@ -18,6 +18,8 @@
 #include "uicmd.hh"
 #include "bw.h"
 
+using namespace fltk;
+
 /*
  * Local sub class
  * (Used to handle escape in the findbar, may also avoid some shortcuts).
diff --git a/src/findbar.hh b/src/findbar.hh
index 84922ac0..ba7ed8ed 100644
--- a/src/findbar.hh
+++ b/src/findbar.hh
@@ -9,22 +9,20 @@
 #include <fltk/Group.h>
 #include <fltk/CheckButton.h>
 
-using namespace fltk;
-
 /*
  * Searchbar to find text in page.
  */
-class Findbar : public Group {
-   Button *clrb;
-   HighlightButton *hide_btn, *next_btn, *prev_btn;
-   CheckButton *check_btn;
-   xpmImage *hideImg;
-   Input *i;
+class Findbar : public fltk::Group {
+   fltk::Button *clrb;
+   fltk::HighlightButton *hide_btn, *next_btn, *prev_btn;
+   fltk::CheckButton *check_btn;
+   fltk::xpmImage *hideImg;
+   fltk::Input *i;
 
-   static void search_cb (Widget *, void *);
-   static void searchBackwards_cb (Widget *, void *);
-   static void search_cb2 (Widget *, void *);
-   static void hide_cb (Widget *, void *);
+   static void search_cb (fltk::Widget *, void *);
+   static void searchBackwards_cb (fltk::Widget *, void *);
+   static void search_cb2 (fltk::Widget *, void *);
+   static void hide_cb (fltk::Widget *, void *);
 
 public:
    Findbar(int width, int height);
diff --git a/src/form.cc b/src/form.cc
index 920bc548..bf1b12e0 100644
--- a/src/form.cc
+++ b/src/form.cc
@@ -25,6 +25,7 @@
 #include "nav.h"
 #include "uicmd.hh"
 
+using namespace lout;
 using namespace dw;
 using namespace dw::core;
 using namespace dw::core::style;
diff --git a/src/html.cc b/src/html.cc
index 8c1a9519..51ac1543 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -58,6 +58,7 @@
 /*-----------------------------------------------------------------------------
  * Name spaces
  *---------------------------------------------------------------------------*/
+using namespace lout;
 using namespace dw;
 using namespace dw::core;
 using namespace dw::core::ui;
diff --git a/src/ui.hh b/src/ui.hh
index f77c6f6d..92297643 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -16,8 +16,6 @@
 
 #include "findbar.hh"
 
-using namespace fltk;
-
 typedef enum {
    UI_BACK = 0,
    UI_FORW,
@@ -48,15 +46,15 @@ class UI : public fltk::Group {
    CustTabGroup *Tabs;
    char *TabTooltip;
 
-   Group *TopGroup;
-   Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools,
+   fltk::Group *TopGroup;
+   fltk::Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools,
           *Clear, *Search, *FullScreen, *BugMeter, *FileButton;
-   Input  *Location;
-   PackedGroup *ProgBox;
+   fltk::Input  *Location;
+   fltk::PackedGroup *ProgBox;
    CustProgressBox *PProg, *IProg;
-   Group *Panel, *StatusPanel;
-   Widget *Main;
-   Output *Status;
+   fltk::Group *Panel, *StatusPanel;
+   fltk::Widget *Main;
+   fltk::Output *Status;
 
    int MainIdx;
    // Panel customization variables
@@ -67,13 +65,13 @@ class UI : public fltk::Group {
    Findbar *findbar;
    int PointerOnLink;
 
-   PackedGroup *make_toolbar(int tw, int th);
-   PackedGroup *make_location();
-   PackedGroup *make_progress_bars(int wide, int thin_up);
+   fltk::PackedGroup *make_toolbar(int tw, int th);
+   fltk::PackedGroup *make_location();
+   fltk::PackedGroup *make_progress_bars(int wide, int thin_up);
    void make_menubar(int x, int y, int w, int h);
-   Widget *make_filemenu_button();
-   Group *make_panel(int ww);
-   Group *make_status_panel(int ww);
+   fltk::Widget *make_filemenu_button();
+   fltk::Group *make_panel(int ww);
+   fltk::Group *make_status_panel(int ww);
 
 public: