From 63e586abed441a6185238140c9e4810db27c13c3 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Thu, 5 Jan 2006 15:07:34 +0000
Subject: [PATCH] using correct ifndef in the header files

---
 zypp/solver/detail/Channel.h                      | 6 +++---
 zypp/solver/detail/ChannelPtr.h                   | 6 +++---
 zypp/solver/detail/Hash.h                         | 6 +++---
 zypp/solver/detail/Importance.h                   | 6 +++---
 zypp/solver/detail/Match.h                        | 6 +++---
 zypp/solver/detail/MatchPtr.h                     | 6 +++---
 zypp/solver/detail/MultiWorld.h                   | 6 +++---
 zypp/solver/detail/MultiWorldPtr.h                | 6 +++---
 zypp/solver/detail/Package.h                      | 6 +++---
 zypp/solver/detail/PackagePtr.h                   | 6 +++---
 zypp/solver/detail/PackageUpdate.h                | 6 +++---
 zypp/solver/detail/PackageUpdatePtr.h             | 6 +++---
 zypp/solver/detail/Packman.h                      | 6 +++---
 zypp/solver/detail/PackmanPtr.h                   | 6 +++---
 zypp/solver/detail/Pending.h                      | 6 +++---
 zypp/solver/detail/PendingPtr.h                   | 6 +++---
 zypp/solver/detail/QueueItem.h                    | 6 +++---
 zypp/solver/detail/QueueItemBranch.h              | 6 +++---
 zypp/solver/detail/QueueItemBranchPtr.h           | 6 +++---
 zypp/solver/detail/QueueItemConflict.cc           | 4 ++--
 zypp/solver/detail/QueueItemConflict.h            | 6 +++---
 zypp/solver/detail/QueueItemConflictPtr.h         | 6 +++---
 zypp/solver/detail/QueueItemGroup.h               | 6 +++---
 zypp/solver/detail/QueueItemGroupPtr.h            | 6 +++---
 zypp/solver/detail/QueueItemInstall.h             | 6 +++---
 zypp/solver/detail/QueueItemInstallPtr.h          | 6 +++---
 zypp/solver/detail/QueueItemPtr.h                 | 6 +++---
 zypp/solver/detail/QueueItemRequire.h             | 6 +++---
 zypp/solver/detail/QueueItemRequirePtr.h          | 6 +++---
 zypp/solver/detail/QueueItemUninstall.h           | 6 +++---
 zypp/solver/detail/QueueItemUninstallPtr.h        | 6 +++---
 zypp/solver/detail/ResItem.h                      | 6 +++---
 zypp/solver/detail/ResItemAndDependency.h         | 6 +++---
 zypp/solver/detail/ResItemAndDependencyPtr.h      | 6 +++---
 zypp/solver/detail/ResItemPtr.h                   | 6 +++---
 zypp/solver/detail/Resolver.h                     | 6 +++---
 zypp/solver/detail/ResolverContext.h              | 6 +++---
 zypp/solver/detail/ResolverContextPtr.h           | 6 +++---
 zypp/solver/detail/ResolverInfo.h                 | 6 +++---
 zypp/solver/detail/ResolverInfoChildOf.h          | 6 +++---
 zypp/solver/detail/ResolverInfoChildOfPtr.h       | 6 +++---
 zypp/solver/detail/ResolverInfoConflictsWith.h    | 6 +++---
 zypp/solver/detail/ResolverInfoConflictsWithPtr.h | 6 +++---
 zypp/solver/detail/ResolverInfoContainer.h        | 6 +++---
 zypp/solver/detail/ResolverInfoContainerPtr.h     | 6 +++---
 zypp/solver/detail/ResolverInfoDependsOn.h        | 6 +++---
 zypp/solver/detail/ResolverInfoDependsOnPtr.h     | 6 +++---
 zypp/solver/detail/ResolverInfoMisc.h             | 6 +++---
 zypp/solver/detail/ResolverInfoMiscPtr.h          | 6 +++---
 zypp/solver/detail/ResolverInfoMissingReq.h       | 6 +++---
 zypp/solver/detail/ResolverInfoMissingReqPtr.h    | 6 +++---
 zypp/solver/detail/ResolverInfoNeededBy.h         | 6 +++---
 zypp/solver/detail/ResolverInfoNeededByPtr.h      | 6 +++---
 zypp/solver/detail/ResolverInfoObsoletes.h        | 6 +++---
 zypp/solver/detail/ResolverInfoObsoletesPtr.h     | 6 +++---
 zypp/solver/detail/ResolverInfoPtr.h              | 6 +++---
 zypp/solver/detail/ResolverPtr.h                  | 6 +++---
 zypp/solver/detail/ResolverQueue.h                | 6 +++---
 zypp/solver/detail/ResolverQueuePtr.h             | 6 +++---
 zypp/solver/detail/Section.h                      | 6 +++---
 zypp/solver/detail/ServiceWorld.h                 | 6 +++---
 zypp/solver/detail/ServiceWorldPtr.h              | 6 +++---
 zypp/solver/detail/Spec.h                         | 6 +++---
 zypp/solver/detail/SpecPtr.h                      | 6 +++---
 zypp/solver/detail/StoreWorld.h                   | 6 +++---
 zypp/solver/detail/StoreWorldPtr.h                | 6 +++---
 zypp/solver/detail/Subscription.h                 | 6 +++---
 zypp/solver/detail/UndumpWorld.h                  | 6 +++---
 zypp/solver/detail/UndumpWorldPtr.h               | 6 +++---
 zypp/solver/detail/World.h                        | 6 +++---
 zypp/solver/detail/WorldPtr.h                     | 6 +++---
 zypp/solver/detail/XmlNode.h                      | 6 +++---
 zypp/solver/detail/XmlNodePtr.h                   | 6 +++---
 zypp/solver/detail/XmlParser.h                    | 6 +++---
 zypp/solver/detail/extract.h                      | 6 +++---
 zypp/solver/detail/libzypp_solver.h               | 6 +++---
 76 files changed, 227 insertions(+), 227 deletions(-)

