diff --git a/OnDiskPt/PhraseNode.cpp b/OnDiskPt/PhraseNode.cpp
index 98a55dbc1..9a5cdea20 100644
--- a/OnDiskPt/PhraseNode.cpp
+++ b/OnDiskPt/PhraseNode.cpp
@@ -38,10 +38,10 @@ size_t PhraseNode::GetNodeSize(size_t numChildren, size_t wordSize, size_t count
 }
 
 PhraseNode::PhraseNode()
-  :m_currChild(NULL)
+  : m_value(0) 
+  ,m_currChild(NULL)
   ,m_saved(false)
   ,m_memLoad(NULL)
-  ,m_value(0)
 {
 }
 
diff --git a/moses/src/Scope3Parser/VarSpanTrieBuilder.h b/moses/src/Scope3Parser/VarSpanTrieBuilder.h
index 76063af34..cad0e1b2c 100644
--- a/moses/src/Scope3Parser/VarSpanTrieBuilder.h
+++ b/moses/src/Scope3Parser/VarSpanTrieBuilder.h
@@ -27,8 +27,8 @@
 namespace Moses
 {
 
-class ApplicableRuleTrie;
-class VarSpanNode;
+struct ApplicableRuleTrie;
+struct VarSpanNode;
 
 class VarSpanTrieBuilder
 {
diff --git a/moses/src/TargetPhrase.h b/moses/src/TargetPhrase.h
index 1e1c74d24..d291ed0ce 100644
--- a/moses/src/TargetPhrase.h
+++ b/moses/src/TargetPhrase.h
@@ -51,10 +51,11 @@ protected:
   float m_transScore;
   float m_fullScore;
   ScoreComponentCollection m_scoreBreakdown;
-  const AlignmentInfo *m_alignmentInfo;
 
   // in case of confusion net, ptr to source phrase
   Phrase const* m_sourcePhrase;
+
+  const AlignmentInfo *m_alignmentInfo;
   Word m_lhsTarget;
 
 public:
diff --git a/scripts/training/compact-rule-table/Compactify.h b/scripts/training/compact-rule-table/Compactify.h
index eb9febbba..ef5c1d9ec 100644
--- a/scripts/training/compact-rule-table/Compactify.h
+++ b/scripts/training/compact-rule-table/Compactify.h
@@ -10,7 +10,7 @@
 
 namespace moses {
 
-class Options;
+struct Options;
 
 // Tool for converting a rule table into a more compact format.
 class Compactify : public Tool {
diff --git a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h
index 34394c935..65ce9ac70 100644
--- a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h
+++ b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h
@@ -30,7 +30,7 @@ namespace Moses {
 namespace GHKM {
 
 class Node;
-class Options;
+struct Options;
 
 class ComposedRule
 {
@@ -60,8 +60,8 @@ class ComposedRule
   std::vector<const Subgraph *> m_attachedRules;
   std::queue<const Node *> m_openAttachmentPoints;
   int m_depth;
-  int m_nodeCount;
   int m_size;
+  int m_nodeCount;
 };
 
 }  // namespace GHKM
diff --git a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h
index 7f25cd87d..de699a65e 100644
--- a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h
+++ b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h
@@ -30,7 +30,7 @@
 namespace Moses {
 namespace GHKM {
 
-class Options;
+struct Options;
 class ParseTree;
 
 class ExtractGHKM
diff --git a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h
index edea1e95c..738d09ce9 100644
--- a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h
+++ b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h
@@ -26,9 +26,9 @@
 namespace Moses {
 namespace GHKM {
 
-class Options;
+struct Options;
 class ScfgRule;
-class Symbol;
+struct Symbol;
 
 class ScfgRuleWriter
 {