From 7b60e88545136453a47d231fbe9e73e91ca4d26d Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tgomes@fc.up.pt>
Date: Wed, 6 Feb 2013 22:58:42 +0000
Subject: [PATCH] Improve Header guards

---
 packages/CLPBN/horus/BayesBall.h        | 6 +++---
 packages/CLPBN/horus/BayesBallGraph.h   | 6 +++---
 packages/CLPBN/horus/BeliefProp.h       | 6 +++---
 packages/CLPBN/horus/ConstraintTree.h   | 6 +++---
 packages/CLPBN/horus/CountingBp.h       | 6 +++---
 packages/CLPBN/horus/ElimGraph.h        | 6 +++---
 packages/CLPBN/horus/Factor.h           | 6 +++---
 packages/CLPBN/horus/FactorGraph.h      | 6 +++---
 packages/CLPBN/horus/GroundSolver.h     | 6 +++---
 packages/CLPBN/horus/Histogram.h        | 4 ++--
 packages/CLPBN/horus/Horus.h            | 6 +++---
 packages/CLPBN/horus/Indexer.h          | 6 +++---
 packages/CLPBN/horus/LiftedBp.h         | 6 +++---
 packages/CLPBN/horus/LiftedKc.h         | 6 +++---
 packages/CLPBN/horus/LiftedOperations.h | 6 +++---
 packages/CLPBN/horus/LiftedSolver.h     | 6 +++---
 packages/CLPBN/horus/LiftedUtils.h      | 6 +++---
 packages/CLPBN/horus/LiftedVe.h         | 6 +++---
 packages/CLPBN/horus/LiftedWCNF.h       | 6 +++---
 packages/CLPBN/horus/Parfactor.h        | 6 +++---
 packages/CLPBN/horus/ParfactorList.h    | 6 +++---
 packages/CLPBN/horus/ProbFormula.h      | 6 +++---
 packages/CLPBN/horus/TinySet.h          | 6 +++---
 packages/CLPBN/horus/Util.h             | 6 +++---
 packages/CLPBN/horus/Var.h              | 6 +++---
 packages/CLPBN/horus/VarElim.h          | 6 +++---
 packages/CLPBN/horus/WeightedBp.h       | 6 +++---
 27 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/packages/CLPBN/horus/BayesBall.h b/packages/CLPBN/horus/BayesBall.h
index af590fd7f..582b4b51a 100644
--- a/packages/CLPBN/horus/BayesBall.h
+++ b/packages/CLPBN/horus/BayesBall.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_BAYESBALL_H
-#define HORUS_BAYESBALL_H
+#ifndef PACKAGES_CLPBN_HORUS_BAYESBALL_H
+#define PACKAGES_CLPBN_HORUS_BAYESBALL_H
 
 #include <vector>
 #include <queue>
@@ -72,5 +72,5 @@ BayesBall::scheduleChilds (const BBNode* n, Scheduling& sch) const
   }
 }
 
-#endif // HORUS_BAYESBALL_H
+#endif // PACKAGES_CLPBN_HORUS_BAYESBALL_H
 
diff --git a/packages/CLPBN/horus/BayesBallGraph.h b/packages/CLPBN/horus/BayesBallGraph.h
index de2da8310..d3c02daac 100644
--- a/packages/CLPBN/horus/BayesBallGraph.h
+++ b/packages/CLPBN/horus/BayesBallGraph.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_BAYESBALLGRAPH_H
-#define HORUS_BAYESBALLGRAPH_H
+#ifndef PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
+#define PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
 
 #include <vector>
 #include <unordered_map>
@@ -78,5 +78,5 @@ class BayesBallGraph
     unordered_map<VarId, BBNode*> varMap_;
 };
 
-#endif // HORUS_BAYESBALLGRAPH_H
+#endif // PACKAGES_CLPBN_HORUS_BAYESBALLGRAPH_H
 
diff --git a/packages/CLPBN/horus/BeliefProp.h b/packages/CLPBN/horus/BeliefProp.h
index c1b59b476..215a2c0f6 100644
--- a/packages/CLPBN/horus/BeliefProp.h
+++ b/packages/CLPBN/horus/BeliefProp.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_BELIEFPROP_H
-#define HORUS_BELIEFPROP_H
+#ifndef PACKAGES_CLPBN_HORUS_BELIEFPROP_H
+#define PACKAGES_CLPBN_HORUS_BELIEFPROP_H
 
 #include <set>
 #include <vector>