diff --git a/zypp/solver/detail/Channel.h b/zypp/solver/detail/Channel.h
index 9afdf92..0fcec1d 100644
--- a/zypp/solver/detail/Channel.h
+++ b/zypp/solver/detail/Channel.h
@@ -22,8 +22,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Channel_h
-#define _Channel_h
+#ifndef ZYPP_SOLVER_DETAIL_CHANNEL_H
+#define ZYPP_SOLVER_DETAIL_CHANNEL_H
 
 #include <iosfwd>
 #include <string>
@@ -219,4 +219,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _Channel_h
+#endif // ZYPP_SOLVER_DETAIL_CHANNEL_H
diff --git a/zypp/solver/detail/ChannelPtr.h b/zypp/solver/detail/ChannelPtr.h
index 2167991..27c8ec8 100644
--- a/zypp/solver/detail/ChannelPtr.h
+++ b/zypp/solver/detail/ChannelPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Channel_Ptr_h
-#define _Channel_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_CHANNEL_PTR_H
+#define ZYPP_SOLVER_DETAIL_CHANNEL_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -48,4 +48,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 ////////////////////////////////////////////////////////////////////////
-#endif // _Channel_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_CHANNEL_PTR_H
diff --git a/zypp/solver/detail/Hash.h b/zypp/solver/detail/Hash.h
index 30669d8..3c83845 100644
--- a/zypp/solver/detail/Hash.h
+++ b/zypp/solver/detail/Hash.h
@@ -17,8 +17,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Hash_h
-#define _Hash_h
+#ifndef ZYPP_SOLVER_DETAIL_HASH_H
+#define ZYPP_SOLVER_DETAIL_HASH_H
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
@@ -42,4 +42,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Hash_h
+#endif // ZYPP_SOLVER_DETAIL_HASH_H
diff --git a/zypp/solver/detail/Importance.h b/zypp/solver/detail/Importance.h
index 9eb22d0..906b742 100644
--- a/zypp/solver/detail/Importance.h
+++ b/zypp/solver/detail/Importance.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Importance_h
-#define _Importance_h
+#ifndef ZYPP_SOLVER_DETAIL_IMPORTANCE_H
+#define ZYPP_SOLVER_DETAIL_IMPORTANCE_H
 
 #include <iosfwd>
 #include <string>
@@ -105,4 +105,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Importance_h
+#endif // ZYPP_SOLVER_DETAIL_IMPORTANCE_H
diff --git a/zypp/solver/detail/Match.h b/zypp/solver/detail/Match.h
index 6b341a2..5157adf 100644
--- a/zypp/solver/detail/Match.h
+++ b/zypp/solver/detail/Match.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Match_h
-#define _Match_h
+#ifndef ZYPP_SOLVER_DETAIL_MATCH_H
+#define ZYPP_SOLVER_DETAIL_MATCH_H
 
 #include <iosfwd>
 #include <string>
@@ -125,4 +125,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Match_h
+#endif // ZYPP_SOLVER_DETAIL_MATCH_H
diff --git a/zypp/solver/detail/MatchPtr.h b/zypp/solver/detail/MatchPtr.h
index ca59e2e..4ccc55a 100644
--- a/zypp/solver/detail/MatchPtr.h
+++ b/zypp/solver/detail/MatchPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Match_Ptr_h
-#define _Match_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_MATCH_PTR_H
+#define ZYPP_SOLVER_DETAIL_MATCH_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -49,4 +49,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Match_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_MATCH_PTR_H
diff --git a/zypp/solver/detail/MultiWorld.h b/zypp/solver/detail/MultiWorld.h
index 147220d..5a83c02 100644
--- a/zypp/solver/detail/MultiWorld.h
+++ b/zypp/solver/detail/MultiWorld.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _MultiWorld_h
-#define _MultiWorld_h
+#ifndef ZYPP_SOLVER_DETAIL_MULTIWORLD_H
+#define ZYPP_SOLVER_DETAIL_MULTIWORLD_H
 
 #include <iosfwd>
 #include <string>
