Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -111,6 +111,7 @@
       'libadblockplus/libadblockplus.gyp:libadblockplus',
     ],
     'sources': [
+      'src/plugin/ActiveQueue.h',
       'src/plugin/AdblockPlus.def',
       'src/plugin/AdblockPlus.idl',
       'src/plugin/AdblockPlus.rc',
@@ -125,12 +126,11 @@
       'src/plugin/Instances.h',
       'src/plugin/NotificationMessage.cpp',
       'src/plugin/NotificationMessage.h',
+      'src/plugin/Placeholder.h',
       'src/plugin/Plugin.cpp',
       'src/plugin/Plugin.h',
       'src/plugin/PluginClass.cpp',
       'src/plugin/PluginClass.h',
-      'src/plugin/PluginClientBase.cpp',
-      'src/plugin/PluginClientBase.h',
       'src/plugin/PluginClientFactory.cpp',
       'src/plugin/PluginClientFactory.h',
       'src/plugin/PluginDebug.cpp',
@@ -248,7 +248,6 @@
       'src/plugin/AdblockPlusDomTraverser.cpp',
       'src/plugin/NotificationMessage.cpp',
       'src/plugin/Plugin.cpp',
-      'src/plugin/PluginClientBase.cpp',
       'src/plugin/PluginClientFactory.cpp',
       'src/plugin/PluginClass.cpp',
       'src/plugin/PluginFilter.cpp',
@@ -287,5 +286,33 @@
         ]],
       },
     },
-  }]
+  },
+
+  {
+    'target_name': 'tests_plugin_2',
+    'type': 'executable',
+    'dependencies': [
+      'libadblockplus/third_party/googletest.gyp:googletest_main',
+    ],
+    'sources': [
+      'src/plugin/ActiveQueue.h',
+      'src/plugin/Placeholder.h',
+      'test/plugin/ActiveQueueTest.cpp',
+      'test/plugin/PlaceholderTest.cpp',
+    ],
+    'defines': [
+    ],
+    'link_settings': {
+      'libraries': [],
+    },
+    #'msbuild_toolset': 'v140',
+    'msvs_settings': {
+      'VCLinkerTool': {
+        'SubSystem': '1', # Console
+        'EntryPointSymbol': 'mainCRTStartup',
+      },
+    },
+  },
+  
+  ]
 }