6 files changed, 5 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index dbc18194..34ffb170 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ libhg_a_SOURCES = \
   scfg_translator.cc \
   hg.cc \
   hg_io.cc \
+  hg_intersect.cc \
   viterbi.cc \
   lattice.cc \
   aligner.cc \
@@ -55,9 +56,8 @@ libhg_a_SOURCES = \
   weights.cc \
   ttables.cc \
   ff.cc \
-  lm_ff.cc \
+  ff_lm.cc \
   ff_wordalign.cc \
-  hg_intersect.cc \
   lexcrf.cc \
   bottom_up_parser.cc \
   phrasebased_translator.cc \
diff --git a/src/cdec_ff.cc b/src/cdec_ff.cc
index 86abfb4a..89353f5f 100644
--- a/src/cdec_ff.cc
+++ b/src/cdec_ff.cc
@@ -1,7 +1,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "ff.h"
-#include "lm_ff.h"
+#include "ff_lm.h"
 #include "ff_factory.h"
 #include "ff_wordalign.h"
 
diff --git a/src/ff_itg_span.h b/src/ff_itg_span.h
deleted file mode 100644
index b990f86a..00000000
--- a/src/ff_itg_span.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _FF_ITG_SPAN_H_
-#define _FF_ITG_SPAN_H_
-
-class ITGSpanFeatures : public FeatureFunction {
-};
-
-#endif
diff --git a/src/lm_ff.cc b/src/ff_lm.cc
index f95140de..354787ec 100644
--- a/src/lm_ff.cc
+++ b/src/ff_lm.cc
@@ -1,4 +1,4 @@
-#include "lm_ff.h"
+#include "ff_lm.h"
 
 #include <sstream>
 #include <unistd.h>
diff --git a/src/lm_ff.h b/src/ff_lm.h
index cd717360..cd717360 100644
--- a/src/lm_ff.h
+++ b/src/ff_lm.h
diff --git a/src/ff_test.cc b/src/ff_test.cc
index 1c20f9ac..a51275c3 100644
--- a/src/ff_test.cc
+++ b/src/ff_test.cc
@@ -4,7 +4,7 @@
 #include <vector>
 #include <gtest/gtest.h>
 #include "hg.h"
-#include "lm_ff.h"
+#include "ff_lm.h"
 #include "ff.h"
 #include "trule.h"
 #include "sentence_metadata.h"