diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index 315d1fe3..25c1f0d9 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -15156,8 +15156,6 @@ namespace cimg_library {
     static CImg get_load_pandore(const char *filename) {
       std::FILE *file = cimg::fopen(filename,"rb");
       typedef unsigned char uchar;
-      typedef unsigned short ushort;
-      typedef unsigned int uint;  
       typedef unsigned long ulong; 
       CImg dest;
       char tmp[32];
diff --git a/kexi/core/kexistartupdata.h b/kexi/core/kexistartupdata.h
index f31c82bf..c9c74848 100644
--- a/kexi/core/kexistartupdata.h
+++ b/kexi/core/kexistartupdata.h
@@ -29,7 +29,7 @@ class KexiProjectData;
 class KEXICORE_EXPORT KexiStartupData
 {
 	public:
-		typedef enum Action {
+		enum Action {
 			DoNothing,
 			CreateBlankProject,
 			CreateFromTemplate,
diff --git a/kexi/kexidb/cursor.h b/kexi/kexidb/cursor.h
index 8efeabb2..6f8e4d1e 100644
--- a/kexi/kexidb/cursor.h
+++ b/kexi/kexidb/cursor.h
@@ -254,7 +254,7 @@ class KEXI_DB_EXPORT Cursor: public TQObject, public Object
 
 	protected:
 		//! possible results of row fetching, used for m_result
-		typedef enum FetchResult { FetchError=0, FetchOK=1, FetchEnd=2 };
+		enum FetchResult { FetchError=0, FetchOK=1, FetchEnd=2 };
 
 		/*! Cursor will operate on \a conn, raw \a statement will be used to execute query. */
 		Cursor(Connection* conn, const TQString& statement, uint options = NoOptions );
diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h
index 88d76b06..b3e77b9d 100644
--- a/kexi/kexiutils/validator.h
+++ b/kexi/kexiutils/validator.h
@@ -45,7 +45,7 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT Validator : public TQValidator
 {
 	public:
-		typedef enum Result { Error = 0, Ok = 1, Warning = 2 };
+		enum Result { Error = 0, Ok = 1, Warning = 2 };
 
 		Validator(TQObject * parent = 0, const char * name = 0);
 		virtual ~Validator();
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index e27f200d..61937265 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -42,7 +42,7 @@ public:
 	 - SavingServerBasedDB saves server-based (shortcut) file
 	 - CustomOpening can be used for opening other files, like CSV
 	*/
-	typedef enum Mode { 
+	enum Mode {
 		Opening = 1,
 		SavingFileBasedDB = 2,
 		SavingServerBasedDB = 4,
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index 2e1d83fd..6142d4cd 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -236,7 +236,7 @@ public:
 	//! single shot after 1ms for contents updatinh
 	void triggerUpdate();
 
-	typedef enum ScrollDirection
+	enum ScrollDirection
 	{
 		ScrollUp,
 		ScrollDown,
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc
index 38d520db..06092a82 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cc
@@ -357,33 +357,33 @@ bool KWmf::parse(
     for (int i = 0; i < s_maxHandles; i++)
         m_objectHandles[i] = NULL;
 
-    typedef struct _RECT
+    struct RECT
     {
         S16 left;
         S16 top;
         S16 right;
         S16 bottom;
-    } RECT;
+    };
 
-    typedef struct _RECTL
+    struct RECTL
     {
         S32 left;
         S32 top;
         S32 right;
         S32 bottom;
-    } RECTL;
+    };
 
-    typedef struct _SIZE
+    struct SIZE
     {
         S16 width;
         S16 height;
-    } SIZE;
+    };
 
-    typedef struct _SIZEL
+    struct SIZEL
     {
         S32 width;
         S32 height;
-    } SIZEL;
+    };
 
     struct WmfEnhMetaHeader
     {
diff --git a/lib/kwmf/wmfstruct.h b/lib/kwmf/wmfstruct.h
index 7400e896..7c0b56da 100644
--- a/lib/kwmf/wmfstruct.h
+++ b/lib/kwmf/wmfstruct.h
@@ -9,33 +9,33 @@ typedef int DWORD;
 typedef TQ_INT32 LONG;
 typedef void* _HANDLE;
 
-typedef struct _RECT
+struct RECT
 {
     WORD left;
     WORD top;
     WORD right;
     WORD bottom;
-} RECT;
+};
 
-typedef struct _RECTL
+struct RECTL
 {
     LONG left;
     LONG top;
     LONG right;
     LONG bottom;
-} RECTL;
+};
 
-typedef struct _SIZE
+struct SIZE
 {
     WORD width;
     WORD height;
-} SIZE;
+};
 
-typedef struct _SIZEL
+struct SIZEL
 {
     LONG width;
     LONG height;
-} SIZEL;
+};
 
 
 struct WmfEnhMetaHeader