@@ -176,5 +176,5 @@ BeliefProp::ninf (const FacNode* fac) const
   return facsI_[fac->getIndex()];
 }
 
-#endif // HORUS_BELIEFPROP_H
+#endif // PACKAGES_CLPBN_HORUS_BELIEFPROP_H
 
diff --git a/packages/CLPBN/horus/ConstraintTree.h b/packages/CLPBN/horus/ConstraintTree.h
index 02de30da9..2a36d4c17 100644
--- a/packages/CLPBN/horus/ConstraintTree.h
+++ b/packages/CLPBN/horus/ConstraintTree.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_CONSTRAINTTREE_H
-#define HORUS_CONSTRAINTTREE_H
+#ifndef PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
+#define PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
 
 #include <cassert>
 #include <algorithm>
@@ -246,5 +246,5 @@ ConstraintTree::nrLogVars (void) const
   assert (LogVarSet (logVars_) == logVarSet_);
 }
 
-#endif // HORUS_CONSTRAINTTREE_H
+#endif // PACKAGES_CLPBN_HORUS_CONSTRAINTTREE_H
 
diff --git a/packages/CLPBN/horus/CountingBp.h b/packages/CLPBN/horus/CountingBp.h
index 1dc852c38..c592a5e8a 100644
--- a/packages/CLPBN/horus/CountingBp.h
+++ b/packages/CLPBN/horus/CountingBp.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_COUNTINGBP_H
-#define HORUS_COUNTINGBP_H
+#ifndef PACKAGES_CLPBN_HORUS_COUNTINGBP_H
+#define PACKAGES_CLPBN_HORUS_COUNTINGBP_H
 
 #include <unordered_map>
 
@@ -212,5 +212,5 @@ CountingBp::setColor (const FacNode* fn, Color  c)
   facColors_[fn->getIndex()] = c;
 }
 
-#endif // HORUS_COUNTINGBP_H
+#endif // PACKAGES_CLPBN_HORUS_COUNTINGBP_H
 
diff --git a/packages/CLPBN/horus/ElimGraph.h b/packages/CLPBN/horus/ElimGraph.h
index 1c822816c..42a2fbe4d 100644
--- a/packages/CLPBN/horus/ElimGraph.h
+++ b/packages/CLPBN/horus/ElimGraph.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_ELIMGRAPH_H
-#define HORUS_ELIMGRAPH_H
+#ifndef PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
+#define PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
 
 #include "unordered_map"
 
@@ -169,5 +169,5 @@ ElimGraph::neighbors (EgNode* n1, EgNode* n2) const
   return n1->isNeighbor (n2);
 }
 
-#endif // HORUS_ELIMGRAPH_H
+#endif // PACKAGES_CLPBN_HORUS_ELIMGRAPH_H
 
diff --git a/packages/CLPBN/horus/Factor.h b/packages/CLPBN/horus/Factor.h
index 2b82bb833..7fe54f5e1 100644
--- a/packages/CLPBN/horus/Factor.h
+++ b/packages/CLPBN/horus/Factor.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_FACTOR_H
-#define HORUS_FACTOR_H
+#ifndef PACKAGES_CLPBN_HORUS_FACTOR_H
+#define PACKAGES_CLPBN_HORUS_FACTOR_H
 
 #include <vector>
 
@@ -364,5 +364,5 @@ class Factor : public TFactor<VarId>
     DISALLOW_ASSIGN (Factor);
 };
 
-#endif // HORUS_FACTOR_H
+#endif // PACKAGES_CLPBN_HORUS_FACTOR_H
 
diff --git a/packages/CLPBN/horus/FactorGraph.h b/packages/CLPBN/horus/FactorGraph.h
index 5140736c9..ed4174102 100644
--- a/packages/CLPBN/horus/FactorGraph.h
+++ b/packages/CLPBN/horus/FactorGraph.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_FACTORGRAPH_H
-#define HORUS_FACTORGRAPH_H
+#ifndef PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
+#define PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
 
 #include <vector>
 
@@ -179,5 +179,5 @@ struct sortByVarId
 };
 
 
-#endif // HORUS_FACTORGRAPH_H
+#endif // PACKAGES_CLPBN_HORUS_FACTORGRAPH_H
 
diff --git a/packages/CLPBN/horus/GroundSolver.h b/packages/CLPBN/horus/GroundSolver.h
index 3d5f62c48..becca2eb0 100644
--- a/packages/CLPBN/horus/GroundSolver.h
+++ b/packages/CLPBN/horus/GroundSolver.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_GROUNDSOLVER_H
-#define HORUS_GROUNDSOLVER_H
+#ifndef PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
+#define PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
 
 #include <iomanip>
 
