Index: /trunk/FACT++/src/makedata.cc
===================================================================
--- /trunk/FACT++/src/makedata.cc	(revision 15209)
+++ /trunk/FACT++/src/makedata.cc	(revision 15210)
@@ -1,3 +1,3 @@
-#include <libnova/solar.h>
+#include "externals/nova.h"
 #include <libnova/lunar.h>
 #include <libnova/rise_set.h>
@@ -156,5 +156,5 @@
     vector<mysqlpp::Row>::const_iterator row=res.begin();
 
-    ln_equ_posn pos;
+    Nova::EquPosn pos;
     pos.ra  = double((*row)[0])*15;
     pos.dec = double((*row)[1]);
@@ -170,13 +170,11 @@
 
         // get local position of source
-        ln_hrz_posn hrz;
-        ln_get_hrz_from_equ(&pos, &observer, jd+h, &hrz);
+        const Nova::HrzPosn hrz = Nova::GetHrzFromEqu(pos, jd+h);
 
         // Get moon properties and
-        ln_equ_posn moon  = fMoonCoords[i].first;
+        const Nova::EquPosn moon = fMoonCoords[i].first;
         const double disk = fMoonCoords[i].second;
 
-        ln_hrz_posn hrzm;
-        ln_get_hrz_from_equ(&moon, &observer, jd+h, &hrzm);
+        const Nova::HrzPosn hrzm = Nova::GetHrzFromEqu(moon, jd+h);
 
         // Distance between source and moon