diff --git a/EInAPI.h b/EInAPI.h
index ea09dcd..0633048 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -43,14 +43,10 @@ EIN_EXPORT BOOL __stdcall EgtSetDefaultMaterial( int nGseCtx, int nRed, int nGre
 EIN_EXPORT BOOL __stdcall EgtNewFile( int nGseCtx) ;
 EIN_EXPORT BOOL __stdcall EgtOpenFile( int nGseCtx, const wchar_t* wsFilePath) ;
 EIN_EXPORT BOOL __stdcall EgtSaveFile( int nGseCtx, const wchar_t* wsFilePath, int nFlag) ;
-EIN_EXPORT int  __stdcall EgtGetFileType( const wchar_t* wsFilePath) ;
-EIN_EXPORT BOOL __stdcall EgtImportDxf( int nGseCtx, const wchar_t* wsFilePath) ;
-EIN_EXPORT BOOL __stdcall EgtImportStl( int nGseCtx, const wchar_t* wsFilePath) ;
-EIN_EXPORT BOOL __stdcall EgtExportDxf( int nGseCtx, int nId, const wchar_t* wsFilePath) ;
-EIN_EXPORT BOOL __stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsFilePath) ;
 
 // GeomDB Objects
 EIN_EXPORT BOOL __stdcall EgtExistsObj( int nGseCtx, int nId) ;
+EIN_EXPORT int  __stdcall EgtGetGroupObjs( int nGseCtx, int nId) ;
 EIN_EXPORT int  __stdcall EgtGetFirstInGroup( int nGseCtx, int nGroupId) ;
 EIN_EXPORT int  __stdcall EgtGetNext( int nGseCtx, int nId) ;
 EIN_EXPORT int  __stdcall EgtGetLastInGroup( int nGseCtx, int nGroupId) ;
@@ -105,6 +101,14 @@ EIN_EXPORT BOOL __stdcall EgtRotateCamera( int nGseCtx, int nPrevX, int nPrevY,
 EIN_EXPORT BOOL __stdcall EgtGetCameraDir( int nGseCtx, int* pnDir) ;
 EIN_EXPORT BOOL __stdcall EgtUnProjectPoint( int nGseCtx, int nWinX, int nWinY, double ptP[3]) ;
 
+// Exchange
+EIN_EXPORT int  __stdcall EgtGetFileType( const wchar_t* wsFilePath) ;
+EIN_EXPORT BOOL __stdcall EgtImportDxf( int nGseCtx, const wchar_t* wsFilePath) ;
+EIN_EXPORT BOOL __stdcall EgtImportStl( int nGseCtx, const wchar_t* wsFilePath) ;
+EIN_EXPORT BOOL __stdcall EgtImportCnc( int nGseCtx, const wchar_t* wsFilePath) ;
+EIN_EXPORT BOOL __stdcall EgtExportDxf( int nGseCtx, int nId, const wchar_t* wsFilePath) ;
+EIN_EXPORT BOOL __stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsFilePath) ;
+
 // Tsc Executor
 EIN_EXPORT BOOL __stdcall EgtInitTscExec( int nGseCtx) ;
 EIN_EXPORT BOOL __stdcall EgtTscFileExec( int nGseCtx, const wchar_t* wsFilePath) ;
diff --git a/EInDllMain.h b/EInDllMain.h
index 046b9a5..0c9261f 100644
--- a/EInDllMain.h
+++ b/EInDllMain.h
@@ -23,4 +23,12 @@
 #endif
 
 //-----------------------------------------------------------------------------
-EIN_EXPORT const char* GetEInVersion( void) ;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EIN_EXPORT const char* __stdcall GetEInVersion( void) ;
+
+#ifdef __cplusplus
+}
+#endif