diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4e1efafde5..1384b197a4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2016-09-23 11:00 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/gtqtc/gtqtc1.cpp
+    * removed unnecessary casting after recent modification
+
+  * src/3rd/jpeg/Makefile
+  * src/3rd/jpeg/jconfig.h
+    ! moved definitions which interacts with 3-rd party code using libjpeg
+      header files to jconfig.h
+
 2016-09-23 09:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/gtqtc/gtqtc1.cpp
     ! fixed C++ casting in MS-Windows builds
diff --git a/contrib/gtqtc/gtqtc1.cpp b/contrib/gtqtc/gtqtc1.cpp
index a38136f26e..f75146e773 100644
--- a/contrib/gtqtc/gtqtc1.cpp
+++ b/contrib/gtqtc/gtqtc1.cpp
@@ -97,7 +97,7 @@ static void hb_gt_qtc_itemGetQString( PHB_ITEM pItem, QString * pqStr )
 #if defined( HB_OS_WIN )
       * pqStr = QString::fromWCharArray( wStr, nSize );
 #else
-      * pqStr = QString::fromUtf16( static_cast< const ushort * >( wStr ), nSize );
+      * pqStr = QString::fromUtf16( wStr, nSize );
 #endif
       hb_strfree( hStr );
    }
@@ -111,8 +111,7 @@ static PHB_ITEM hb_gt_qtc_itemPutQString( PHB_ITEM pItem, const QString * pqStr
                                pqStr->size() );
 #else
    return hb_itemPutStrLenU16( pItem, HB_CDP_ENDIAN_NATIVE,
-                               static_cast< const HB_WCHAR * >( pqStr->utf16() ),
-                               pqStr->size() );
+                               pqStr->utf16(), pqStr->size() );
 #endif
 }
 
diff --git a/src/3rd/jpeg/Makefile b/src/3rd/jpeg/Makefile
index 023db46c82..c5c83ade75 100644
--- a/src/3rd/jpeg/Makefile
+++ b/src/3rd/jpeg/Makefile
@@ -85,7 +85,6 @@ ifeq ($(filter $(HB_COMPILER),<>),)
    include $(TOP)$(ROOT)config/detfun.mk
 
    ifneq ($(HB_HAS_JPEG_LOCAL),)
-      HB_CFLAGS += -DHAVE_STDLIB_H -DHAVE_PROTOTYPES -DHAVE_UNSIGNED_CHAR
       ifeq ($(HB_COMPILER),poccarm)
          HB_CFLAGS += -DNO_GETENV
       endif
diff --git a/src/3rd/jpeg/jconfig.h b/src/3rd/jpeg/jconfig.h
index e69de29bb2..dcef260f1d 100644
--- a/src/3rd/jpeg/jconfig.h
+++ b/src/3rd/jpeg/jconfig.h
@@ -0,0 +1,11 @@
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Compiler supports function prototypes. */
+#define HAVE_PROTOTYPES 1
+
+/* Compiler supports 'unsigned char'. */
+#define HAVE_UNSIGNED_CHAR 1
+
+/* Compiler supports 'unsigned short'. */
+#define HAVE_UNSIGNED_SHORT 1