diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a0e756c1e39fe876b72bde7da7e278679942835..92d7969770b0f97fde5d1048dc86877929ee8f72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ SET(${PROJECT_NAME}_HEADERS
   include/gepetto/viewer/corba/server.hh
   include/gepetto/viewer/corba/client.hh
   include/gepetto/viewer/corba/se3.hh
+  include/gepetto/viewer/corba/fwd.hh
   )
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
@@ -48,6 +49,8 @@ ADD_REQUIRED_DEPENDENCY("urdfdom")
 ADD_REQUIRED_DEPENDENCY("eigen3 >= v3.0.5")
 SEARCH_FOR_BOOST()
 
+PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
+
 INCLUDE_DIRECTORIES(SYSTEM ${EIGEN3_INCLUDE_DIRS})
 
 ADD_SUBDIRECTORY(src)
diff --git a/src/fwd.hh b/include/gepetto/viewer/corba/fwd.hh
similarity index 100%
rename from src/fwd.hh
rename to include/gepetto/viewer/corba/fwd.hh
diff --git a/src/server.hh b/include/gepetto/viewer/corba/server.hh
similarity index 100%
rename from src/server.hh
rename to include/gepetto/viewer/corba/server.hh