diff --git a/src/FrameBufferInfoAPI.h b/src/FrameBufferInfoAPI.h
index 14b9d4de..094d5215 100644
--- a/src/FrameBufferInfoAPI.h
+++ b/src/FrameBufferInfoAPI.h
@@ -10,7 +10,7 @@ extern "C" {
   #define CALL		__cdecl
 #else
   #define EXPORT 	__attribute__((visibility("default")))
-  #define CALL          _cdecl
+  #define CALL
 #endif
 
 /******************************************************************
diff --git a/src/MupenPlusPluginAPI.cpp b/src/MupenPlusPluginAPI.cpp
index b2ae1e09..c3214433 100644
--- a/src/MupenPlusPluginAPI.cpp
+++ b/src/MupenPlusPluginAPI.cpp
@@ -44,24 +44,4 @@ EXPORT void CALL SetRenderingCallback(void (*callback)(int))
 	api().SetRenderingCallback(callback);
 }
 
-EXPORT void CALL FBRead(u32 addr)
-{
-	api().FBRead(addr);
-}
-
-EXPORT void CALL FBWrite(u32 addr, u32 size)
-{
-	api().FBWrite(addr, size);
-}
-
-EXPORT void CALL FBGetFrameBufferInfo(void *p)
-{
-	api().FBGetFrameBufferInfo(p);
-}
-
-EXPORT void CALL ResizeVideoOutput(int Width, int Height)
-{
-	api().ResizeVideoOutput(Width, Height);
-}
-
 } // extern "C"
diff --git a/src/PluginAPI.h b/src/PluginAPI.h
index 7dc27e36..dc4c2a61 100644
--- a/src/PluginAPI.h
+++ b/src/PluginAPI.h
@@ -63,9 +63,6 @@ public:
 	void DllAbout(/*HWND _hParent*/);
 #else
 	// MupenPlus
-	void FBRead(unsigned int _addr) {}
-	void FBWrite(unsigned int addr, unsigned int size) {}
-	void FBGetFrameBufferInfo(void * _p) {}
 	void ResizeVideoOutput(int _Width, int _Height);
 	void ReadScreen2(void * _dest, int * _width, int * _height, int _front);
 
diff --git a/src/inc/m64p_plugin.h b/src/inc/m64p_plugin.h
index dfe6f32a..dfc5c81b 100644
--- a/src/inc/m64p_plugin.h
+++ b/src/inc/m64p_plugin.h
@@ -196,6 +196,7 @@ EXPORT void CALL ResizeVideoOutput(int width, int height);
 #endif
 
 /* frame buffer plugin spec extension */
+#if 0 // The extension is moved to separate header.
 typedef struct
 {
    unsigned int addr;
@@ -211,6 +212,7 @@ EXPORT void CALL FBRead(unsigned int addr);
 EXPORT void CALL FBWrite(unsigned int addr, unsigned int size);
 EXPORT void CALL FBGetFrameBufferInfo(void *p);
 #endif
+#endif // 0
 
 /* audio plugin function pointers */
 typedef void (*ptr_AiDacrateChanged)(int SystemType);