diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/Packets/DefaultBundle/EthernetPacket.cc
index 99e61bb1f2b7e5a868721cdabb3486b0177da929..9720986bde19e6b7f88fe1fa31fb0f701911c8c1 100644
--- a/Packets/DefaultBundle/EthernetPacket.cc
+++ b/Packets/DefaultBundle/EthernetPacket.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief EthernetPacket non-inline non-template implementation */
 
 #include "EthernetPacket.hh"
 //#include "EthernetPacket.ih"
diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index 2bc9fb6054e9f66f9b02cc99de1f3203407d4dfb..7cd5347ec3f79613e02c8e22ed0bc90d74e112a1 100644
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief EthernetPacket public header */
+
 #ifndef HH_EthernetPacket_
 #define HH_EthernetPacket_ 1
 
diff --git a/Packets/DefaultBundle/IpV4Packet.cc b/Packets/DefaultBundle/IpV4Packet.cc
index 42413793b705f0f4112b843ed8b1571d68310945..aa5018c9cf967e3ca6d64e68a06208692065519a 100644
--- a/Packets/DefaultBundle/IpV4Packet.cc
+++ b/Packets/DefaultBundle/IpV4Packet.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief IpV4Packet non-inline non-template implementation */
 
 #include "IpV4Packet.hh"
 //#include "IpV4Packet.ih"
diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh
index 9d451c56402cdaee61a9c37d1448e5aa3e94a5ca..773345eb77226210b28812fdb43c24f348bb63b6 100644
--- a/Packets/DefaultBundle/IpV4Packet.hh
+++ b/Packets/DefaultBundle/IpV4Packet.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief IpV4Packet public header */
+
 #ifndef HH_IpV4Packet_
 #define HH_IpV4Packet_ 1
 
diff --git a/Packets/DefaultBundle/UDPPacket.cc b/Packets/DefaultBundle/UDPPacket.cc
index 4b6fe1e9ce104cfb5466a00a0f727fc9133333f1..6f30ea4fb1fb5267bdf62d460748c327815c6e2b 100644
--- a/Packets/DefaultBundle/UDPPacket.cc
+++ b/Packets/DefaultBundle/UDPPacket.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file 
+    \brief UDPPacket non-inline non-template implementation */
 
 #include "UDPPacket.hh"
 //#include "UDPPacket.ih"
diff --git a/Packets/DefaultBundle/UDPPacket.hh b/Packets/DefaultBundle/UDPPacket.hh
index 5ea93db33ef6fd6dae0e2017a7ea56ee003d2d55..560c36075c6cd18898fcb78f3d92f103aef89345 100644
--- a/Packets/DefaultBundle/UDPPacket.hh
+++ b/Packets/DefaultBundle/UDPPacket.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief UDPPacket public header */
+
 #ifndef HH_UDPPacket_
 #define HH_UDPPacket_ 1
 
diff --git a/Packets/MPEGDVBBundle/DSMCCSection.cc b/Packets/MPEGDVBBundle/DSMCCSection.cc
index f34ed9182c566727e40218e7e7a5cd5abb8a5654..b6092bb9c0d30ee78476678a38b534a9443b4125 100644
--- a/Packets/MPEGDVBBundle/DSMCCSection.cc
+++ b/Packets/MPEGDVBBundle/DSMCCSection.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief DSMCCSection non-inline non-template implementation */
 
 #include "DSMCCSection.hh"
 //#include "DSMCCSection.ih"
diff --git a/Packets/MPEGDVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh
index 70eeceaf318b2e7e9db8c12fee084dc0830059fd..5fe02fc8f29a86d0d1bf85bfb2e2d94f26adfd2f 100644
--- a/Packets/MPEGDVBBundle/DSMCCSection.hh
+++ b/Packets/MPEGDVBBundle/DSMCCSection.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief DSMCCSection public header */
+
 #ifndef HH_DSMCCSection_
 #define HH_DSMCCSection_ 1
 
