added missing ifdef blocks