--- ./ext/P4/p4mergedata.cpp.orig 2015-02-11 21:56:41.253726893 +0000 +++ ./ext/P4/p4mergedata.cpp 2015-02-11 21:57:54.274440052 +0000 @@ -35,10 +35,10 @@ ******************************************************************************/ #include #include "undefdups.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "p4result.h" #include "p4rubydebug.h" #include "clientuserruby.h"