@@ -34,5 +34,5 @@ class GroundSolver
     DISALLOW_COPY_AND_ASSIGN (GroundSolver);
 };
 
-#endif // HORUS_GROUNDSOLVER_H
+#endif // PACKAGES_CLPBN_HORUS_GROUNDSOLVER_H
 
diff --git a/packages/CLPBN/horus/Histogram.h b/packages/CLPBN/horus/Histogram.h
index f28c8c0c7..b6719b651 100644
--- a/packages/CLPBN/horus/Histogram.h
+++ b/packages/CLPBN/horus/Histogram.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_HISTOGRAM_H
-#define HORUS_HISTOGRAM_H
+#ifndef PACKAGES_CLPBN_HORUS_HISTOGRAM_H
+#define PACKAGES_CLPBN_HORUS_HISTOGRAM_H
 
 #include <vector>
 
diff --git a/packages/CLPBN/horus/Horus.h b/packages/CLPBN/horus/Horus.h
index 045ca42f2..152e22501 100644
--- a/packages/CLPBN/horus/Horus.h
+++ b/packages/CLPBN/horus/Horus.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_HORUS_H
-#define HORUS_HORUS_H
+#ifndef PACKAGES_CLPBN_HORUS_HORUS_H
+#define PACKAGES_CLPBN_HORUS_HORUS_H
 
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);               \
@@ -72,5 +72,5 @@ const unsigned PRECISION = 6;
 
 };
 
-#endif // HORUS_HORUS_H
+#endif // PACKAGES_CLPBN_HORUS_HORUS_H
 
diff --git a/packages/CLPBN/horus/Indexer.h b/packages/CLPBN/horus/Indexer.h
index 180dea2ab..693842c82 100644
--- a/packages/CLPBN/horus/Indexer.h
+++ b/packages/CLPBN/horus/Indexer.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_INDEXER_H
-#define HORUS_INDEXER_H
+#ifndef PACKAGES_CLPBN_HORUS_INDEXER_H
+#define PACKAGES_CLPBN_HORUS_INDEXER_H
 
 #include <algorithm>
 #include <numeric>
@@ -361,5 +361,5 @@ operator<< (std::ostream &os, const MapIndexer& indexer)
   return os;
 }
 
-#endif // HORUS_INDEXER_H
+#endif // PACKAGES_CLPBN_HORUS_INDEXER_H
 
diff --git a/packages/CLPBN/horus/LiftedBp.h b/packages/CLPBN/horus/LiftedBp.h
index 01807ddfb..a5011dc7d 100644
--- a/packages/CLPBN/horus/LiftedBp.h
+++ b/packages/CLPBN/horus/LiftedBp.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDBP_H
-#define HORUS_LIFTEDBP_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDBP_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDBP_H
 
 #include "LiftedSolver.h"
 #include "ParfactorList.h"
@@ -41,5 +41,5 @@ class LiftedBp : public LiftedSolver
 
 };
 
-#endif // HORUS_LIFTEDBP_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDBP_H
 
diff --git a/packages/CLPBN/horus/LiftedKc.h b/packages/CLPBN/horus/LiftedKc.h
index 949787f01..c37ffe4ba 100644
--- a/packages/CLPBN/horus/LiftedKc.h
+++ b/packages/CLPBN/horus/LiftedKc.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDKC_H
-#define HORUS_LIFTEDKC_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDKC_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDKC_H
 
 #include "LiftedSolver.h"
 #include "LiftedWCNF.h"
@@ -298,5 +298,5 @@ class LiftedKc : public LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedKc);
 };
 
-#endif // HORUS_LIFTEDKC_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDKC_H
 
diff --git a/packages/CLPBN/horus/LiftedOperations.h b/packages/CLPBN/horus/LiftedOperations.h
index d17bb5359..5cd703606 100644
--- a/packages/CLPBN/horus/LiftedOperations.h
+++ b/packages/CLPBN/horus/LiftedOperations.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDOPERATIONS_H
-#define HORUS_LIFTEDOPERATIONS_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
 
 #include "ParfactorList.h"
 
@@ -25,5 +25,5 @@ class LiftedOperations
     DISALLOW_COPY_AND_ASSIGN (LiftedOperations);
 };
 
-#endif // HORUS_LIFTEDOPERATIONS_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDOPERATIONS_H
 
