diff --git a/src/lsa/adj-lsa.hpp b/src/lsa/adj-lsa.hpp
index 0c784b9..5aad4c0 100644
--- a/src/lsa/adj-lsa.hpp
+++ b/src/lsa/adj-lsa.hpp
@@ -23,7 +23,8 @@
 #define NLSR_LSA_ADJ_LSA_HPP
 
 #include "lsa.hpp"
-#include "test-access-control.hpp"
+#include "adjacent.hpp"
+#include "adjacency-list.hpp"
 
 namespace nlsr {
 
diff --git a/src/lsa/coordinate-lsa.cpp b/src/lsa/coordinate-lsa.cpp
index b94d173..f25ab2c 100644
--- a/src/lsa/coordinate-lsa.cpp
+++ b/src/lsa/coordinate-lsa.cpp
@@ -22,8 +22,6 @@
 #include "coordinate-lsa.hpp"
 #include "tlv-nlsr.hpp"
 
-#include <boost/lexical_cast.hpp>
-
 namespace nlsr {
 
 CoordinateLsa::CoordinateLsa(const ndn::Name& originRouter, uint64_t seqNo,
diff --git a/src/lsa/lsa.cpp b/src/lsa/lsa.cpp
index 7d557dd..26fdad3 100644
--- a/src/lsa/lsa.cpp
+++ b/src/lsa/lsa.cpp
@@ -20,9 +20,6 @@
  */
 
 #include "lsa.hpp"
-#include "nlsr.hpp"
-#include "name-prefix-list.hpp"
-#include "adjacent.hpp"
 #include "tlv-nlsr.hpp"
 
 namespace nlsr {
diff --git a/src/lsa/lsa.hpp b/src/lsa/lsa.hpp
index 7dc225a..8404355 100644
--- a/src/lsa/lsa.hpp
+++ b/src/lsa/lsa.hpp
@@ -22,13 +22,13 @@
 #ifndef NLSR_LSA_LSA_HPP
 #define NLSR_LSA_LSA_HPP
 
-#include "name-prefix-list.hpp"
-#include "adjacent.hpp"
-#include "adjacency-list.hpp"
+#include "common.hpp"
 #include "test-access-control.hpp"
 
 #include <ndn-cxx/util/scheduler.hpp>
 
+#include <list>
+
 namespace nlsr {
 
 /*!
diff --git a/src/lsa/name-lsa.hpp b/src/lsa/name-lsa.hpp
index 5e4cfa6..cb85ac2 100644
--- a/src/lsa/name-lsa.hpp
+++ b/src/lsa/name-lsa.hpp
@@ -23,6 +23,7 @@
 #define NLSR_LSA_NAME_LSA_HPP
 
 #include "lsa.hpp"
+#include "name-prefix-list.hpp"
 
 namespace nlsr {