diff --git a/src/Makefile b/src/Makefile
index 73fc98c..dc7a09f 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ default::
 
 install::
 	$(MAKE) all
-	# TODO
+	$(MAKE) -C openpod install
 	$(MAKE) -C libs install
 
 all::
@@ -19,4 +19,5 @@ clean::
 	$(MAKE) -C libs clean
 	$(MAKE) -C test clean
 	$(MAKE) -C examples clean
+	$(MAKE) -C openpod clean
 
diff --git a/src/config.mk b/src/config.mk
index 5e0c329..5505bda 100755
--- a/src/config.mk
+++ b/src/config.mk
@@ -1,3 +1,10 @@
 MAKEFLAGS += --no-print-directory
 #CC=C:/MinGW/bin/mingw32-gcc.exe
 
+
+# Path to install headers to
+# INCLUDE_INST_DIR=
+
+# Path to install headers to
+# LIB_INST_DIR=
+
diff --git a/src/libs/Makefile b/src/libs/Makefile
index c9b5d95..0ae6fdc 100755
--- a/src/libs/Makefile
+++ b/src/libs/Makefile
@@ -3,14 +3,22 @@ include ../config.mk
 all::
 	$(MAKE) -C openpod_helpers	all
 	$(MAKE) -C indirect_kernel 	all
-#	$(MAKE) -C openpod_rq 		all
+	$(MAKE) -C openpod_rq 		all
 #	$(MAKE) test
 
 install::
-	# TODO
+ifdef LIB_INST_DIR
+	echo cp *.h $(LIB_INST_DIR)
+else
+#$(info Please define LIB_INST_DIR in config.mk)
+	@echo 
+	@echo Please define LIB_INST_DIR in config.mk
+	@echo 
+	@false
+endif
 
 clean::
 	$(MAKE) -C openpod_helpers	clean
 	$(MAKE) -C indirect_kernel 	clean
-#	$(MAKE) -C openpod_rq		clean
+	$(MAKE) -C openpod_rq		clean
 	-rm *.a
diff --git a/src/libs/openpod_helpers/Makefile b/src/libs/openpod_helpers/Makefile
index 0fb083c..c59de9c 100755
--- a/src/libs/openpod_helpers/Makefile
+++ b/src/libs/openpod_helpers/Makefile
@@ -10,8 +10,10 @@ install::
 clean::
 	-rm *.o
 	-rm *.a
-	-rm *.~c
-	-rm *.~h
+	-rm *.c~
+	-rm *.h~
+	-rm *.ad?~
+	-rm *.ali
 
 # turned ADA off - openpod.o
 libopenpod_helpers.a: pod_dev_event.o request.o driver.o device.o rq_to_sync.o rq_stubs.o properties.o mem.o
diff --git a/src/openpod/Makefile b/src/openpod/Makefile
new file mode 100755
index 0000000..5dd32cc
--- /dev/null
+++ b/src/openpod/Makefile
@@ -0,0 +1,19 @@
+include ../config.mk
+
+default::
+	@echo type 'make install' to install headers
+
+install::
+ifdef INCLUDE_INST_DIR
+	echo cp *.h $(INCLUDE_INST_DIR)
+else
+	@echo 
+	@echo Please define INCLUDE_INST_DIR in config.mk
+	@echo 
+	@false
+#$(info Please define INCLUDE_INST_DIR in config.mk)
+endif
+
+clean::
+	-rm *.h~
+
diff --git a/src/openpod/pod_types.h b/src/openpod/pod_types.h
index e461949..a2b98c8 100755
--- a/src/openpod/pod_types.h
+++ b/src/openpod/pod_types.h
@@ -2,11 +2,15 @@
 // Hook to use local types definitions
 #include "pod_local_types.h"
 
+#ifndef POD_SIZE_T_DEFINED
+#define POD_SIZE_T_DEFINED
 
 // Get just one type definition
 #define __need_size_t
 #include <stddef.h>
 
+#endif // POD_SIZE_T_DEFINED
+
 
 #ifndef POD_ERRNO_T_DEFINED
 #define POD_ERRNO_T_DEFINED
diff --git a/src/pod_local_types.h b/src/pod_local_types.h
index 71cd9c9..4fc2786 100755
--- a/src/pod_local_types.h
+++ b/src/pod_local_types.h
@@ -1 +1,16 @@
 // Empty, to satisfy include from pod_types.h
+
+// Actually this include must bring types such as size_t, uint32_t, etc from host OS
+// See pod_types.h for list of types
+
+
+// Example of possible definition
+
+// #include <sys/errno.h> // defines errno_t;
+// #define POD_ERRNO_T_DEFINED
+
+
+// OR just define it here
+
+// typedef unsigned int      size_t;
+// #define POD_SIZE_T_DEFINED
diff --git a/src/test/unit/suites/suite_skeleton.c b/src/test/unit/suites/suite_skeleton.c.in
similarity index 100%
rename from src/test/unit/suites/suite_skeleton.c
rename to src/test/unit/suites/suite_skeleton.c.in