diff --git a/packages/CLPBN/horus/LiftedSolver.h b/packages/CLPBN/horus/LiftedSolver.h
index afdfe1461..6a4671f0f 100644
--- a/packages/CLPBN/horus/LiftedSolver.h
+++ b/packages/CLPBN/horus/LiftedSolver.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDSOLVER_H
-#define HORUS_LIFTEDSOLVER_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
 
 #include "ParfactorList.h"
 #include "Horus.h"
@@ -26,5 +26,5 @@ class LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedSolver);
 };
 
-#endif // HORUS_LIFTEDSOLVER_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDSOLVER_H
 
diff --git a/packages/CLPBN/horus/LiftedUtils.h b/packages/CLPBN/horus/LiftedUtils.h
index f067d5a92..5fffcfc7e 100644
--- a/packages/CLPBN/horus/LiftedUtils.h
+++ b/packages/CLPBN/horus/LiftedUtils.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDUTILS_H
-#define HORUS_LIFTEDUTILS_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
 
 #include <string>
 
@@ -208,5 +208,5 @@ Substitution::nrReplacements (void) const
 }
 
 
-#endif // HORUS_LIFTEDUTILS_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDUTILS_H
 
diff --git a/packages/CLPBN/horus/LiftedVe.h b/packages/CLPBN/horus/LiftedVe.h
index d66f42e7f..ab8e1c8ee 100644
--- a/packages/CLPBN/horus/LiftedVe.h
+++ b/packages/CLPBN/horus/LiftedVe.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDVE_H
-#define HORUS_LIFTEDVE_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDVE_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDVE_H
 
 #include "LiftedSolver.h"
 #include "ParfactorList.h"
@@ -164,5 +164,5 @@ class LiftedVe : public LiftedSolver
     DISALLOW_COPY_AND_ASSIGN (LiftedVe);
 };
 
-#endif // HORUS_LIFTEDVE_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDVE_H
 
diff --git a/packages/CLPBN/horus/LiftedWCNF.h b/packages/CLPBN/horus/LiftedWCNF.h
index 9da3e1602..61dc7595d 100644
--- a/packages/CLPBN/horus/LiftedWCNF.h
+++ b/packages/CLPBN/horus/LiftedWCNF.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_LIFTEDWCNF_H
-#define HORUS_LIFTEDWCNF_H
+#ifndef PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
+#define PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
 
 #include <unordered_map>
 
@@ -237,5 +237,5 @@ class LiftedWCNF
     DISALLOW_COPY_AND_ASSIGN (LiftedWCNF);
 };
 
-#endif // HORUS_LIFTEDWCNF_H
+#endif // PACKAGES_CLPBN_HORUS_LIFTEDWCNF_H
 
diff --git a/packages/CLPBN/horus/Parfactor.h b/packages/CLPBN/horus/Parfactor.h
index f85eab623..1a8ab39f5 100644
--- a/packages/CLPBN/horus/Parfactor.h
+++ b/packages/CLPBN/horus/Parfactor.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_PARFACTOR_H
-#define HORUS_PARFACTOR_H
+#ifndef PACKAGES_CLPBN_HORUS_PARFACTOR_H
+#define PACKAGES_CLPBN_HORUS_PARFACTOR_H
 
 #include "Factor.h"
 #include "ProbFormula.h"
@@ -117,5 +117,5 @@ class Parfactor : public TFactor<ProbFormula>
 
 typedef vector<Parfactor*> Parfactors;
 
-#endif // HORUS_PARFACTOR_H
+#endif // PACKAGES_CLPBN_HORUS_PARFACTOR_H
 
diff --git a/packages/CLPBN/horus/ParfactorList.h b/packages/CLPBN/horus/ParfactorList.h
index 377299952..86384566b 100644
--- a/packages/CLPBN/horus/ParfactorList.h
+++ b/packages/CLPBN/horus/ParfactorList.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_PARFACTORLIST_H
-#define HORUS_PARFACTORLIST_H
+#ifndef PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
+#define PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
 
 #include <list>
 
@@ -118,5 +118,5 @@ class ParfactorList
     list<Parfactor*> pfList_;
 };
 
-#endif // HORUS_PARFACTORLIST_H
+#endif // PACKAGES_CLPBN_HORUS_PARFACTORLIST_H
 
