diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 706911e6..92048b29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -148,6 +148,6 @@ jobs:
           total_lines=`cat $PWD/output/.trace*.pfw | wc -l`
           echo $num_posix_lines of $total_lines
           rm -rf $PWD/output
-          if [[ "$num_posix_lines" -ne "641" ]]; then
+          if [[ "$num_posix_lines" -ne "640" ]]; then
             exit 1
           fi
\ No newline at end of file
diff --git a/include/dlio_profiler/core/constants.h b/src/dlio_profiler/core/constants.h
similarity index 100%
rename from include/dlio_profiler/core/constants.h
rename to src/dlio_profiler/core/constants.h
diff --git a/include/dlio_profiler/core/dlio_profiler_main.h b/src/dlio_profiler/core/dlio_profiler_main.h
similarity index 100%
rename from include/dlio_profiler/core/dlio_profiler_main.h
rename to src/dlio_profiler/core/dlio_profiler_main.h
diff --git a/include/dlio_profiler/core/enumeration.h b/src/dlio_profiler/core/enumeration.h
similarity index 100%
rename from include/dlio_profiler/core/enumeration.h
rename to src/dlio_profiler/core/enumeration.h
diff --git a/include/dlio_profiler/core/error.h b/src/dlio_profiler/core/error.h
similarity index 100%
rename from include/dlio_profiler/core/error.h
rename to src/dlio_profiler/core/error.h
diff --git a/include/dlio_profiler/core/macro.h b/src/dlio_profiler/core/macro.h
similarity index 100%
rename from include/dlio_profiler/core/macro.h
rename to src/dlio_profiler/core/macro.h
diff --git a/include/dlio_profiler/core/singleton.h b/src/dlio_profiler/core/singleton.h
similarity index 100%
rename from include/dlio_profiler/core/singleton.h
rename to src/dlio_profiler/core/singleton.h
diff --git a/include/dlio_profiler/core/typedef.h b/src/dlio_profiler/core/typedef.h
similarity index 100%
rename from include/dlio_profiler/core/typedef.h
rename to src/dlio_profiler/core/typedef.h
diff --git a/src/dlio_profiler/writer/base_writer.h b/src/dlio_profiler/writer/base_writer.h
index e9bc56f7..2af81958 100644
--- a/src/dlio_profiler/writer/base_writer.h
+++ b/src/dlio_profiler/writer/base_writer.h
@@ -18,45 +18,6 @@ namespace dlio_profiler {
     protected:
         bool throw_error;
         std::string filename;
-        int dlp_open(const char *pathname, int flags, ...) {
-          mode_t mode;
-          va_list args;
-          long result;
-
-          va_start(args, flags);
-          if (flags & O_CREAT) {
-            mode = va_arg(args, mode_t);
-          }
-          else {
-            mode = 0;
-          }
-          va_end(args);
-#if defined(SYS_open)
-          result = syscall(SYS_open, pathname, flags, mode);
-#else
-          result = syscall(SYS_openat, AT_FDCWD, pathname, flags, mode);
-#endif
-
-          if (result >= 0)
-            return (int) result;
-          return -1;
-        }
-
-        ssize_t dlp_write(int fd, const void *buf, size_t count) {
-          return syscall(SYS_write, fd, buf, count);
-        }
-
-        ssize_t dlp_read(int fd, void *buf, size_t count) {
-          return syscall(SYS_read, fd, buf, count);
-        }
-
-        int dlp_close(int fd) {
-          return syscall(SYS_close, fd);
-        }
-
-        int dlp_fsync(int fd) {
-          return syscall(SYS_fsync, fd);
-        }
     public:
         virtual void initialize(char *filename, bool throw_error) = 0;