diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 853def2374..70eb5b0fa9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 18:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/linux/sunpro.mk
+    + Setting CXX for linux/sunpro.mk to make it build .cpp files
+      without forcing cpp mode explicitly. (suncc seems to do nothing
+      with .cpp input files.)
+      Same fix for sunos/sunpro?
+
+  * config/rules.mk
+    + Added option to override C++ compiler tool name with
+      $(CXX) variable.
+
+  * external/sqlite3/Makefile
+  * external/libpng/Makefile
+    * Formatting/cleanup.
+
 2009-08-27 17:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/linux/sunpro.mk
   * config/sunos/sunpro.mk
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 570d39fc47..d094705b3d 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -18,6 +18,8 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )
 
+CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCPOSTFIX)
+
 CPPFLAGS := -I. -I$(HB_INC_COMPILE)
 CFLAGS :=
 LDFLAGS :=
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index bb6518e5df..1d1ec96659 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -37,7 +37,7 @@ CC_FLAGS := $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CFLAGS)
 
 # The rule to compile a C source file.
 ifeq ($(CC_RULE),)
-   CC_RULE = $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<
+   CC_RULE = $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
    ifneq ($(HB_BUILD_DLL),no)
       ifneq ($(HB_DYN_COPT),)
          ifneq ($(LIBNAME),)
@@ -55,7 +55,10 @@ endif
 
 # The rule to compile a C++ source file.
 ifeq ($(CPP_RULE),)
-   CPP_RULE = $(CC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
+   ifeq ($(CXX),)
+      CXX := $(CC)
+   endif
+   CPP_RULE = $(CXX) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
 endif
 
 # The rule to link an executable.
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index 09baa015ec..c12f080f89 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -6,15 +6,29 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
-HB_BUILD_WARN := no
-HB_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
-
-ifeq ($(HB_COMPILER),djgpp)
-   HB_CFLAGS += -DPNG_NO_SNPRINTF
-endif
-
 LIBNAME := libpng
 
+HB_BUILD_WARN := no
+
+C_SOURCES := \
+   png.c \
+   pngerror.c \
+   pnggccrd.c \
+   pngget.c \
+   pngmem.c \
+   pngpread.c \
+   pngread.c \
+   pngrio.c \
+   pngrtran.c \
+   pngrutil.c \
+   pngset.c \
+   pngtrans.c \
+   pngvcrd.c \
+   pngwio.c \
+   pngwrite.c \
+   pngwtran.c \
+   pngwutil.c \
+
 ifeq ($(HB_WITH_LIBPNG),)
    ifeq ($(HB_PLATFORM),win)
       HB_WITH_LIBPNG := yes
@@ -37,28 +51,13 @@ ifeq ($(HB_WITH_LIBPNG),)
 endif
 
 ifeq ($(HB_WITH_LIBPNG),yes)
+   HB_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
 
-C_SOURCES := \
-   png.c \
-   pngerror.c \
-   pnggccrd.c \
-   pngget.c \
-   pngmem.c \
-   pngpread.c \
-   pngread.c \
-   pngrio.c \
-   pngrtran.c \
-   pngrutil.c \
-   pngset.c \
-   pngtrans.c \
-   pngvcrd.c \
-   pngwio.c \
-   pngwrite.c \
-   pngwtran.c \
-   pngwutil.c \
-
-include $(TOP)$(ROOT)config/lib.mk
+   ifeq ($(HB_COMPILER),djgpp)
+      HB_CFLAGS += -DPNG_NO_SNPRINTF
+   endif
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index 2ed1a82dd8..8414317446 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -6,20 +6,13 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
+LIBNAME := sqlite3
+
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
-ifeq ($(HB_PLATFORM),wce)
-   HB_CFLAGS += -D_WIN32_WCE
-endif
-ifeq ($(HB_PLATFORM),dos)
-   # DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
-   # so we're forcing the next best available option. This will cause missing
-   # externals though. [vszakats]
-   HB_CFLAGS += -DSQLITE_OS_OTHER
-endif
-
-LIBNAME := sqlite3
+C_SOURCES := \
+   sqlite3.c \
 
 ifeq ($(HB_WITH_SQLITE3),)
    ifeq ($(HB_PLATFORM),win)
@@ -48,12 +41,18 @@ endif
 
 ifeq ($(HB_WITH_SQLITE3),yes)
 
-C_SOURCES := \
-   sqlite3.c \
-
-include $(TOP)$(ROOT)config/lib.mk
+   ifeq ($(HB_PLATFORM),wce)
+      HB_CFLAGS += -D_WIN32_WCE
+   endif
+   ifeq ($(HB_PLATFORM),dos)
+      # DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
+      # so we're forcing the next best available option. This will cause missing
+      # externals though. [vszakats]
+      HB_CFLAGS += -DSQLITE_OS_OTHER
+   endif
 
+   include $(TOP)$(ROOT)config/lib.mk
 else
-HB_SKIP_REASON := not supported or disabled
-include $(TOP)$(ROOT)config/none.mk
+   HB_SKIP_REASON := not supported or disabled
+   include $(TOP)$(ROOT)config/none.mk
 endif