diff --git a/packages/CLPBN/horus/ProbFormula.h b/packages/CLPBN/horus/ProbFormula.h
index dcb878d64..0562063de 100644
--- a/packages/CLPBN/horus/ProbFormula.h
+++ b/packages/CLPBN/horus/ProbFormula.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_PROBFORMULA_H
-#define HORUS_PROBFORMULA_H
+#ifndef PACKAGES_CLPBN_HORUS_PROBFORMULA_H
+#define PACKAGES_CLPBN_HORUS_PROBFORMULA_H
 
 #include <limits>
 
@@ -106,5 +106,5 @@ class ObservedFormula
 
 typedef vector<ObservedFormula> ObservedFormulas;
 
-#endif // HORUS_PROBFORMULA_H
+#endif // PACKAGES_CLPBN_HORUS_PROBFORMULA_H
 
diff --git a/packages/CLPBN/horus/TinySet.h b/packages/CLPBN/horus/TinySet.h
index 57592e565..859aa9cbc 100644
--- a/packages/CLPBN/horus/TinySet.h
+++ b/packages/CLPBN/horus/TinySet.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_TINYSET_H
-#define HORUS_TINYSET_H
+#ifndef PACKAGES_CLPBN_HORUS_TINYSET_H
+#define PACKAGES_CLPBN_HORUS_TINYSET_H
 
 #include <algorithm>
 
@@ -406,5 +406,5 @@ TinySet<T,C>::consistent (void) const
   return true;
 }
 
-#endif // HORUS_TINYSET_H
+#endif // PACKAGES_CLPBN_HORUS_TINYSET_H
 
diff --git a/packages/CLPBN/horus/Util.h b/packages/CLPBN/horus/Util.h
index 72e77b621..c91bccbd9 100644
--- a/packages/CLPBN/horus/Util.h
+++ b/packages/CLPBN/horus/Util.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_UTIL_H
-#define HORUS_UTIL_H
+#ifndef PACKAGES_CLPBN_HORUS_UTIL_H
+#define PACKAGES_CLPBN_HORUS_UTIL_H
 
 #include <cmath>
 #include <cassert>
@@ -422,5 +422,5 @@ struct abs_diff_exp : public std::binary_function<T, T, T>
 
 }
 
-#endif // HORUS_UTIL_H
+#endif // PACKAGES_CLPBN_HORUS_UTIL_H
 
diff --git a/packages/CLPBN/horus/Var.h b/packages/CLPBN/horus/Var.h
index f61876047..72b8ae8fa 100644
--- a/packages/CLPBN/horus/Var.h
+++ b/packages/CLPBN/horus/Var.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_VAR_H
-#define HORUS_VAR_H
+#ifndef PACKAGES_CLPBN_HORUS_VAR_H
+#define PACKAGES_CLPBN_HORUS_VAR_H
 
 #include <cassert>
 
@@ -107,5 +107,5 @@ Var::operator!= (const Var& var) const
 }
 
 
-#endif // HORUS_VAR_H
+#endif // PACKAGES_CLPBN_HORUS_VAR_H
 
diff --git a/packages/CLPBN/horus/VarElim.h b/packages/CLPBN/horus/VarElim.h
index da05e51a1..69c23bda6 100644
--- a/packages/CLPBN/horus/VarElim.h
+++ b/packages/CLPBN/horus/VarElim.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_VARELIM_H
-#define HORUS_VARELIM_H
+#ifndef PACKAGES_CLPBN_HORUS_VARELIM_H
+#define PACKAGES_CLPBN_HORUS_VARELIM_H
 
 #include "unordered_map"
 
@@ -41,5 +41,5 @@ class VarElim : public GroundSolver
     DISALLOW_COPY_AND_ASSIGN (VarElim);
 };
 
-#endif // HORUS_VARELIM_H
+#endif // PACKAGES_CLPBN_HORUS_VARELIM_H
 
diff --git a/packages/CLPBN/horus/WeightedBp.h b/packages/CLPBN/horus/WeightedBp.h
index 39f3d7a8b..228e6ef4a 100644
--- a/packages/CLPBN/horus/WeightedBp.h
+++ b/packages/CLPBN/horus/WeightedBp.h
@@ -1,5 +1,5 @@
-#ifndef HORUS_WEIGHTEDBP_H
-#define HORUS_WEIGHTEDBP_H
+#ifndef PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H
+#define PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H
 
 #include "BeliefProp.h"
 
@@ -66,5 +66,5 @@ class WeightedBp : public BeliefProp
      DISALLOW_COPY_AND_ASSIGN (WeightedBp);
 };
 
-#endif // HORUS_WEIGHTEDBP_H
+#endif // PACKAGES_CLPBN_HORUS_WEIGHTEDBP_H