diff --git a/src/ana/CMakeLists.txt b/src/ana/CMakeLists.txt
index 4c0c94cd73e..8ca598aa009 100644
--- a/src/ana/CMakeLists.txt
+++ b/src/ana/CMakeLists.txt
@@ -4,13 +4,9 @@ project( ana )
 
 add_subdirectory( src )
 
-add_subdirectory( apps )
-
 option( apps "Compile sample applications as well" OFF )
 
 if ( apps )
     message ( STATUS "Compiling sample applications as well." )
     add_subdirectory( apps )
 endif ( apps )
-
-
diff --git a/src/ana/apps/chat/CMakeLists.txt b/src/ana/apps/chat/CMakeLists.txt
index 45808d6b0d2..6bb589ba4c2 100644
--- a/src/ana/apps/chat/CMakeLists.txt
+++ b/src/ana/apps/chat/CMakeLists.txt
@@ -1,20 +1,17 @@
-find_library( ANA ana REQUIRED )
 
 find_library( GETOPT getopt_pp REQUIRED )
 
-if ( ANA )
-    if ( GETOPT )
-        add_executable( server server.cpp )
+include_directories( ../../api )
 
-        target_link_libraries( server ${ANA} ${GETOPT} )
+if ( GETOPT )
+    add_executable( server server.cpp )
 
-        add_executable( client client.cpp )
+    target_link_libraries( server ana ${GETOPT} )
 
-        target_link_libraries( client ${ANA} ${GETOPT} )
+    add_executable( client client.cpp )
 
-    else ( GETOPT )
-        message ( FATAL_ERROR "Install GetOpt_pp: getoptpp.googlecode.com" )
-    endif (GETOPT )
-else ( ANA )
-    message ( FATAL_ERROR "Install the ana library." )
-endif ( ANA )
\ No newline at end of file
+    target_link_libraries( client ana ${GETOPT} )
+
+else ( GETOPT )
+    message ( FATAL_ERROR "Install GetOpt_pp: getoptpp.googlecode.com" )
+endif (GETOPT )
diff --git a/src/ana/apps/chat/client.cpp b/src/ana/apps/chat/client.cpp
index d1c591ef79f..9c80280b164 100644
--- a/src/ana/apps/chat/client.cpp
+++ b/src/ana/apps/chat/client.cpp
@@ -34,7 +34,7 @@
 
 #include "getopt_pp.h"
 
-#include "ana/ana.hpp"
+#include "ana.hpp"
 
 using namespace GetOpt;
 using namespace ana;
diff --git a/src/ana/apps/chat/server.cpp b/src/ana/apps/chat/server.cpp
index 85a22a344a3..ab09b357fe0 100644
--- a/src/ana/apps/chat/server.cpp
+++ b/src/ana/apps/chat/server.cpp
@@ -34,7 +34,7 @@
 
 #include <boost/bind.hpp>
 
-#include "ana/ana.hpp"
+#include "ana.hpp"
 #include "getopt_pp.h"
 
 using namespace GetOpt;