diff --git a/Packets/MPEGDVBBundle/DatagramSection.cc b/Packets/MPEGDVBBundle/DatagramSection.cc
index d25f515bf1d8e15e3b2843280ff247b698566345..6df71f769f421cd6b99f22a89785988e2fdc4409 100644
--- a/Packets/MPEGDVBBundle/DatagramSection.cc
+++ b/Packets/MPEGDVBBundle/DatagramSection.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief DatagramSection non-inline non-template implementation */
 
 #include "DatagramSection.hh"
 //#include "DatagramSection.ih"
diff --git a/Packets/MPEGDVBBundle/DatagramSection.hh b/Packets/MPEGDVBBundle/DatagramSection.hh
index 467fdbd94ea94358e6390f3e7d7aaf91629d8bff..316dc177cd18f5dc8d13d021c6f67546b8d5c006 100644
--- a/Packets/MPEGDVBBundle/DatagramSection.hh
+++ b/Packets/MPEGDVBBundle/DatagramSection.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \brief
+    \file DatagramSection public header */
+
 #ifndef HH_DatagramSection_
 #define HH_DatagramSection_ 1
 
diff --git a/Packets/MPEGDVBBundle/TransportPacket.cc b/Packets/MPEGDVBBundle/TransportPacket.cc
index bd416fdcbb35579afe07bfcbed270af16cb7aecc..3f12c75f84f887aa36eebde92dd1f75739f936fc 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief TransportPacket non-inline non-template implementation */
 
 #include "TransportPacket.hh"
 //#include "TransportPacket.ih"
diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index 9a935b9e37c0061088a3964f20b33904b3135517..176e133a996646b37591e246685a6d979ef91d57 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief TransportPacket public header */
+
 #ifndef HH_TransportPacket_
 #define HH_TransportPacket_ 1
 
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/Socket/Protocols/DVB/DVBDemuxHandles.cc
index 8fda3496a8ea31b169d8d664c361cc3ab3903a61..2abb6f97e069a9e3955573c78fa7f24747f9fc72 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief xxx
- */
+    \brief DVBDemuxHandles non-inline non-template implementation */
 
 #include "DVBDemuxHandles.hh"
 //#include "DVBDemuxHandles.ih"
diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/Socket/Protocols/DVB/DVBDemuxHandles.hh
index 2c839e66db13d40ec1454127927169e899967f4f..4253abc4344986f5bdfd6d5fde59dd30a9ec4a4f 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.hh
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.hh
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DVBHandles
- */
+    \brief DVBDemuxHandles public header */
 
 #ifndef HH_DVBDemuxHandles_
 #define HH_DVBDemuxHandles_ 1
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.cc b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
index 141ab55e0dc6d6c3a8f46291c2c878de0ac365a4..a0eedefae2e0d0b3fb1f2e5cc1321ff62582d088 100644
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.cc
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief xxx
- */
+    \brief DVBDemuxProtocol non-inline non-template implementation */
 
 #include "DVBDemuxProtocol.hh"
 //#include "DVBDemuxProtocol.ih"
diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.hh b/Socket/Protocols/DVB/DVBDemuxProtocol.hh
index 49f87b84389e9a1a29cbec84fab0e89101c73ef6..2db7ccbeab12af8eb9e2c8b1abf3d0616d9a8dab 100644
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.hh
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.hh
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DVBProtocol public header
- */
+    \brief DVBDemuxProtocol public header */
 
 #ifndef HH_DVBDemuxProtocol_
 #define HH_DVBDemuxProtocol_ 1
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc
index b56fb840ff7ef0064fa87da277f8ffacab6f0a8b..0799ec3c2b02a1df85b99f869d0d88d0cbe0845f 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief xxx
- */
+    \brief DVBFrontendHandle non-inline non-template implementation */
 
 #include "DVBFrontendHandle.hh"
 //#include "DVBFrontendHandle.ih"
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh
index add8a45cc60662b268b2242a9023045cf4908c8a..219a6158c5ce0ab003fdb70645a4b2af9fbeeec4 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -21,8 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DVBHandles
- */
+    \brief DVBFrontendHandle public header */
 
 #ifndef HH_DVBFrontendHandle_
 #define HH_DVBFrontendHandle_ 1