@@ -137,4 +137,4 @@ class MultiWorld : public World {
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _MultiWorld_h
+#endif // ZYPP_SOLVER_DETAIL_MULTIWORLD_H
diff --git a/zypp/solver/detail/MultiWorldPtr.h b/zypp/solver/detail/MultiWorldPtr.h
index fee4236..fe93d2b 100644
--- a/zypp/solver/detail/MultiWorldPtr.h
+++ b/zypp/solver/detail/MultiWorldPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _MultiWorld_Ptr_h
-#define _MultiWorld_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_MULTIWORLD_PTR_H
+#define ZYPP_SOLVER_DETAIL_MULTIWORLD_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/WorldPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _MultiWorld_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_MULTIWORLD_PTR_H
diff --git a/zypp/solver/detail/Package.h b/zypp/solver/detail/Package.h
index e772726..1ddca90 100644
--- a/zypp/solver/detail/Package.h
+++ b/zypp/solver/detail/Package.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Package_h
-#define _Package_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKAGE_H
+#define ZYPP_SOLVER_DETAIL_PACKAGE_H
 
 #include <list>
 #include <iosfwd>
@@ -162,4 +162,4 @@ class Package : public ResItem {
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _Package_h
+#endif // ZYPP_SOLVER_DETAIL_PACKAGE_H
diff --git a/zypp/solver/detail/PackagePtr.h b/zypp/solver/detail/PackagePtr.h
index 44722f8..c610572 100644
--- a/zypp/solver/detail/PackagePtr.h
+++ b/zypp/solver/detail/PackagePtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Package_Ptr_h
-#define _Package_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKAGE_PTR_H
+#define ZYPP_SOLVER_DETAIL_PACKAGE_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResItemPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////      
 
 
-#endif // _Package_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_PACKAGE_PTR_H
diff --git a/zypp/solver/detail/PackageUpdate.h b/zypp/solver/detail/PackageUpdate.h
index ab9c14c..2433e9f 100644
--- a/zypp/solver/detail/PackageUpdate.h
+++ b/zypp/solver/detail/PackageUpdate.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _PackageUpdate_h
-#define _PackageUpdate_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_H
+#define ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_H
 
 #include <list>
 #include <iosfwd>
@@ -147,4 +147,4 @@ class PackageUpdate : public Spec {
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _PackageUpdate_h
+#endif // ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_H
diff --git a/zypp/solver/detail/PackageUpdatePtr.h b/zypp/solver/detail/PackageUpdatePtr.h
index 629c361..7db0b3e 100644
--- a/zypp/solver/detail/PackageUpdatePtr.h
+++ b/zypp/solver/detail/PackageUpdatePtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _PackageUpdate_Ptr_h
-#define _PackageUpdate_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_PTR_H
+#define ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -48,4 +48,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _PackageUpdate_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_PACKAGEUPDATE_PTR_H
diff --git a/zypp/solver/detail/Packman.h b/zypp/solver/detail/Packman.h
index 5892577..55e6acb 100644
--- a/zypp/solver/detail/Packman.h
+++ b/zypp/solver/detail/Packman.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Packman_h
-#define _Packman_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKMAN_H
+#define ZYPP_SOLVER_DETAIL_PACKMAN_H
 
 #include <iosfwd>
 #include <list>
@@ -84,4 +84,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _Packman_h
+#endif // ZYPP_SOLVER_DETAIL_PACKMAN_H
diff --git a/zypp/solver/detail/PackmanPtr.h b/zypp/solver/detail/PackmanPtr.h
index 80e9b80..65c631d 100644
--- a/zypp/solver/detail/PackmanPtr.h
+++ b/zypp/solver/detail/PackmanPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Packman_Ptr_h
-#define _Packman_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_PACKMAN_PTR_H
+#define ZYPP_SOLVER_DETAIL_PACKMAN_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -48,4 +48,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _Packman_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_PACKMAN_PTR_H
diff --git a/zypp/solver/detail/Pending.h b/zypp/solver/detail/Pending.h
index aca753b..9ef9b1d 100644
--- a/zypp/solver/detail/Pending.h
+++ b/zypp/solver/detail/Pending.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Pending_h
-#define _Pending_h
+#ifndef ZYPP_SOLVER_DETAIL_PENDING_H
+#define ZYPP_SOLVER_DETAIL_PENDING_H
 
 #include <iosfwd>
 #include <list>
@@ -159,4 +159,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Pending_h
+#endif // ZYPP_SOLVER_DETAIL_PENDING_H
diff --git a/zypp/solver/detail/PendingPtr.h b/zypp/solver/detail/PendingPtr.h
index 98d96d8..a4b1284 100644
--- a/zypp/solver/detail/PendingPtr.h
+++ b/zypp/solver/detail/PendingPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Pending_Ptr_h
-#define _Pending_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_PENDING_PTR_H
+#define ZYPP_SOLVER_DETAIL_PENDING_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 /////////////////////////////////////////////////////////////////////////
@@ -48,4 +48,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////        
 
-#endif // _Pending_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_PENDING_PTR_H
diff --git a/zypp/solver/detail/QueueItem.h b/zypp/solver/detail/QueueItem.h
index de5b553..16cd239 100644
--- a/zypp/solver/detail/QueueItem.h
+++ b/zypp/solver/detail/QueueItem.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItem_h
-#define _QueueItem_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEM_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEM_H
 
 #include <iosfwd>
 #include <list>
@@ -142,4 +142,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _QueueItem_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEM_H
diff --git a/zypp/solver/detail/QueueItemBranch.h b/zypp/solver/detail/QueueItemBranch.h
index e797dd2..809ea52 100644
--- a/zypp/solver/detail/QueueItemBranch.h
+++ b/zypp/solver/detail/QueueItemBranch.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemBranch_h
-#define _QueueItemBranch_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_H
 
 #include <iosfwd>
 #include <list>
@@ -97,4 +97,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemBranch_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_H
diff --git a/zypp/solver/detail/QueueItemBranchPtr.h b/zypp/solver/detail/QueueItemBranchPtr.h
index 3b6349c..8a5c5f4 100644
--- a/zypp/solver/detail/QueueItemBranchPtr.h
+++ b/zypp/solver/detail/QueueItemBranchPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemBranch_Ptr_h
-#define _QueueItemBranch_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemBranch_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMBRANCH_PTR_H
diff --git a/zypp/solver/detail/QueueItemConflict.cc b/zypp/solver/detail/QueueItemConflict.cc
index 69151a4..04076f2 100644
--- a/zypp/solver/detail/QueueItemConflict.cc
+++ b/zypp/solver/detail/QueueItemConflict.cc
@@ -178,8 +178,8 @@ namespace zypp
                                                 Rel::EQ,
                                                 resItem->edition());
 
-          if (info->actually_an_obsolete
-              && capTest != cap)
+          if (info->actually_an_obsolete)
+//              && !capTest.matches (cap))
           {
               return true;
           }
diff --git a/zypp/solver/detail/QueueItemConflict.h b/zypp/solver/detail/QueueItemConflict.h
index bf9aeb5..433f312 100644
--- a/zypp/solver/detail/QueueItemConflict.h
+++ b/zypp/solver/detail/QueueItemConflict.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemConflict_h
-#define _QueueItemConflict_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_H
 
 #include <iosfwd>
 #include <list>
@@ -95,4 +95,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemConflict_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_H
diff --git a/zypp/solver/detail/QueueItemConflictPtr.h b/zypp/solver/detail/QueueItemConflictPtr.h
index b4f1cd7..c54895e 100644
--- a/zypp/solver/detail/QueueItemConflictPtr.h
+++ b/zypp/solver/detail/QueueItemConflictPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemConflict_Ptr_h
-#define _QueueItemConflict_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemConflict_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMCONFLICT_PTR_H
diff --git a/zypp/solver/detail/QueueItemGroup.h b/zypp/solver/detail/QueueItemGroup.h
index ecdfd78..9793ded 100644
--- a/zypp/solver/detail/QueueItemGroup.h
+++ b/zypp/solver/detail/QueueItemGroup.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemGroup_h
-#define _QueueItemGroup_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_H
 
 #include <iosfwd>
 #include <list>
@@ -89,4 +89,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemGroup_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_H
diff --git a/zypp/solver/detail/QueueItemGroupPtr.h b/zypp/solver/detail/QueueItemGroupPtr.h
index f92c1c2..6d27078 100644
--- a/zypp/solver/detail/QueueItemGroupPtr.h
+++ b/zypp/solver/detail/QueueItemGroupPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemGroup_Ptr_h
-#define _QueueItemGroup_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 ////////////////////////////////////////////////////////////////////////
 
-#endif // _QueueItemGroup_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMGROUP_PTR_H
diff --git a/zypp/solver/detail/QueueItemInstall.h b/zypp/solver/detail/QueueItemInstall.h
index 1e88feb..cb95770 100644
--- a/zypp/solver/detail/QueueItemInstall.h
+++ b/zypp/solver/detail/QueueItemInstall.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemInstall_h
-#define _QueueItemInstall_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_H
 
 #include <iosfwd>
 #include <list>
@@ -113,4 +113,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _QueueItem_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_H
diff --git a/zypp/solver/detail/QueueItemInstallPtr.h b/zypp/solver/detail/QueueItemInstallPtr.h
index fdbe2bb..8c3e08c 100644
--- a/zypp/solver/detail/QueueItemInstallPtr.h
+++ b/zypp/solver/detail/QueueItemInstallPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemInstall_Ptr_h
-#define _QueueItemInstall_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemInstall_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMINSTALL_PTR_H
diff --git a/zypp/solver/detail/QueueItemPtr.h b/zypp/solver/detail/QueueItemPtr.h
index 635e41b..f227519 100644
--- a/zypp/solver/detail/QueueItemPtr.h
+++ b/zypp/solver/detail/QueueItemPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItem_Ptr_h
-#define _QueueItem_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEM_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEM_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -48,4 +48,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItem_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEM_PTR_H
diff --git a/zypp/solver/detail/QueueItemRequire.h b/zypp/solver/detail/QueueItemRequire.h
index 9d3c3b5..88a9ec0 100644
--- a/zypp/solver/detail/QueueItemRequire.h
+++ b/zypp/solver/detail/QueueItemRequire.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemRequire_h
-#define _QueueItemRequire_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_H
 
 #include <iosfwd>
 #include <list>
@@ -103,4 +103,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _QueueItemRequire_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_H
diff --git a/zypp/solver/detail/QueueItemRequirePtr.h b/zypp/solver/detail/QueueItemRequirePtr.h
index 77a4102..38d9735 100644
--- a/zypp/solver/detail/QueueItemRequirePtr.h
+++ b/zypp/solver/detail/QueueItemRequirePtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemRequire_Ptr_h
-#define _QueueItemRequire_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemRequire_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMREQUIRE_PTR_H
diff --git a/zypp/solver/detail/QueueItemUninstall.h b/zypp/solver/detail/QueueItemUninstall.h
index c811ddf..5e96d1e 100644
--- a/zypp/solver/detail/QueueItemUninstall.h
+++ b/zypp/solver/detail/QueueItemUninstall.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemUninstall_h
-#define _QueueItemUninstall_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUITEMUNINSTALL_H
+#define ZYPP_SOLVER_DETAIL_QUEUITEMUNINSTALL_H
 
 #include <iosfwd>
 #include <list>
@@ -106,4 +106,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _QueueItemUninstall_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUITEMUNINSTALL_H
diff --git a/zypp/solver/detail/QueueItemUninstallPtr.h b/zypp/solver/detail/QueueItemUninstallPtr.h
index 2c6a773..f2d4a7b 100644
--- a/zypp/solver/detail/QueueItemUninstallPtr.h
+++ b/zypp/solver/detail/QueueItemUninstallPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _QueueItemUninstall_Ptr_h
-#define _QueueItemUninstall_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_QUEUEITEMUNINSTALL_PTR_H
+#define ZYPP_SOLVER_DETAIL_QUEUEITEMUNINSTALL_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/QueueItemPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _QueueItemUninstall_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_QUEUEITEMUNINSTALL_PTR_H
diff --git a/zypp/solver/detail/ResItem.h b/zypp/solver/detail/ResItem.h
index 6b27806..1956dea 100644
--- a/zypp/solver/detail/ResItem.h
+++ b/zypp/solver/detail/ResItem.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResItem_h
-#define _ResItem_h
+#ifndef ZYPP_SOLVER_DETAIL_RESITEM_H
+#define ZYPP_SOLVER_DETAIL_RESITEM_H
 
 #include <list>
 #include <set>
@@ -168,4 +168,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResItem_h
+#endif // ZYPP_SOLVER_DETAIL_RESITEM_H
diff --git a/zypp/solver/detail/ResItemAndDependency.h b/zypp/solver/detail/ResItemAndDependency.h
index 3adaad1..3c8b39c 100644
--- a/zypp/solver/detail/ResItemAndDependency.h
+++ b/zypp/solver/detail/ResItemAndDependency.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResItemAndDependency_h
-#define _ResItemAndDependency_h
+#ifndef ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_H
+#define ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_H
 
 #include <iosfwd>
 #include <string>
@@ -98,4 +98,4 @@ typedef std::multimap<const std::string, ResItem_constPtr> ResItemTable;
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResItemAndDependency_h
+#endif // ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_H
diff --git a/zypp/solver/detail/ResItemAndDependencyPtr.h b/zypp/solver/detail/ResItemAndDependencyPtr.h
index 1d92432..4a157da 100644
--- a/zypp/solver/detail/ResItemAndDependencyPtr.h
+++ b/zypp/solver/detail/ResItemAndDependencyPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResItemAndDependency_Ptr_h
-#define _ResItemAndDependency_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/WorldPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResItemAndDependency_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESITEMANDDEPENDENCY_PTR_H
diff --git a/zypp/solver/detail/ResItemPtr.h b/zypp/solver/detail/ResItemPtr.h
index 7596d18..c82b256 100644
--- a/zypp/solver/detail/ResItemPtr.h
+++ b/zypp/solver/detail/ResItemPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResItem_Ptr_h
-#define _ResItem_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESITEM_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESITEM_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/SpecPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResItem_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESITEM_PTR_H
diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index 7996cc6..fd62fd1 100644
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Resolver_h
-#define _Resolver_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVER_H
+#define ZYPP_SOLVER_DETAIL_RESOLVER_H
 
 #include <iosfwd>
 #include <list>
@@ -143,4 +143,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Resolver_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVER_H
diff --git a/zypp/solver/detail/ResolverContext.h b/zypp/solver/detail/ResolverContext.h
index 3d7ff2b..55f80e6 100644
--- a/zypp/solver/detail/ResolverContext.h
+++ b/zypp/solver/detail/ResolverContext.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverContext_h
-#define _ResolverContext_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_H
 
 #include <iosfwd>
 #include <list>
@@ -191,5 +191,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverContext_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_H
 
diff --git a/zypp/solver/detail/ResolverContextPtr.h b/zypp/solver/detail/ResolverContextPtr.h
index 3d130a6..7e4c77c 100644
--- a/zypp/solver/detail/ResolverContextPtr.h
+++ b/zypp/solver/detail/ResolverContextPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverContext_Ptr_h
-#define _ResolverContext_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -49,4 +49,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResolverContext_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERCONTEXT_PTR_H
diff --git a/zypp/solver/detail/ResolverInfo.h b/zypp/solver/detail/ResolverInfo.h
index 1383ddd..f83d957 100644
--- a/zypp/solver/detail/ResolverInfo.h
+++ b/zypp/solver/detail/ResolverInfo.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfo_h
-#define _ResolverInfo_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVER_INFO_H
+#define ZYPP_SOLVER_DETAIL_RESOLVER_INFO_H
 
 #include <iosfwd>
 #include <list>
@@ -123,5 +123,5 @@ class ResolverInfo : public base::ReferenceCounted, private base::NonCopyable {
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfo_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVER_INFO_H
 
diff --git a/zypp/solver/detail/ResolverInfoChildOf.h b/zypp/solver/detail/ResolverInfoChildOf.h
index 60def41..072b6a1 100644
--- a/zypp/solver/detail/ResolverInfoChildOf.h
+++ b/zypp/solver/detail/ResolverInfoChildOf.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoChildOf_h
-#define _ResolverInfoChildOf_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_H
 
 #include "zypp/solver/detail/ResolverInfoChildOfPtr.h"
 #include "zypp/solver/detail/ResolverInfoContainer.h"
@@ -73,5 +73,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoChildOf_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_H
  
diff --git a/zypp/solver/detail/ResolverInfoChildOfPtr.h b/zypp/solver/detail/ResolverInfoChildOfPtr.h
index 4fd2f7f..ad7b82f 100644
--- a/zypp/solver/detail/ResolverInfoChildOfPtr.h
+++ b/zypp/solver/detail/ResolverInfoChildOfPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoChildOf_Ptr_h
-#define _ResolverInfoChildOf_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoChildOf_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCHILDOF_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoConflictsWith.h b/zypp/solver/detail/ResolverInfoConflictsWith.h
index 550c252..bd684a2 100644
--- a/zypp/solver/detail/ResolverInfoConflictsWith.h
+++ b/zypp/solver/detail/ResolverInfoConflictsWith.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoConflictsWith_h
-#define _ResolverInfoConflictsWith_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_H
 
 #include "zypp/solver/detail/ResolverInfoConflictsWithPtr.h"
 #include "zypp/solver/detail/ResolverInfoContainer.h"
@@ -74,5 +74,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////        
-#endif // _ResolverInfoConflictsWith_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_H
  
diff --git a/zypp/solver/detail/ResolverInfoConflictsWithPtr.h b/zypp/solver/detail/ResolverInfoConflictsWithPtr.h
index b2c3f94..1162d5c 100644
--- a/zypp/solver/detail/ResolverInfoConflictsWithPtr.h
+++ b/zypp/solver/detail/ResolverInfoConflictsWithPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoConflictsWith_Ptr_h
-#define _ResolverInfoConflictsWith_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoConflictsWith_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCONFLICTSWITH_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoContainer.h b/zypp/solver/detail/ResolverInfoContainer.h
index 7eedbde..e010212 100644
--- a/zypp/solver/detail/ResolverInfoContainer.h
+++ b/zypp/solver/detail/ResolverInfoContainer.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoContainer_h
-#define _ResolverInfoContainer_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_H
 
 #include <iosfwd>
 #include <list>
@@ -91,4 +91,4 @@ class ResolverInfoContainer : public ResolverInfo {
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoContainer_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_H
diff --git a/zypp/solver/detail/ResolverInfoContainerPtr.h b/zypp/solver/detail/ResolverInfoContainerPtr.h
index 5e03fcb..f48eae6 100644
--- a/zypp/solver/detail/ResolverInfoContainerPtr.h
+++ b/zypp/solver/detail/ResolverInfoContainerPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoContainer_Ptr_h
-#define _ResolverInfoContainer_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -49,4 +49,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoContainer_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOCONTAINER_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoDependsOn.h b/zypp/solver/detail/ResolverInfoDependsOn.h
index 51b8def..f91e711 100644
--- a/zypp/solver/detail/ResolverInfoDependsOn.h
+++ b/zypp/solver/detail/ResolverInfoDependsOn.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoDependsOn_h
-#define _ResolverInfoDependsOn_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_H
 
 #include <string>
 #include "zypp/solver/detail/ResolverInfoDependsOnPtr.h"
@@ -76,5 +76,5 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResolverInfoDependsOn_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_H
  
diff --git a/zypp/solver/detail/ResolverInfoDependsOnPtr.h b/zypp/solver/detail/ResolverInfoDependsOnPtr.h
index 5524617..63f6c21 100644
--- a/zypp/solver/detail/ResolverInfoDependsOnPtr.h
+++ b/zypp/solver/detail/ResolverInfoDependsOnPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoDependsOn_Ptr_h
-#define _ResolverInfoDependsOn_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -51,4 +51,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _ResolverInfoDependsOn_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFODEPENDSON_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoMisc.h b/zypp/solver/detail/ResolverInfoMisc.h
index 6ad06eb..2fac8ea 100644
--- a/zypp/solver/detail/ResolverInfoMisc.h
+++ b/zypp/solver/detail/ResolverInfoMisc.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoMisc_h
-#define _ResolverInfoMisc_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_H
 
 #include <string>
 #include "zypp/solver/detail/ResolverInfoMiscPtr.h"
@@ -83,5 +83,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////        
-#endif // _ResolverInfoMisc_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_H
  
diff --git a/zypp/solver/detail/ResolverInfoMiscPtr.h b/zypp/solver/detail/ResolverInfoMiscPtr.h
index 467c835..3404832 100644
--- a/zypp/solver/detail/ResolverInfoMiscPtr.h
+++ b/zypp/solver/detail/ResolverInfoMiscPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoMisc_Ptr_h
-#define _ResolverInfoMisc_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////       
 
-#endif // _ResolverInfoMisc_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOMISC_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoMissingReq.h b/zypp/solver/detail/ResolverInfoMissingReq.h
index 4a6d92c..8caeddd 100644
--- a/zypp/solver/detail/ResolverInfoMissingReq.h
+++ b/zypp/solver/detail/ResolverInfoMissingReq.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoMissingReq_h
-#define _ResolverInfoMissingReq_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_H
 
 #include "zypp/solver/detail/ResolverInfoMissingReqPtr.h"
 #include "zypp/solver/detail/ResolverInfo.h"
@@ -77,5 +77,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoMissingReq_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_H
  
diff --git a/zypp/solver/detail/ResolverInfoMissingReqPtr.h b/zypp/solver/detail/ResolverInfoMissingReqPtr.h
index a7a2f7d..0359d3f 100644
--- a/zypp/solver/detail/ResolverInfoMissingReqPtr.h
+++ b/zypp/solver/detail/ResolverInfoMissingReqPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoMissingReq_Ptr_h
-#define _ResolverInfoMissingReq_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResolverInfoMissingReq_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOMISSINGREQ_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoNeededBy.h b/zypp/solver/detail/ResolverInfoNeededBy.h
index d87c98c..b12a24a 100644
--- a/zypp/solver/detail/ResolverInfoNeededBy.h
+++ b/zypp/solver/detail/ResolverInfoNeededBy.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoNeededBy_h
-#define _ResolverInfoNeededBy_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_H
 
 #include "zypp/solver/detail/ResolverInfoNeededByPtr.h"
 #include "zypp/solver/detail/ResolverInfoContainer.h"
@@ -73,5 +73,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////       
-#endif // _ResolverInfoNeededBy_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_H
  
diff --git a/zypp/solver/detail/ResolverInfoNeededByPtr.h b/zypp/solver/detail/ResolverInfoNeededByPtr.h
index d9df114..2e1e222 100644
--- a/zypp/solver/detail/ResolverInfoNeededByPtr.h
+++ b/zypp/solver/detail/ResolverInfoNeededByPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoNeededBy_Ptr_h
-#define _ResolverInfoNeededBy_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////        
 
-#endif // _ResolverInfoNeededBy_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFONEEDEDBY_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoObsoletes.h b/zypp/solver/detail/ResolverInfoObsoletes.h
index 397d017..58af706 100644
--- a/zypp/solver/detail/ResolverInfoObsoletes.h
+++ b/zypp/solver/detail/ResolverInfoObsoletes.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoObsoletes_h
-#define _ResolverInfoObsoletes_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_H
 
 #include "zypp/solver/detail/ResolverInfoObsoletesPtr.h"
 #include "zypp/solver/detail/ResolverInfoContainer.h"
@@ -72,5 +72,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _ResolverInfoObsoletes_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_H
  
diff --git a/zypp/solver/detail/ResolverInfoObsoletesPtr.h b/zypp/solver/detail/ResolverInfoObsoletesPtr.h
index 0567e0f..7ca719c 100644
--- a/zypp/solver/detail/ResolverInfoObsoletesPtr.h
+++ b/zypp/solver/detail/ResolverInfoObsoletesPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfoObsoletes_Ptr_h
-#define _ResolverInfoObsoletes_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/ResolverInfoPtr.h"
@@ -51,4 +51,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _ResolverInfoObsoletes_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFOOBSOLETES_PTR_H
diff --git a/zypp/solver/detail/ResolverInfoPtr.h b/zypp/solver/detail/ResolverInfoPtr.h
index 41f7e46..9416a69 100644
--- a/zypp/solver/detail/ResolverInfoPtr.h
+++ b/zypp/solver/detail/ResolverInfoPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverInfo_Ptr_h
-#define _ResolverInfo_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERINFO_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERINFO_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -49,4 +49,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResolverInfo_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERINFO_PTR_H
diff --git a/zypp/solver/detail/ResolverPtr.h b/zypp/solver/detail/ResolverPtr.h
index 0f6579c..ad41065 100644
--- a/zypp/solver/detail/ResolverPtr.h
+++ b/zypp/solver/detail/ResolverPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Resolver_Ptr_h
-#define _Resolver_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVER_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVER_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -49,4 +49,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _Resolver_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVER_PTR_H
diff --git a/zypp/solver/detail/ResolverQueue.h b/zypp/solver/detail/ResolverQueue.h
index a04099a..cdde467 100644
--- a/zypp/solver/detail/ResolverQueue.h
+++ b/zypp/solver/detail/ResolverQueue.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverQueue_h
-#define _ResolverQueue_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_H
 
 #include <iosfwd>
 #include <list>
@@ -110,5 +110,5 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _ResolverQueue_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_H
 
diff --git a/zypp/solver/detail/ResolverQueuePtr.h b/zypp/solver/detail/ResolverQueuePtr.h
index 655334c..2d11a70 100644
--- a/zypp/solver/detail/ResolverQueuePtr.h
+++ b/zypp/solver/detail/ResolverQueuePtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ResolverQueue_Ptr_h
-#define _ResolverQueue_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_PTR_H
+#define ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -50,4 +50,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _ResolverQueue_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_RESOLVERQUEUE_PTR_H
diff --git a/zypp/solver/detail/Section.h b/zypp/solver/detail/Section.h
index d468ef7..7eb454c 100644
--- a/zypp/solver/detail/Section.h
+++ b/zypp/solver/detail/Section.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Section_h
-#define _Section_h
+#ifndef ZYPP_SOLVER_DETAIL_SECTION_H
+#define ZYPP_SOLVER_DETAIL_SECTION_H
 
 #include <iosfwd>
 #include <string>
@@ -110,4 +110,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _Section_h
+#endif // ZYPP_SOLVER_DETAIL_SECTION_H
diff --git a/zypp/solver/detail/ServiceWorld.h b/zypp/solver/detail/ServiceWorld.h
index 5a0ad43..b60b4a9 100644
--- a/zypp/solver/detail/ServiceWorld.h
+++ b/zypp/solver/detail/ServiceWorld.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ServiceWorld_h
-#define _ServiceWorld_h
+#ifndef ZYPP_SOLVER_DETAIL_SERVICEWORLD_H
+#define ZYPP_SOLVER_DETAIL_SERVICEWORLD_H
 
 #include <iosfwd>
 #include <string>
@@ -99,4 +99,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _ServiceWorld_h
+#endif // ZYPP_SOLVER_DETAIL_SERVICEWORLD_H
diff --git a/zypp/solver/detail/ServiceWorldPtr.h b/zypp/solver/detail/ServiceWorldPtr.h
index fd28121..a380d27 100644
--- a/zypp/solver/detail/ServiceWorldPtr.h
+++ b/zypp/solver/detail/ServiceWorldPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _ServiceWorld_Ptr_h
-#define _ServiceWorld_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_SERVICEWORLD_PTR_H
+#define ZYPP_SOLVER_DETAIL_SERVICEWORLD_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/WorldPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _ServiceWorld_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_SERVICEWORLD_PTR_H
diff --git a/zypp/solver/detail/Spec.h b/zypp/solver/detail/Spec.h
index 04e286c..85ed36e 100644
--- a/zypp/solver/detail/Spec.h
+++ b/zypp/solver/detail/Spec.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Spec_h
-#define _Spec_h
+#ifndef ZYPP_SOLVER_DETAIL_SPEC_H
+#define ZYPP_SOLVER_DETAIL_SPEC_H
 
 #include <iosfwd>
 #include <list>
@@ -161,4 +161,4 @@ class Name : public Ustring {
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Spec_h
+#endif // ZYPP_SOLVER_DETAIL_SPEC_H
diff --git a/zypp/solver/detail/SpecPtr.h b/zypp/solver/detail/SpecPtr.h
index 92b0868..3c3a5f9 100644
--- a/zypp/solver/detail/SpecPtr.h
+++ b/zypp/solver/detail/SpecPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Spec_Ptr_h
-#define _Spec_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_SPEC_PTR_H
+#define ZYPP_SOLVER_DETAIL_SPEC_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -51,4 +51,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif // _Spec_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_SPEC_PTR_H
diff --git a/zypp/solver/detail/StoreWorld.h b/zypp/solver/detail/StoreWorld.h
index c4dd5cb..2864de6 100644
--- a/zypp/solver/detail/StoreWorld.h
+++ b/zypp/solver/detail/StoreWorld.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _StoreWorld_h
-#define _StoreWorld_h
+#ifndef ZYPP_SOLVER_DETAIL_STOREWORLD_H
+#define ZYPP_SOLVER_DETAIL_STOREWORLD_H
 
 #include <iosfwd>
 #include <string>
@@ -137,4 +137,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _StoreWorld_h
+#endif // ZYPP_SOLVER_DETAIL_STOREWORLD_H
diff --git a/zypp/solver/detail/StoreWorldPtr.h b/zypp/solver/detail/StoreWorldPtr.h
index 73d4666..56ec54f 100644
--- a/zypp/solver/detail/StoreWorldPtr.h
+++ b/zypp/solver/detail/StoreWorldPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _StoreWorld_Ptr_h
-#define _StoreWorld_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_STOREWORLD_PTR_H
+#define ZYPP_SOLVER_DETAIL_STOREWORLD_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/WorldPtr.h"
@@ -51,4 +51,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _StoreWorld_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_STOREWORLD_PTR_H
diff --git a/zypp/solver/detail/Subscription.h b/zypp/solver/detail/Subscription.h
index d2fe824..5f92f11 100644
--- a/zypp/solver/detail/Subscription.h
+++ b/zypp/solver/detail/Subscription.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _Subscription_h
-#define _Subscription_h
+#ifndef ZYPP_SOLVER_DETAIL_SUBSCRIPTION_H
+#define ZYPP_SOLVER_DETAIL_SUBSCRIPTION_H
 
 #include <iosfwd>
 #include <string>
@@ -100,4 +100,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _Subscription_h
+#endif // ZYPP_SOLVER_DETAIL_SUBSCRIPTION_H
diff --git a/zypp/solver/detail/UndumpWorld.h b/zypp/solver/detail/UndumpWorld.h
index 2084667..e2b6312 100644
--- a/zypp/solver/detail/UndumpWorld.h
+++ b/zypp/solver/detail/UndumpWorld.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _UndumpWorld_h
-#define _UndumpWorld_h
+#ifndef ZYPP_SOLVER_DETAIL_UNDUMPWORLD_H
+#define ZYPP_SOLVER_DETAIL_UNDUMPWORLD_H
 
 #include <iosfwd>
 #include <string>
@@ -86,4 +86,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _UndumpWorld_h
+#endif // ZYPP_SOLVER_DETAIL_UNDUMPWORLD_H
diff --git a/zypp/solver/detail/UndumpWorldPtr.h b/zypp/solver/detail/UndumpWorldPtr.h
index 9e7df97..da553b9 100644
--- a/zypp/solver/detail/UndumpWorldPtr.h
+++ b/zypp/solver/detail/UndumpWorldPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _UndumpWorld_Ptr_h
-#define _UndumpWorld_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_UNDUMPWORLD_PTR_H
+#define ZYPP_SOLVER_DETAIL_UNDUMPWORLD_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/solver/detail/WorldPtr.h"
@@ -50,4 +50,4 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // _UndumpWorld_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_UNDUMPWORLD_PTR_H
diff --git a/zypp/solver/detail/World.h b/zypp/solver/detail/World.h
index 909b523..d7ca339 100644
--- a/zypp/solver/detail/World.h
+++ b/zypp/solver/detail/World.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _World_h
-#define _World_h
+#ifndef ZYPP_SOLVER_DETAIL_WORLD_H
+#define ZYPP_SOLVER_DETAIL_WORLD_H
 
 #include <iosfwd>
 #include <list>
@@ -268,4 +268,4 @@ namespace zypp
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _World_h
+#endif // ZYPP_SOLVER_DETAIL_WORLD_H
diff --git a/zypp/solver/detail/WorldPtr.h b/zypp/solver/detail/WorldPtr.h
index a98208a..de4d10a 100644
--- a/zypp/solver/detail/WorldPtr.h
+++ b/zypp/solver/detail/WorldPtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _World_Ptr_h
-#define _World_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_WORLD_PTR_H
+#define ZYPP_SOLVER_DETAIL_WORLD_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -49,4 +49,4 @@ DEFINE_PTR_TYPE(World);
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
-#endif // _World_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_WORLD_PTR_H
diff --git a/zypp/solver/detail/XmlNode.h b/zypp/solver/detail/XmlNode.h
index 23869b7..4023205 100644
--- a/zypp/solver/detail/XmlNode.h
+++ b/zypp/solver/detail/XmlNode.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _XmlNode_h
-#define _XmlNode_h
+#ifndef ZYPP_SOLVER_DETAIL_XMLNODE_H
+#define ZYPP_SOLVER_DETAIL_XMLNODE_H
 
 #include <list>
 #include <iostream>
@@ -120,4 +120,4 @@ class XmlNode : public base::ReferenceCounted, private base::NonCopyable
 
 
 
-#endif  // _XmlNode_h
+#endif  // ZYPP_SOLVER_DETAIL_XMLNODE_H
diff --git a/zypp/solver/detail/XmlNodePtr.h b/zypp/solver/detail/XmlNodePtr.h
index e55f359..2a10a3a 100644
--- a/zypp/solver/detail/XmlNodePtr.h
+++ b/zypp/solver/detail/XmlNodePtr.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _XmlNode_Ptr_h
-#define _XmlNode_Ptr_h
+#ifndef ZYPP_SOLVER_DETAIL_XMLNODE_PTR_H
+#define ZYPP_SOLVER_DETAIL_XMLNODE_PTR_H
 
 #include "zypp/base/PtrTypes.h"
 
@@ -50,4 +50,4 @@ namespace zypp
 };// namespace zypp
 ///////////////////////////////////////////////////////////////////
 
-#endif // _XmlNode_Ptr_h
+#endif // ZYPP_SOLVER_DETAIL_XMLNODE_PTR_H
diff --git a/zypp/solver/detail/XmlParser.h b/zypp/solver/detail/XmlParser.h
index c112262..036b895 100644
--- a/zypp/solver/detail/XmlParser.h
+++ b/zypp/solver/detail/XmlParser.h
@@ -19,8 +19,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _XmlParser_h
-#define _XmlParser_h
+#ifndef ZYPP_SOLVER_DETAIL_XMLPARSER_H
+#define ZYPP_SOLVER_DETAIL_XMLPARSER_H
 
 #include <list>
 
@@ -164,4 +164,4 @@ namespace zypp
 /////////////////////////////////////////////////////////////////////////
 
 
-#endif  // _XmlParser_h
+#endif  // ZYPP_SOLVER_DETAIL_XMLPARSER_H
diff --git a/zypp/solver/detail/extract.h b/zypp/solver/detail/extract.h
index 04c380d..a6bf54a 100644
--- a/zypp/solver/detail/extract.h
+++ b/zypp/solver/detail/extract.h
@@ -24,8 +24,8 @@
  * USA.
  */
 
-#ifndef __EXTRACT_H__
-#define __EXTRACT_H__
+#ifndef ZYPP_SOLVER_DETAIL_EXTRACT_H
+#define ZYPP_SOLVER_DETAIL_EXTRACT_H
 
 #include "zypp/solver/detail/Channel.h"
 #include "zypp/solver/detail/XmlNode.h"
@@ -74,5 +74,5 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif /* __EXTRACT_H__ */
+#endif /* ZYPP_SOLVER_DETAIL_EXTRACT_H */
 
diff --git a/zypp/solver/detail/libzypp_solver.h b/zypp/solver/detail/libzypp_solver.h
index b10236a..22f567c 100644
--- a/zypp/solver/detail/libzypp_solver.h
+++ b/zypp/solver/detail/libzypp_solver.h
@@ -18,8 +18,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef _LIBzypp_H
-#define _LIBzypp_H
+#ifndef ZYPP_SOLVER_DETAIL_LIBZYPP_H
+#define ZYPP_SOLVER_DETAIL_LIBZYPP_H
 
 #include "zypp/solver/detail/Channel.h"
 #include "zypp/solver/detail/Match.h"
@@ -36,4 +36,4 @@
 #include "zypp/solver/detail/utils.h"
 #include "zypp/solver/detail/extract.h"
 
-#endif	// _LIBzypp_H
+#endif	// ZYPP_SOLVER_DETAIL_LIBZYPP_H
-- 
2.7.4