diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index a0b0f30b..7f0697ad 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -1,5 +1,23 @@
 <?php
+namespace LAM\CONFIG;
 use \LAM\LIB\TWO_FACTOR\TwoFactorProviderService;
+use \LAMConfig;
+use \htmlTable;
+use \htmlTableExtendedInputField;
+use \htmlAccordion;
+use \htmlTableExtendedSelect;
+use \htmlFieldset;
+use \htmlSpacer;
+use \htmlTableExtendedInputCheckbox;
+use \DateTimeZone;
+use \htmlStatusMessage;
+use \htmlOutputText;
+use \htmlInputCheckbox;
+use \htmlHelpLink;
+use \htmlTableExtendedInputTextarea;
+use \htmlElement;
+use \htmlSubTitle;
+use \htmlButton;
 /*
 $Id$
 
diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php
index eb1ae7f1..dbcea370 100644
--- a/lam/templates/config/confsave.php
+++ b/lam/templates/config/confsave.php
@@ -1,9 +1,11 @@
 <?php
+namespace LAM\CONFIG;
+use \LAMConfig;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2009  Roland Gruber
+  Copyright (C) 2009 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index 3db14b08..aebc3c40 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -1,9 +1,32 @@
 <?php
+namespace LAM\CONFIG;
+use \LAMCfgMain;
+use \htmlTable;
+use \htmlTitle;
+use \htmlStatusMessage;
+use \htmlSubTitle;
+use \htmlTableExtendedInputTextarea;
+use \htmlSpacer;
+use \htmlTableExtendedSelect;
+use \htmlOutputText;
+use \htmlTableExtendedInputCheckbox;
+use \htmlLink;
+use \htmlGroup;
+use \htmlButton;
+use \htmlHelpLink;
+use \htmlInputField;
+use \htmlInputFileUpload;
+use \htmlEqualWidth;
+use \htmlTableExtendedRadio;
+use \htmlHiddenInput;
+use \htmlTableExtendedInputField;
+use \DateTime;
+use \DateTimeZone;
 /*
 $Id$
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2016  Roland Gruber
+  Copyright (C) 2003 - 2017  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by