diff --git a/Utils/SafeBool.cci b/Utils/SafeBool.cci
index 618be826a91d1d22375494bbe9b7584a63c9dab8..e3e336e1a589284d79919407ce45bc5e0e55a810 100644
--- a/Utils/SafeBool.cci
+++ b/Utils/SafeBool.cci
@@ -1,8 +1,25 @@
-// $Id$
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
 //
-// Copyright (C) 2006
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of inline non-template functions
+/** \file
+    \brief SafeBool inline non-template implementation */
 
 // Custom includes
 
diff --git a/Utils/SafeBool.cti b/Utils/SafeBool.cti
index a1d4bc094d1ae67924e61a8f7ff904dfd81b92e7..54f2521605b326c50f4655a4ba079ac2ea85dbc4 100644
--- a/Utils/SafeBool.cti
+++ b/Utils/SafeBool.cti
@@ -1,8 +1,25 @@
-// $Id$
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
 //
-// Copyright (C) 2006
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of inline template functions
+/** \file
+    \brief SafeBool inline template implementation */
 
 //#include "SafeBool.ih"
 
diff --git a/Utils/SafeBool.hh b/Utils/SafeBool.hh
index ff10e58bcb41be488688bbf09dc3512d7bdbe0fa..7781e1dfbb65ffbb6edd1efc9f79e305e101fda9 100644
--- a/Utils/SafeBool.hh
+++ b/Utils/SafeBool.hh
@@ -1,6 +1,25 @@
-// $Id$
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+//     Stefan Bund <g0dil@berlios.de>
 //
-// Copyright (C) 2006
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief SafeBool public header */
 
 #ifndef HH_SafeBool_
 #define HH_SafeBool_ 1
diff --git a/Utils/TypeIdValue.cci b/Utils/TypeIdValue.cci
index 94cb5deaf847b51e5c6ee183b3872f02cc7f1ae0..9b5a0bfcf2df26497ffb71f6159e5e4b684ac90b 100644
--- a/Utils/TypeIdValue.cci
+++ b/Utils/TypeIdValue.cci
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of inline non-template functions
+/** \file
+    \brief TypeIdValue inline non-template implementation */
 
 //#include "TypeIdValue.ih"
 
diff --git a/Utils/TypeIdValue.cti b/Utils/TypeIdValue.cti
index 5cb61a7e58846e595b6c3717e1a0d3c66b5d7fef..486f41efc186510655f61131ec4fe0147366b357 100644
--- a/Utils/TypeIdValue.cti
+++ b/Utils/TypeIdValue.cti
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of inline template functions
+/** \file
+    \brief TypeIdValue inline template implementation */
 
 //#include "TypeIdValue.ih"
 
diff --git a/Utils/TypeIdValue.hh b/Utils/TypeIdValue.hh
index 61bcdd1d63a842d248dd9d8a99fa7a13f4b1aad9..1f261befb729c1073992585c61adecefc2e2b8a9 100644
--- a/Utils/TypeIdValue.hh
+++ b/Utils/TypeIdValue.hh
@@ -20,6 +20,9 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/** \file
+    \brief TypeIdValue public header */
+
 #ifndef HH_TypeIdValue_
 #define HH_TypeIdValue_ 1
 
diff --git a/senf.dict b/senf.dict
index 973468e4d95b2cab4203b43ee9b38b7e56ace418..6aa064597c82a1aa44b91e366b3995233ac489ec 100644
--- a/senf.dict
+++ b/senf.dict
@@ -55,6 +55,7 @@ ingroup
 init
 initHeadSize
 initSize
+inline
 Institut
 Int
 IntField