diff --git a/Makefile b/Makefile
index d022c04..cca7c32 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,7 @@
 TOP = .
 include $(TOP)/configure/CONFIG
 DIRS := $(DIRS) configure
-DIRS := $(DIRS) pimegaSupport
 DIRS := $(DIRS) pimegaApp
-
-pimegaApp_DEPEND_DIRS += pimegaSupport
 ifeq ($(BUILD_IOCS), YES)
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocs))
 iocs_DEPEND_DIRS += pimegaApp
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 7d14ecd..eab75b9 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -19,6 +19,8 @@ CHECK_RELEASE = YES
 
 HOST_OPT=NO
 
+PIMEGA_INCLUDE=/usr/local/include/pimega
+
 # Set this when you only want to compile this application
 #   for a subset of the cross-compiled target architectures
 #   that Base is built for.
diff --git a/pimegaApp/src/Makefile b/pimegaApp/src/Makefile
index 529bbee..b14979b 100644
--- a/pimegaApp/src/Makefile
+++ b/pimegaApp/src/Makefile
@@ -6,9 +6,8 @@ include $(TOP)/configure/CONFIG
 # Build an Support Module
 # -------------------------------
 
-USR_INCLUDES += -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-
-#INC += pimegaDetector.h
+USR_INCLUDES += $(addprefix -I, $(GLIB_INCLUDE))
+USR_INCLUDES += $(addprefix -I, $(PIMEGA_INCLUDE))
 
 LIBRARY_IOC_Linux += pimegaDetector
 
diff --git a/pimegaSupport/Makefile b/pimegaSupport/Makefile
deleted file mode 100644
index 2a790b4..0000000
--- a/pimegaSupport/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-TOP=..
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-USR_INCLUDES += -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-
-INC += pimega.h
-INC += decode.h
-INC += utils.h
-INC += lib/acquisition.h
-INC += lib/backend_config.h
-INC += lib/backend_interface.h
-INC += lib/config_file.h
-INC += lib/config.h
-INC += lib/dac.h
-INC += lib/debug.h
-INC += lib/generic.h
-INC += lib/load.h
-INC += lib/monitoring.h
-INC += lib/omr.h
-INC += lib/scan.h
-INC += lib/sd_card.h
-INC += lib/system.h
-INC += lib/test_pulse.h
-INC += lib/trigger.h
-INC += lib/pimega_thread.h
-INC += lib/message_broker.hpp
-INC += lib/zmq_message_broker.hpp
-INC += driver/US_acquisition.h
-INC += driver/US_dac.h
-INC += driver/US_debug.h
-INC += driver/US_ethernet.h
-INC += driver/US_generic.h
-INC += driver/US_interface.h
-INC += driver/US_load.h
-INC += driver/US_monitoring.h
-INC += driver/US_omr.h
-INC += driver/US_scan.h
-INC += driver/US_sd_card.h
-INC += driver/US_serial.h
-INC += driver/US_system.h
-INC += driver/US_test_pulse.h
-INC += driver/US_trigger.h
-INC += compatibility/compatibility.h
-INC += compatibility/default/trigger/trigger.h
-INC += compatibility/default/default_enums.h
-INC += compatibility/default/test_pulse/test_pulse.h
-INC += compatibility/default/system/system.h
-INC += compatibility/old_versions/old_versions.h
-INC += compatibility/old_versions/version_4_0_x/commands.h
-INC += compatibility/old_versions/version_3_16_x_4_0_x/commands.h
-
-ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
-LIB_INSTALLS_Linux += ../os/linux-x86_64/libpimega.so
-endif
-
-ifeq (linux-ppc64, $(findstring linux-ppc64, $(T_A)))
-LIB_INSTALLS_Linux += ../os/linux-ppc64/libpimega.so
-endif
-
-#=============================
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE