--- src/bin/idraw/idcmds.c.orig	Sat May 23 03:07:32 1992
+++ src/bin/idraw/idcmds.c	Sun Jan 17 17:48:19 1999
@@ -26,7 +26,6 @@
 
 #include "ided.h"
 #include "idclasses.h"
-#include "idcmds.h"
 #include "idcomp.h"
 #include "iddialogs.h"
 #include "idvars.h"
@@ -46,11 +45,9 @@
 #include <Unidraw/Commands/edit.h>
 #include <Unidraw/Commands/transforms.h>
 
-#undef FileChooser
-#define FileChooser _lib_iv(FileChooser)
-
 #include <stream.h>
 
+#include "idcmds.h"
 /*****************************************************************************/
 
 ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
@@ -59,8 +56,8 @@
     return OPEN_CMD == id || ViewCompCmd::IsA(id);
 }
 
-OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { }
-OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { }
+OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { };
+OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { };
 
 Command* OpenCmd::Copy () {
     Command* copy = new OpenCmd(CopyControlInfo());