diff --git a/src/molfile/Makefile b/src/molfile/Makefile
index 746f1c816e6c5a161260aedfff22422b0a3e1be6..4079d510f28ed38be7bae5bcad2beb6c63f2a479 100644
--- a/src/molfile/Makefile
+++ b/src/molfile/Makefile
@@ -17,7 +17,7 @@ OBJ=dcdplugin.o gromacsplugin.o pdbplugin.o
 obj: $(OBJ)
 
 # Local rules for molfile plugins - replacement is delayed 
-CPPFLAGS+=-DSTATIC_PLUGIN  -DVMDPLUGIN=molfile_$(patsubst %.o,%,$@) -fPIC
+CPPFLAGS+=-DSTATIC_PLUGIN  -DVMDPLUGIN=molfile_$(patsubst %.o,%,$@)
 
 # -fpermissive works around a missing cast in pdbplugin 
 #          char *newstr=realloc(pdb->meta->remarks, newlen + 1);
diff --git a/src/molfile/dcdplugin.c b/src/molfile/dcdplugin.cpp
similarity index 100%
rename from src/molfile/dcdplugin.c
rename to src/molfile/dcdplugin.cpp
diff --git a/src/molfile/import.sh b/src/molfile/import.sh
index 3def6aa1c498772029cdbf076ada3bfa7aed19df..51a8310aefeeb9ee6290cd0a2039db092efb39ef 100755
--- a/src/molfile/import.sh
+++ b/src/molfile/import.sh
@@ -55,9 +55,9 @@ done
 mycp $PD/molfile_plugin/LICENSE COPYRIGHT
 
 # List of "known-good" plugins. Some renaming is necessary
-mycp_wrap $IFDEF $PD/molfile_plugin/src/dcdplugin.c dcdplugin.c
+mycp_wrap $IFDEF $PD/molfile_plugin/src/dcdplugin.c dcdplugin.cpp
 mycp_wrap $IFDEF $PD/molfile_plugin/src/gromacsplugin.C gromacsplugin.cpp
-mycp_wrap $IFDEF $PD/molfile_plugin/src/pdbplugin.c pdbplugin.c
+mycp_wrap $IFDEF $PD/molfile_plugin/src/pdbplugin.c pdbplugin.cpp
 
 
 # Generate static header
diff --git a/src/molfile/pdbplugin.c b/src/molfile/pdbplugin.cpp
similarity index 99%
rename from src/molfile/pdbplugin.c
rename to src/molfile/pdbplugin.cpp
index bda4fbf9fce4b0505d43cba49ed5b477709e946f..58badea6b14f30d722e8bfc01d15db3c45d6f66c 100644
--- a/src/molfile/pdbplugin.c
+++ b/src/molfile/pdbplugin.cpp
@@ -115,7 +115,7 @@ static void *open_pdb_read(const char *filepath, const char *filetype,
       int len=strlen(pdbstr);
       int newlen = len + pdb->meta->remarklen;
 
-      char *newstr=realloc(pdb->meta->remarks, newlen + 1);
+      char *newstr=(char*)realloc(pdb->meta->remarks, newlen + 1);
       if (newstr != NULL) {
         pdb->meta->remarks = newstr;
         pdb->meta->remarks[pdb->meta->remarklen] = '\0';