diff --git a/src/gui/InterfaceEditorWidget.cpp b/src/gui/InterfaceEditorWidget.cpp
index c8fcd5766..f1f86b0e3 100644
--- a/src/gui/InterfaceEditorWidget.cpp
+++ b/src/gui/InterfaceEditorWidget.cpp
@@ -2,7 +2,7 @@
 
                           Firewall Builder
 
-                 Copyright (C) 2003 NetCitadel, LLC
+                 Copyright (C) 2009 NetCitadel, LLC
 
   Author:  Roman Bovsunivkiy     a2k0001@gmail.com
 
@@ -27,6 +27,8 @@
 #include "ui_InterfaceEditorWidget.h"
 #include "fwbuilder/IPv4.h"
 
+using namespace libfwbuilder;
+
 InterfaceEditorWidget::InterfaceEditorWidget(QWidget *parent, Interface *interface) :
     QWidget(parent),
     m_ui(new Ui::InterfaceEditorWidget)
diff --git a/src/gui/InterfaceEditorWidget.h b/src/gui/InterfaceEditorWidget.h
index 7c71dfb1e..00838f73c 100644
--- a/src/gui/InterfaceEditorWidget.h
+++ b/src/gui/InterfaceEditorWidget.h
@@ -2,7 +2,7 @@
 
                           Firewall Builder
 
-                 Copyright (C) 2003 NetCitadel, LLC
+                 Copyright (C) 2009 NetCitadel, LLC
 
   Author:  Roman Bovsunivkiy     a2k0001@gmail.com
 
@@ -45,8 +45,6 @@
 
 #include "fwbuilder/Interface.h"
 
-using namespace libfwbuilder;
-
 namespace Ui {
     class InterfaceEditorWidget;
 }
@@ -63,11 +61,11 @@ struct AddressInfo
 class InterfaceEditorWidget : public QWidget {
     Q_OBJECT
 public:
-    InterfaceEditorWidget(QWidget *parent, Interface *interface);
-    InterfaceEditorWidget(QWidget *parent, InterfaceData* data);
+    InterfaceEditorWidget(QWidget *parent, libfwbuilder::Interface *interface);
+    InterfaceEditorWidget(QWidget *parent, libfwbuilder::InterfaceData* data);
     InterfaceEditorWidget(QWidget *parent);
     ~InterfaceEditorWidget();
-    Interface* getInterface();
+    libfwbuilder::Interface* getInterface();
     EditedInterfaceData getInterfaceData();
     bool isValid();
 
@@ -77,12 +75,12 @@ protected:
 private:
     QTabWidget *tabw;
     QToolButton *addAddr, *delAddr;
-    Interface *interface;
+    libfwbuilder::Interface *interface;
     Ui::InterfaceEditorWidget *m_ui;
     QMap<QPushButton*, QPair<QTableWidgetItem*, QTableWidgetItem*> > buttons;
     QMap<int, QPair<QTableWidgetItem*, QTableWidgetItem*> > rows;
     QMap<int, QComboBox*> types;
-    QMap<int, Address*> fwaddrs;
+    QMap<int, libfwbuilder::Address*> fwaddrs;
     bool validateAddress(const QString &addr, const QString &netm, bool regular);
 
 public slots:
diff --git a/src/gui/InterfacesTabWidget.cpp b/src/gui/InterfacesTabWidget.cpp
index 92143e5eb..9aa2702ae 100644
--- a/src/gui/InterfacesTabWidget.cpp
+++ b/src/gui/InterfacesTabWidget.cpp
@@ -2,7 +2,7 @@
 
                           Firewall Builder
 
-                 Copyright (C) 2003 NetCitadel, LLC
+                 Copyright (C) 2009 NetCitadel, LLC
 
   Author:  Roman Bovsunivkiy     a2k0001@gmail.com
 
@@ -26,6 +26,8 @@
 #include "InterfacesTabWidget.h"
 #include "ui_InterfacesTabWidget.h"
 
+using namespace libfwbuilder;
+
 InterfacesTabWidget::InterfacesTabWidget(QWidget *parent) :
     QTabWidget(parent),
     m_ui(new Ui::InterfacesTabWidget)
diff --git a/src/gui/InterfacesTabWidget.h b/src/gui/InterfacesTabWidget.h
index b273d7af6..342c15eec 100644
--- a/src/gui/InterfacesTabWidget.h
+++ b/src/gui/InterfacesTabWidget.h
@@ -2,7 +2,7 @@
 
                           Firewall Builder
 
-                 Copyright (C) 2003 NetCitadel, LLC
+                 Copyright (C) 2009 NetCitadel, LLC
 
   Author:  Roman Bovsunivkiy     a2k0001@gmail.com
 
@@ -40,8 +40,6 @@
 #include "fwbuilder/FWObjectDatabase.h"
 #include "InterfaceEditorWidget.h"
 
-using namespace libfwbuilder;
-
 namespace Ui {
     class InterfacesTabWidget;
 }
@@ -56,7 +54,7 @@ struct EditedInterfaceData
     QString comment;
     QString mac;
     int type; // 0 - regular, 1 - dynamic, 2 - unnumbered
-    QMultiMap<Address*, AddressInfo > addresses;
+    QMultiMap<libfwbuilder::Address*, AddressInfo > addresses;
 };
 
 class InterfacesTabWidget : public QTabWidget {
@@ -64,9 +62,9 @@ class InterfacesTabWidget : public QTabWidget {
 public:
     InterfacesTabWidget(QWidget *parent = 0);
     ~InterfacesTabWidget();
-    QMap<Interface*, EditedInterfaceData> getData();
+    QMap<libfwbuilder::Interface*, EditedInterfaceData> getData();
     QList<EditedInterfaceData> getNewData();
-    QList<Interface*> getDeletedInterfaces();
+    QList<libfwbuilder::Interface*> getDeletedInterfaces();
     bool isValid();
     void setCornerWidgetsVisible(bool);
 
@@ -79,16 +77,16 @@ private:
     QToolButton *delInterface;
     QWidget newInterfaceWidget;
     QHBoxLayout newInterfaceLayout;
-    FWObject *currentTemplate;
-    QList<Interface*> deleted;
+    libfwbuilder::FWObject *currentTemplate;
+    QList<libfwbuilder::Interface*> deleted;
 
 public slots:
-    void addInterface(Interface*);
+    void addInterface(libfwbuilder::Interface*);
     void clear();
     void addNewInterface();
-    void setTemplate(FWObject*);
+    void setTemplate(libfwbuilder::FWObject*);
     void closeTab();
-    void addInterface(InterfaceData*);
+    void addInterface(libfwbuilder::InterfaceData*);
 
 };