6 files changed, 4 insertions, 16 deletions
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index f9bf52ed23b0..5e829066b32c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBTYPEWIZDLG_HXX
-#define DBAUI_DBTYPEWIZDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
@@ -62,6 +60,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBTYPEWIZDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 39a3fa68bc10..8de36e74dfeb 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
@@ -66,6 +64,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBTYPEWIZDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 0e78b271d924..3b5c2bf496af 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index edd0c4b048f5..b62bca4c7b44 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 32ddcdc07a2c..09beb95f3720 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 53f4f17f6bae..b4ae0a336f44 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -20,9 +20,7 @@
 #include "dbustrings.hrc"
 #include <toolkit/awt/vclxwindow.hxx>
 #include "dbu_reghelper.hxx"
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 #include "dbadmin.hxx"
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>