diff --git a/include/omnetpp.h b/include/omnetpp.h
index f0efd02..ab56fe2 100644
--- a/include/omnetpp.h
+++ b/include/omnetpp.h
@@ -18,6 +18,13 @@
 #ifndef __OMNETPP_H
 #define __OMNETPP_H
 
+// make this a system header and supress warnings
+#if defined(__clang__)
+#pragma clang system_header
+#elif defined(__GNUC__)
+#pragma GCC system_header
+#endif
+
 #include "omnetpp/carray.h"
 #include "omnetpp/cboolparimpl.h"
 #include "omnetpp/cobjectfactory.h"
diff --git a/src/nedxml/msgcppgenerator.cc b/src/nedxml/msgcppgenerator.cc
index 0ca03fb..ed3522a 100644
--- a/src/nedxml/msgcppgenerator.cc
+++ b/src/nedxml/msgcppgenerator.cc
@@ -474,6 +474,19 @@ void MsgCppGenerator::generate(MsgFileElement *fileElement)
     CC << "#  pragma warning(disable:4065)\n";
     CC << "#endif\n\n";
 
+    CC << "#if defined(__clang__)\n";
+    CC << "#  pragma clang diagnostic ignored \"-Wshadow\"\n";
+    CC << "#  pragma clang diagnostic ignored \"-Wconversion\"\n";
+    CC << "#  pragma clang diagnostic ignored \"-Wunused-parameter\"\n";
+    CC << "#  pragma clang diagnostic ignored \"-Wc++98-compat\"\n";
+    CC << "#elif defined(__GNUC__)\n";
+    CC << "#  pragma GCC diagnostic ignored \"-Wshadow\"\n";
+    CC << "#  pragma GCC diagnostic ignored \"-Wconversion\"\n";
+    CC << "#  pragma GCC diagnostic ignored \"-Wunused-parameter\"\n";
+    CC << "#  pragma GCC diagnostic ignored \"-Wsuggest-attribute=noreturn\"\n";
+    CC << "#  pragma GCC diagnostic ignored \"-Wfloat-conversion\"\n";
+    CC << "#endif\n\n";
+
     CC << "#include <iostream>\n";
     CC << "#include <sstream>\n";
     CC << "#include \"" << hfilenamewithoutdir << "\"\n\n";
@@ -993,7 +1006,7 @@ void MsgCppGenerator::generateClass(const ClassInfo& info)
         H << " *   public:\n";
         if (info.classtype == COWNEDOBJECT || info.classtype == CNAMEDOBJECT) {
             if (info.keyword == "message" || info.keyword == "packet") {
-                H << " *     " << info.realmsgclass << "(const char *name=nullptr, int kind=0) : " << info.msgclass << "(name,kind) {}\n";
+                H << " *     " << info.realmsgclass << "(const char *name=nullptr, short kind=0) : " << info.msgclass << "(name,kind) {}\n";
             }
             else {
                 H << " *     " << info.realmsgclass << "(const char *name=nullptr) : " << info.msgclass << "(name) {}\n";
@@ -1015,7 +1028,7 @@ void MsgCppGenerator::generateClass(const ClassInfo& info)
             H << " * The following should go into a .cc (.cpp) file:\n";
             H << " *\n";
             H << " * <pre>\n";
-            H << " * Register_Class(" << info.realmsgclass << ");\n";
+            H << " * Register_Class(" << info.realmsgclass << ")\n";
             H << " * </pre>\n";
         }
     }
@@ -1068,7 +1081,7 @@ void MsgCppGenerator::generateClass(const ClassInfo& info)
     }
     if (info.classtype == COWNEDOBJECT || info.classtype == CNAMEDOBJECT) {
         if (info.keyword == "message" || info.keyword == "packet") {
-            H << "    " << info.msgclass << "(const char *name=nullptr, int kind=0);\n";
+            H << "    " << info.msgclass << "(const char *name=nullptr, short kind=0);\n";
         }
         else {
             H << "    " << info.msgclass << "(const char *name=nullptr);\n";
@@ -1131,7 +1144,7 @@ void MsgCppGenerator::generateClass(const ClassInfo& info)
 
     if (!info.gap) {
         if (info.classtype == COWNEDOBJECT || info.classtype == CNAMEDOBJECT || info.classtype == COBJECT) {
-            CC << "Register_Class(" << info.msgclass << ");\n\n";
+            CC << "Register_Class(" << info.msgclass << ")\n\n";
         }
 
         H << "inline void doParsimPacking(omnetpp::cCommBuffer *b, const " << info.realmsgclass << "& obj) {obj.parsimPack(b);}\n";
@@ -1142,7 +1155,7 @@ void MsgCppGenerator::generateClass(const ClassInfo& info)
         if (info.keyword == "message" || info.keyword == "packet") {
             // CAREFUL when assigning values to existing members gets implemented!
             // The msg kind passed to the ctor should take priority!!!
-            CC << "" << info.msgclass << "::" << info.msgclass << "(const char *name, int kind) : ::" << info.msgbaseclass << "(name,kind)\n";
+            CC << "" << info.msgclass << "::" << info.msgclass << "(const char *name, short kind) : ::" << info.msgbaseclass << "(name,kind)\n";
         }
         else {
             if (info.msgbaseclass == "") {
@@ -1575,7 +1588,7 @@ void MsgCppGenerator::generateDescriptorClass(const ClassInfo& info)
     CC << "};\n\n";
 
     // register class
-    CC << "Register_ClassDescriptor(" << info.msgdescclass << ");\n\n";
+    CC << "Register_ClassDescriptor(" << info.msgdescclass << ")\n\n";
 
     // ctor, dtor
     size_t fieldcount = info.fieldlist.size();
@@ -2074,7 +2087,7 @@ void MsgCppGenerator::generateEnum(const EnumInfo& enumInfo)
     for (EnumInfo::FieldList::const_iterator it = enumInfo.fieldlist.begin(); it != enumInfo.fieldlist.end(); ++it) {
         CC << "    e->insert(" << it->name << ", \"" << it->name << "\");\n";
     }
-    CC << ");\n\n";
+    CC << ")\n\n";
 }
 
 std::string MsgCppGenerator::prefixWithNamespace(const std::string& name)

--- src/nedxml/msgcppgenerator.cc.original.cc	2017-01-12 17:52:07.000000000 +0100
+++ src/nedxml/msgcppgenerator.cc	2017-01-12 18:35:02.000000000 +0100
@@ -440,6 +440,9 @@
 
     H << "//\n// Generated file, do not edit! Created by " PROGRAM " " << (OMNETPP_VERSION / 0x100) << "." << (OMNETPP_VERSION % 0x100)
       << " from " << fileElement->getFilename() << ".\n//\n\n";
+    H << "#if defined(__clang__)\n";
+    H << "#  pragma clang diagnostic ignored \"-Wreserved-id-macro\"\n";
+    H << "#endif\n";
     H << "#ifndef " << headerGuard << "\n";
     H << "#define " << headerGuard << "\n\n";
     H << "#include <omnetpp.h>\n";
@@ -975,7 +978,7 @@
 
     std::ostringstream o;
     o << " * <pre>\n";
-    o << opp_indentlines(opp_trim(opp_replacesubstring(str, "*/", "  ", true)), " * ");
+    o << opp_indentlines(opp_trim(opp_replacesubstring(opp_replacesubstring(str, "*/", "  ", true), "@", "\\@", true)), " * ");
 //    o << ';';   //FIXME HACK for reduce difference
     o << "\n";
     o << " * </pre>\n";