diff --git a/cmake/modules/FindCDF.cmake b/cmake/modules/FindCDF.cmake
index a33fa51..73a0b60 100644
--- a/cmake/modules/FindCDF.cmake
+++ b/cmake/modules/FindCDF.cmake
@@ -5,8 +5,8 @@
 # libcdf_INCLUDE_DIR - the libcdf include directory
 # libcdf_LIBRARIES - the libcdf library directory
 
-FIND_PATH(libcdf_INCLUDE_DIR cdf.h PATHS /include /usr/include /usr/local/include ${USERLOCAL_ROOT}/include)
-FIND_LIBRARY(libcdf_LIBRARIES NAMES cdf PATHS /lib /usr/lib /usr/local/lib ${USERLOCAL_ROOT}/lib )
+FIND_PATH(libcdf_INCLUDE_DIR cdf.h PATHS /include /usr/include /usr/local/include /usr/local/cdf/include ${USERLOCAL_ROOT}/include)
+FIND_LIBRARY(libcdf_LIBRARIES NAMES cdf PATHS /lib /usr/lib /usr/local/lib /usr/local/cdf/lib ${USERLOCAL_ROOT}/lib )
 
 # set FOUND flag
 IF(libcdf_INCLUDE_DIR AND libcdf_LIBRARIES)
diff --git a/src/DECODERS/themis/esa2nc/CMakeLists.txt b/src/DECODERS/themis/esa2nc/CMakeLists.txt
index 99a0e86..0107ff7 100644
--- a/src/DECODERS/themis/esa2nc/CMakeLists.txt
+++ b/src/DECODERS/themis/esa2nc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(esa2nc)
+PROJECT(themis_esa2nc)
 
 include_directories(
   ${CMAKE_HOME_DIRECTORY}/src/INCLUDE/
@@ -14,13 +14,13 @@ file(
         ./*
 )
   
-ADD_EXECUTABLE (esa2nc ${source_files} )
+ADD_EXECUTABLE (themis_esa2nc ${source_files} )
 
 target_link_libraries(
-  esa2nc
+  themis_esa2nc
   DD_Client
   ${NETCDFLIBRARY}
   ${libcdf_LIBRARIES}
 )
 
-install (TARGETS esa2nc DESTINATION bin)
+install (TARGETS themis_esa2nc DESTINATION bin)
diff --git a/src/DECODERS/themis/esafull2nc/CMakeLists.txt b/src/DECODERS/themis/esafull2nc/CMakeLists.txt
index ee6610b..add9042 100644
--- a/src/DECODERS/themis/esafull2nc/CMakeLists.txt
+++ b/src/DECODERS/themis/esafull2nc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(esafull2nc)
+PROJECT(themis_esafull2nc)
 
 include_directories(
   ${CMAKE_HOME_DIRECTORY}/src/INCLUDE/
@@ -14,13 +14,13 @@ file(
         ./*
 )
   
-ADD_EXECUTABLE (esafull2nc ${source_files} )
+ADD_EXECUTABLE (themis_esafull2nc ${source_files} )
 
 target_link_libraries(
-  esafull2nc
+  themis_esafull2nc
   DD_Client
   ${NETCDFLIBRARY}
   ${libcdf_LIBRARIES}
 )
 
-install (TARGETS esafull2nc DESTINATION bin)
+install (TARGETS themis_esafull2nc DESTINATION bin)
diff --git a/src/DECODERS/themis/esamom2nc/CMakeLists.txt b/src/DECODERS/themis/esamom2nc/CMakeLists.txt
index 6556da5..e1cb4e0 100644
--- a/src/DECODERS/themis/esamom2nc/CMakeLists.txt
+++ b/src/DECODERS/themis/esamom2nc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(esamom2nc)
+PROJECT(themis_esamom2nc)
 
 include_directories(
   ${CMAKE_HOME_DIRECTORY}/src/INCLUDE/
@@ -14,13 +14,13 @@ file(
         ./*
 )
   
-ADD_EXECUTABLE (esamom2nc ${source_files} )
+ADD_EXECUTABLE (themis_esamom2nc ${source_files} )
 
 target_link_libraries(
-  esamom2nc
+  themis_esamom2nc
   DD_Client
   ${NETCDFLIBRARY}
   ${libcdf_LIBRARIES}
 )
 
-install (TARGETS esamom2nc DESTINATION bin)
+install (TARGETS themis_esamom2nc DESTINATION bin)
diff --git a/src/DECODERS/themis/fgm2nc/CMakeLists.txt b/src/DECODERS/themis/fgm2nc/CMakeLists.txt
index 97f0bc2..6f4ed0d 100644
--- a/src/DECODERS/themis/fgm2nc/CMakeLists.txt
+++ b/src/DECODERS/themis/fgm2nc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(fgm2nc)
+PROJECT(themis_fgm2nc)
 
 include_directories(
   ${CMAKE_HOME_DIRECTORY}/src/INCLUDE/
@@ -14,13 +14,13 @@ file(
         ./*
 )
   
-ADD_EXECUTABLE (fgm2nc ${source_files} )
+ADD_EXECUTABLE (themis_fgm2nc ${source_files} )
 
 target_link_libraries(
-  fgm2nc
+  themis_fgm2nc
   DD_Client
   ${NETCDFLIBRARY}
   ${libcdf_LIBRARIES}
 )
 
-install (TARGETS fgm2nc DESTINATION bin)
+install (TARGETS themis_fgm2nc DESTINATION bin)
diff --git a/src/DECODERS/themis/sst2nc/CMakeLists.txt b/src/DECODERS/themis/sst2nc/CMakeLists.txt
index de83b44..c97f625 100644
--- a/src/DECODERS/themis/sst2nc/CMakeLists.txt
+++ b/src/DECODERS/themis/sst2nc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-PROJECT(sst2nc)
+PROJECT(themis_sst2nc)
 
 include_directories(
   ${CMAKE_HOME_DIRECTORY}/src/INCLUDE/
@@ -14,13 +14,13 @@ file(
         ./*
 )
   
-ADD_EXECUTABLE (sst2nc ${source_files} )
+ADD_EXECUTABLE (themis_sst2nc ${source_files} )
 
 target_link_libraries(
-  sst2nc
+  themis_sst2nc
   DD_Client
   ${NETCDFLIBRARY}
   ${libcdf_LIBRARIES}
 )
 
-install (TARGETS sst2nc DESTINATION bin)
+install (TARGETS themis_sst2nc DESTINATION bin)
diff --git a/src/INCLUDE/DD.h b/src/INCLUDE/DD.h
index 7ce65d8..646ce63 100755
--- a/src/INCLUDE/DD.h
+++ b/src/INCLUDE/DD.h
@@ -30,6 +30,10 @@ typedef struct { int type;        /* Type of variable in netcdf style */
 
 /*------------------- FUNCTIONS ---------------------------*/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int DD_SetVariable(char *VarName);
 /*
  * VarName - full name of variable <project>:<instrument>:<Variable>
@@ -100,6 +104,10 @@ extern int DD_AddDataSet(char *DataSetName, char *RemSetID, char *BaseName);
  * Request for new VI. See ../DOC/TECHDOC/DDServFunct.html
  */
 
+#ifdef __cplusplus
+}
+#endif
+
 /*--------------------- CONSTANTS -----------------------------------------*/
 #define MOREDATA      1  /* There is data, but we have to call GetData again right now*/
 #define MOREDELAY     2  /* There is data, but we have to call GetData again after delay */
--
libgit2 0.21.2