diff --git a/core/Makefile.am b/core/Makefile.am
index 568880c6..42586686 100644
--- a/core/Makefile.am
+++ b/core/Makefile.am
@@ -1,6 +1,9 @@
 AM_CFLAGS = -I./ \
             -I../utils \
             -I../location \
+            -I./data-items \
+            -I./data-items/common \
+            -I./observer \
             $(LOCPLA_CFLAGS) \
             $(GPSUTILS_CFLAGS) \
             -I$(WORKSPACE)/gps-noship/flp \
diff --git a/gnss/Makefile.am b/gnss/Makefile.am
index 3afdcd7a..2365e4c1 100644
--- a/gnss/Makefile.am
+++ b/gnss/Makefile.am
@@ -4,12 +4,15 @@ AM_CFLAGS = \
      -I./ \
      -I../utils \
      -I../core \
+     -I../core/data-items \
+     -I../core/observer \
      -I../location \
      -std=c++11
 
 libgnss_la_SOURCES = \
     location_gnss.cpp \
     GnssAdapter.cpp \
+    XtraSystemStatusObserver.cpp \
     Agps.cpp
 
 if USE_GLIB