diff --git a/arch/Darwin-gnu-arm64.psmp b/arch/Darwin-gnu-arm64.psmp
index 3cb20478d6..42634e13e0 100644
--- a/arch/Darwin-gnu-arm64.psmp
+++ b/arch/Darwin-gnu-arm64.psmp
@@ -162,7 +162,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include 
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Darwin-gnu-arm64.ssmp b/arch/Darwin-gnu-arm64.ssmp
index d8f96a051c..3150c9e2d4 100644
--- a/arch/Darwin-gnu-arm64.ssmp
+++ b/arch/Darwin-gnu-arm64.ssmp
@@ -145,7 +145,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Eiger-mc-gnu.psmp b/arch/Eiger-mc-gnu.psmp
index 74d542d262..3961c04c10 100644
--- a/arch/Eiger-mc-gnu.psmp
+++ b/arch/Eiger-mc-gnu.psmp
@@ -204,7 +204,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Eiger-mc-intel.psmp b/arch/Eiger-mc-intel.psmp
index eb5cf14569..8379197743 100644
--- a/arch/Eiger-mc-intel.psmp
+++ b/arch/Eiger-mc-intel.psmp
@@ -186,7 +186,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-amd-x86_64.ssmp b/arch/Linux-amd-x86_64.ssmp
index ee863accfe..58294fb507 100644
--- a/arch/Linux-amd-x86_64.ssmp
+++ b/arch/Linux-amd-x86_64.ssmp
@@ -103,7 +103,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules 
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules 
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-gnu-aarch64-static.ssmp b/arch/Linux-gnu-aarch64-static.ssmp
index 1b949c2401..51b178ff61 100644
--- a/arch/Linux-gnu-aarch64-static.ssmp
+++ b/arch/Linux-gnu-aarch64-static.ssmp
@@ -122,7 +122,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-gnu-aarch64.psmp b/arch/Linux-gnu-aarch64.psmp
index fc5242ed89..228dbd4e38 100644
--- a/arch/Linux-gnu-aarch64.psmp
+++ b/arch/Linux-gnu-aarch64.psmp
@@ -224,7 +224,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-gnu-x86_64-static.ssmp b/arch/Linux-gnu-x86_64-static.ssmp
index b22b0e5960..88e8e99947 100644
--- a/arch/Linux-gnu-x86_64-static.ssmp
+++ b/arch/Linux-gnu-x86_64-static.ssmp
@@ -129,7 +129,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp
index aff15738a1..676724db59 100644
--- a/arch/Linux-gnu-x86_64.psmp
+++ b/arch/Linux-gnu-x86_64.psmp
@@ -248,7 +248,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP
diff --git a/arch/Linux-intel-x86_64.psmp b/arch/Linux-intel-x86_64.psmp
index f4bf3b7378..4d63b41d71 100644
--- a/arch/Linux-intel-x86_64.psmp
+++ b/arch/Linux-intel-x86_64.psmp
@@ -203,7 +203,7 @@ endif
 ifneq ($(USE_LIBGRPP),)
    USE_LIBGRPP    := $(strip $(USE_LIBGRPP))
    LIBGRPP_INC    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include
-   LIBGRPP_INC    += $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/GNU-$(GNU_VER)/fortran_modules
+   LIBGRPP_INC    += -I$(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/include/libgrpp/GNU-$(GNU_VER)/fortran_modules
    LIBGRPP_LIB    := $(INSTALL_PATH)/libgrpp-main-$(USE_LIBGRPP)/lib
    CFLAGS         += -I$(LIBGRPP_INC)
    DFLAGS         += -D__LIBGRPP