build: Warnings correction for gcc 4.2

Also in this commit some code style corrections.

Change-Id: Idf2b5b96b328fb3dbea7440362c84d7759a10ec5
Refs: #1429
diff --git a/tests/test-block.cpp b/tests/test-block.cpp
index 1c7557d..c0b9671 100644
--- a/tests/test-block.cpp
+++ b/tests/test-block.cpp
@@ -5,8 +5,7 @@
 
 #include "encoding/encoding-buffer.hpp"
 
-#include <boost/test/unit_test.hpp>
-#include <boost/concept_check.hpp>
+#include "boost-test.hpp"
 
 using namespace std;
 namespace ndn {