diff --git a/contrib/other-builds/extract-ghkm/.project b/contrib/other-builds/extract-ghkm/.project
index 9126f3942..65187bf53 100644
--- a/contrib/other-builds/extract-ghkm/.project
+++ b/contrib/other-builds/extract-ghkm/.project
@@ -61,6 +61,21 @@
1
PARENT-3-PROJECT_LOC/phrase-extract/OutputFileStream.h
+
+ PhraseExtractionOptions.h
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseExtractionOptions.h
+
+
+ PhraseOrientation.cpp
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.cpp
+
+
+ PhraseOrientation.h
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.h
+
SentenceAlignment.cpp
1
diff --git a/contrib/other-builds/extract-rules/.project b/contrib/other-builds/extract-rules/.project
index 90c62e2d4..351e93162 100644
--- a/contrib/other-builds/extract-rules/.project
+++ b/contrib/other-builds/extract-rules/.project
@@ -60,6 +60,21 @@
1
PARENT-3-PROJECT_LOC/phrase-extract/OutputFileStream.h
+
+ PhraseExtractionOptions.h
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseExtractionOptions.h
+
+
+ PhraseOrientation.cpp
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.cpp
+
+
+ PhraseOrientation.h
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.h
+
SentenceAlignment.cpp
1
diff --git a/contrib/other-builds/moses/.project b/contrib/other-builds/moses/.project
index 2286e35e3..fe9a81690 100644
--- a/contrib/other-builds/moses/.project
+++ b/contrib/other-builds/moses/.project
@@ -710,6 +710,16 @@
1
PARENT-3-PROJECT_LOC/moses/Phrase.h
+
+ PhraseOrientation.cpp
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.cpp
+
+
+ PhraseOrientation.h
+ 1
+ PARENT-3-PROJECT_LOC/phrase-extract/PhraseOrientation.h
+
PrefixTree.h
1
@@ -2465,6 +2475,16 @@
1
PARENT-3-PROJECT_LOC/moses/parameters/ServerOptions.h
+
+ parameters/SyntaxOptions.cpp
+ 1
+ PARENT-3-PROJECT_LOC/moses/parameters/SyntaxOptions.cpp
+
+
+ parameters/SyntaxOptions.h
+ 1
+ PARENT-3-PROJECT_LOC/moses/parameters/SyntaxOptions.h
+
FF/LexicalReordering/LexicalReordering.cpp
1
diff --git a/moses/parameters/InputOptions.cpp.orig b/moses/parameters/InputOptions.cpp.orig
deleted file mode 100644
index 5337be2fa..000000000
--- a/moses/parameters/InputOptions.cpp.orig
+++ /dev/null
@@ -1,105 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
-#include "InputOptions.h"
-#include
-#include
-#include "moses/StaticData.h"
-#include "moses/TypeDef.h"
-
-namespace Moses {
-
- InputOptions::
- InputOptions()
- {
- xml_brackets.first = "<";
- xml_brackets.second = ">";
- input_type = SentenceInput;
- }
-
- bool
- InputOptions::
- init(Parameter const& param)
- {
- param.SetParameter(input_type, "inputtype", SentenceInput);
- if (input_type == SentenceInput)
- { VERBOSE(2, "input type is: text input"); }
- else if (input_type == ConfusionNetworkInput)
- { VERBOSE(2, "input type is: confusion net"); }
- else if (input_type == WordLatticeInput)
- { VERBOSE(2, "input type is: word lattice"); }
- else if (input_type == TreeInputType)
- { VERBOSE(2, "input type is: tree"); }
- else if (input_type == TabbedSentenceInput)
- { VERBOSE(2, "input type is: tabbed sentence"); }
- else if (input_type == ForestInputType)
- { VERBOSE(2, "input type is: forest"); }
-
- param.SetParameter(continue_partial_translation,
- "continue-partial-translation", false);
- param.SetParameter(default_non_term_only_for_empty_range,
- "default-non-term-for-empty-range-only", false);
-
-
- param.SetParameter(xml_policy, "xml-input", XmlPassThrough);
-
- // specify XML tags opening and closing brackets for XML option
- // Do we really want this to be configurable???? UG
- const PARAM_VEC *pspec;
- pspec = param.GetParam("xml-brackets");
- if (pspec && pspec->size())
- {
- std::vector brackets = Tokenize(pspec->at(0));
- if(brackets.size()!=2)
- {
- std::cerr << "invalid xml-brackets value, "
- << "must specify exactly 2 blank-delimited strings "
-<<<<<<< HEAD
- << "for XML tags opening and closing brackets" << std::endl;
- exit(1);
- }
- xml_brackets.first= brackets[0];
- xml_brackets.second=brackets[1];
-=======
- << "for XML tags opening and closing brackets"
- << std::endl;
- exit(1);
- }
-
- xml_brackets.first= brackets[0];
- xml_brackets.second=brackets[1];
-
->>>>>>> b733804fdcf20a5a9e822861471248c8fdbc0e2d
- VERBOSE(1,"XML tags opening and closing brackets for XML input are: "
- << xml_brackets.first << " and "
- << xml_brackets.second << std::endl);
- }
-
-<<<<<<< HEAD
- param.SetParameter(placeholder_factor, "placeholder-factor", NOT_FOUND);
-
- return true;
- }
-
-
-#ifdef HAVE_XMLRPC_C
- bool
- InputOptions::
- update(std::mapconst& param)
- {
- typedef std::map params_t;
- params_t::const_iterator si = param.find("xml-input");
- if (si != param.end())
- xml_policy = Scan(xmlrpc_c::value_string(si->second));
- return true;
- }
-#endif
-
-=======
- pspec = param.GetParam("input-factors");
- if (pspec) factor_order = Scan(*pspec);
- if (factor_order.empty()) factor_order.assign(1,0);
-
- return true;
- }
-
->>>>>>> b733804fdcf20a5a9e822861471248c8fdbc0e2d
-}
diff --git a/moses/parameters/InputOptions.h.orig b/moses/parameters/InputOptions.h.orig
deleted file mode 100644
index 89320700d..000000000
--- a/moses/parameters/InputOptions.h.orig
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
-#pragma once
-#include
-#include "moses/Parameter.h"
-#include
-#include "OptionsBaseClass.h"
-
-namespace Moses
-{
- struct
- InputOptions : public OptionsBaseClass
- {
- bool continue_partial_translation;
- bool default_non_term_only_for_empty_range; // whatever that means
- InputTypeEnum input_type;
- XmlInputType xml_policy; // pass through, ignore, exclusive, inclusive
-<<<<<<< HEAD
-
- FactorType placeholder_factor; // where to store original text for placeholders
-
-
-=======
- std::vector factor_order; // input factor order
-
->>>>>>> b733804fdcf20a5a9e822861471248c8fdbc0e2d
- std::pair xml_brackets;
- // strings to use as XML tags' opening and closing brackets.
- // Default are "<" and ">"
-
- InputOptions();
-
- bool init(Parameter const& param);
- bool update(std::mapconst& param);
-
- };
-
-}
-